Re: linux-next: manual merge of the rcu tree with the modules and tip trees

2015-06-23 Thread Rusty Russell
Stephen Rothwell writes: > Hi Rusty, > > On Thu, 28 May 2015 17:25:07 +1000 Stephen Rothwell > wrote: >> >> Today's linux-next merge of the rcu tree got a conflict in >> include/linux/rcupdate.h between commits 0a04b0166929 ("rcu: Move >> lockless_dereference() out of rcupdate.h") from the

Re: linux-next: manual merge of the rcu tree with the modules and tip trees

2015-06-23 Thread Stephen Rothwell
Hi Rusty, On Thu, 28 May 2015 17:25:07 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the rcu tree got a conflict in > include/linux/rcupdate.h between commits 0a04b0166929 ("rcu: Move > lockless_dereference() out of rcupdate.h") from the modules tree and > c1ad348b452a ("tick:

Re: linux-next: manual merge of the rcu tree with the modules and tip trees

2015-06-23 Thread Rusty Russell
Stephen Rothwell s...@canb.auug.org.au writes: Hi Rusty, On Thu, 28 May 2015 17:25:07 +1000 Stephen Rothwell s...@canb.auug.org.au wrote: Today's linux-next merge of the rcu tree got a conflict in include/linux/rcupdate.h between commits 0a04b0166929 (rcu: Move lockless_dereference() out

Re: linux-next: manual merge of the rcu tree with the modules and tip trees

2015-06-23 Thread Stephen Rothwell
Hi Rusty, On Thu, 28 May 2015 17:25:07 +1000 Stephen Rothwell s...@canb.auug.org.au wrote: Today's linux-next merge of the rcu tree got a conflict in include/linux/rcupdate.h between commits 0a04b0166929 (rcu: Move lockless_dereference() out of rcupdate.h) from the modules tree and

Re: linux-next: manual merge of the rcu tree with the modules and tip trees

2015-05-29 Thread Paul E. McKenney
On Fri, May 29, 2015 at 08:56:04AM +0200, Ingo Molnar wrote: > > * Paul E. McKenney wrote: > > > On Thu, May 28, 2015 at 05:25:07PM +1000, Stephen Rothwell wrote: > > > Hi Paul, > > > > > > Today's linux-next merge of the rcu tree got a conflict in > > > include/linux/rcupdate.h between

Re: linux-next: manual merge of the rcu tree with the modules and tip trees

2015-05-29 Thread Ingo Molnar
* Paul E. McKenney wrote: > On Thu, May 28, 2015 at 05:25:07PM +1000, Stephen Rothwell wrote: > > Hi Paul, > > > > Today's linux-next merge of the rcu tree got a conflict in > > include/linux/rcupdate.h between commits 0a04b0166929 ("rcu: Move > > lockless_dereference() out of rcupdate.h")

Re: linux-next: manual merge of the rcu tree with the modules and tip trees

2015-05-29 Thread Ingo Molnar
* Paul E. McKenney paul...@linux.vnet.ibm.com wrote: On Thu, May 28, 2015 at 05:25:07PM +1000, Stephen Rothwell wrote: Hi Paul, Today's linux-next merge of the rcu tree got a conflict in include/linux/rcupdate.h between commits 0a04b0166929 (rcu: Move lockless_dereference() out of

Re: linux-next: manual merge of the rcu tree with the modules and tip trees

2015-05-29 Thread Paul E. McKenney
On Fri, May 29, 2015 at 08:56:04AM +0200, Ingo Molnar wrote: * Paul E. McKenney paul...@linux.vnet.ibm.com wrote: On Thu, May 28, 2015 at 05:25:07PM +1000, Stephen Rothwell wrote: Hi Paul, Today's linux-next merge of the rcu tree got a conflict in include/linux/rcupdate.h

Re: linux-next: manual merge of the rcu tree with the modules and tip trees

2015-05-28 Thread Paul E. McKenney
On Thu, May 28, 2015 at 05:25:07PM +1000, Stephen Rothwell wrote: > Hi Paul, > > Today's linux-next merge of the rcu tree got a conflict in > include/linux/rcupdate.h between commits 0a04b0166929 ("rcu: Move > lockless_dereference() out of rcupdate.h") from the modules tree and > c1ad348b452a

linux-next: manual merge of the rcu tree with the modules and tip trees

2015-05-28 Thread Stephen Rothwell
Hi Paul, Today's linux-next merge of the rcu tree got a conflict in include/linux/rcupdate.h between commits 0a04b0166929 ("rcu: Move lockless_dereference() out of rcupdate.h") from the modules tree and c1ad348b452a ("tick: Nohz: Rework next timer evaluation") from the tip tree and commits

linux-next: manual merge of the rcu tree with the modules and tip trees

2015-05-28 Thread Stephen Rothwell
Hi Paul, Today's linux-next merge of the rcu tree got a conflict in include/linux/rcupdate.h between commits 0a04b0166929 (rcu: Move lockless_dereference() out of rcupdate.h) from the modules tree and c1ad348b452a (tick: Nohz: Rework next timer evaluation) from the tip tree and commits

Re: linux-next: manual merge of the rcu tree with the modules and tip trees

2015-05-28 Thread Paul E. McKenney
On Thu, May 28, 2015 at 05:25:07PM +1000, Stephen Rothwell wrote: Hi Paul, Today's linux-next merge of the rcu tree got a conflict in include/linux/rcupdate.h between commits 0a04b0166929 (rcu: Move lockless_dereference() out of rcupdate.h) from the modules tree and c1ad348b452a (tick: