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

2021-02-12 Thread Stephen Rothwell
Hi all, On Fri, 12 Feb 2021 08:30:27 -0700 Jens Axboe wrote: > > On 2/12/21 8:18 AM, Frederic Weisbecker wrote: > > On Thu, Feb 11, 2021 at 04:48:52PM +1100, Stephen Rothwell wrote: > >> Hi all, > >> > >> Today's linux-next merge of the rcu tree got conflicts in: > >> > >>

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

2021-02-12 Thread Jens Axboe
On 2/12/21 9:18 AM, Peter Zijlstra wrote: > On Fri, Feb 12, 2021 at 08:26:56AM -0700, Jens Axboe wrote: >> But I think I made a mistake in that it should've been sched/smp instead, >> which would likely get rid of this issue too? I'll rebase it, it's just >> a single topic branch with just those

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

2021-02-12 Thread Peter Zijlstra
On Fri, Feb 12, 2021 at 08:26:56AM -0700, Jens Axboe wrote: > But I think I made a mistake in that it should've been sched/smp instead, > which would likely get rid of this issue too? I'll rebase it, it's just > a single topic branch with just those two patches on top. Right, I made tip/sched/smp

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

2021-02-12 Thread Frederic Weisbecker
On Fri, Feb 12, 2021 at 08:30:27AM -0700, Jens Axboe wrote: > On 2/12/21 8:18 AM, Frederic Weisbecker wrote: > > On Thu, Feb 11, 2021 at 04:48:52PM +1100, Stephen Rothwell wrote: > >> Hi all, > >> > >> Today's linux-next merge of the rcu tree got conflicts in: > >> > >> include/linux/rcupdate.h

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

2021-02-12 Thread Jens Axboe
On 2/12/21 8:18 AM, Frederic Weisbecker wrote: > On Thu, Feb 11, 2021 at 04:48:52PM +1100, Stephen Rothwell wrote: >> Hi all, >> >> Today's linux-next merge of the rcu tree got conflicts in: >> >> include/linux/rcupdate.h >> kernel/rcu/tree.c >> kernel/rcu/tree_plugin.h >> >> between

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

2021-02-12 Thread Jens Axboe
On 2/11/21 10:38 AM, Paul E. McKenney wrote: > On Thu, Feb 11, 2021 at 04:48:52PM +1100, Stephen Rothwell wrote: >> Hi all, >> >> Today's linux-next merge of the rcu tree got conflicts in: >> >> include/linux/rcupdate.h >> kernel/rcu/tree.c >> kernel/rcu/tree_plugin.h >> >> between commits:

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

2021-02-12 Thread Frederic Weisbecker
On Thu, Feb 11, 2021 at 09:38:02AM -0800, Paul E. McKenney wrote: > On Thu, Feb 11, 2021 at 04:48:52PM +1100, Stephen Rothwell wrote: > > Hi all, > > > > Today's linux-next merge of the rcu tree got conflicts in: > > > > include/linux/rcupdate.h > > kernel/rcu/tree.c > >

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

2021-02-12 Thread Frederic Weisbecker
On Thu, Feb 11, 2021 at 04:48:52PM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the rcu tree got conflicts in: > > include/linux/rcupdate.h > kernel/rcu/tree.c > kernel/rcu/tree_plugin.h > > between commits: > > 3a7b5c87a0b2 ("rcu/nocb: Perform deferred wake

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

2021-02-11 Thread Paul E. McKenney
On Thu, Feb 11, 2021 at 04:48:52PM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the rcu tree got conflicts in: > > include/linux/rcupdate.h > kernel/rcu/tree.c > kernel/rcu/tree_plugin.h > > between commits: > > 3a7b5c87a0b2 ("rcu/nocb: Perform deferred wake

linux-next: manual merge of the rcu tree with the block tree

2021-02-10 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the rcu tree got conflicts in: include/linux/rcupdate.h kernel/rcu/tree.c kernel/rcu/tree_plugin.h between commits: 3a7b5c87a0b2 ("rcu/nocb: Perform deferred wake up before last idle's need_resched() check") e4234f21d2ea ("rcu: Pull deferred rcuog