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

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the slab tree got a conflict in:

  kernel/rcu/tree.c

between commit:

  8c5f6f00c015 ("rcu: Use system_unbound_wq to avoid disturbing isolated CPUs")

from the rcu tree and commit:

  bf0d8d2996ff ("rcu/kvfree: Add kvfree_rcu_barrier() API")

from the slab tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc kernel/rcu/tree.c
index 0c8b56c4ee88,ebcfed9b570e..000000000000
--- a/kernel/rcu/tree.c
+++ b/kernel/rcu/tree.c
@@@ -3614,7 -3631,7 +3611,7 @@@ kvfree_rcu_queue_batch(struct kfree_rcu
  			// be that the work is in the pending state when
  			// channels have been detached following by each
  			// other.
- 			queue_rcu_work(system_unbound_wq, &krwp->rcu_work);
 -			queued = queue_rcu_work(system_wq, &krwp->rcu_work);
++			queued = queue_rcu_work(system_unbound_wq, &krwp->rcu_work);
  		}
  	}

Attachment: pgpBgUoJaUsIe.pgp
Description: OpenPGP digital signature