Re: linux-next: manual merge of the rcu tree with Linus' tree

2018-06-18 Thread Paul E. McKenney
On Mon, Jun 18, 2018 at 01:49:47PM +1000, Stephen Rothwell wrote: > Hi Paul, > > On Mon, 18 Jun 2018 13:48:49 +1000 Stephen Rothwell > wrote: > > > > I am still getting this. > > Maybe this was a bit premature :-) Actually, this whole mess was due to me forgetting to do the merge-window reset

Re: linux-next: manual merge of the rcu tree with Linus' tree

2018-06-17 Thread Stephen Rothwell
Hi Paul, On Mon, 18 Jun 2018 13:48:49 +1000 Stephen Rothwell wrote: > > I am still getting this. Maybe this was a bit premature :-) -- Cheers, Stephen Rothwell pgpctU4_DnFxM.pgp Description: OpenPGP digital signature

Re: linux-next: manual merge of the rcu tree with Linus' tree

2018-06-17 Thread Stephen Rothwell
Hi all, On Tue, 12 Jun 2018 10:46:07 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the rcu tree got a conflict in: > > drivers/iommu/amd_iommu.c > > between commit: > > 94c793accacd ("iommu/amd: Hide unused iommu_table_lock") > > from Linus' tree and commit: > > 1df9bb

Re: linux-next: manual merge of the rcu tree with Linus' tree

2018-06-11 Thread Paul E. McKenney
On Tue, Jun 12, 2018 at 10:46:07AM +1000, Stephen Rothwell wrote: > Hi Paul, > > Today's linux-next merge of the rcu tree got a conflict in: > > drivers/iommu/amd_iommu.c > > between commit: > > 94c793accacd ("iommu/amd: Hide unused iommu_table_lock") > > from Linus' tree and commit: > >

Re: linux-next: manual merge of the rcu tree with Linus' tree

2018-05-15 Thread Paul E. McKenney
On Mon, May 14, 2018 at 01:46:36PM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the rcu tree got a conflict in: > > drivers/nvme/host/core.c > > between commit: > > 12d9f07022dc ("nvme: fix use-after-free in nvme_free_ns_head") > > from Linus' tree and commit: >

Re: linux-next: manual merge of the rcu tree with Linus' tree

2017-09-25 Thread Stephen Rothwell
Hi Paul, On Mon, 25 Sep 2017 20:26:28 -0700 "Paul E. McKenney" wrote: > > This conflict will disappear tomorrow, as I have merged the commit > from Linus's tree in place of mine and have added another commit that > removes the READ_ONCE()s. Same result, but no conflict. ;-) Thanks, I figured

Re: linux-next: manual merge of the rcu tree with Linus' tree

2017-09-25 Thread Paul E. McKenney
On Tue, Sep 26, 2017 at 01:00:18PM +1000, Stephen Rothwell wrote: > Hi Paul, > > Today's linux-next merge of the rcu tree got a conflict in: > > kernel/rcu/tree.c > > between commit: > > 28585a832602 ("rcu: Allow for page faults in NMI handlers") > > from Linus' tree and commit: > > 3e2

Re: linux-next: manual merge of the rcu tree with Linus' tree

2017-03-07 Thread Stephen Rothwell
Hi Paul, On Wed, 8 Mar 2017 11:46:33 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the rcu tree got a conflict in: > > mm/slab_common.c > > between commit: > > 657dc2f97220 ("slab: remove synchronous rcu_barrier() call in memcg cache > release path") > > from Linus' tree

Re: linux-next: manual merge of the rcu tree with Linus' tree

2016-03-30 Thread Paul E. McKenney
On Wed, Mar 30, 2016 at 11:32:14AM +1100, Stephen Rothwell wrote: > Hi Paul, > > Today's linux-next merge of the rcu tree got a conflict in: > > kernel/rcu/tree.c > > between commit: > > abedf8e2419f ("rcu: Use simple wait queues where possible in rcutree") > > from Linus' tree and commit:

Re: linux-next: manual merge of the rcu tree with Linus' tree

2012-11-29 Thread Paul E. McKenney
On Thu, Nov 29, 2012 at 02:06:51PM +1100, Stephen Rothwell wrote: > Hi Paul, > > Today's linux-next merge of the rcu tree got a conflict in > arch/x86/kernel/ptrace.c between commit cb57a2b4cff7 ("x86-32: Export > kernel_stack_pointer() for modules") from Linus' tree and commit > 98dbec158343 ("co