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

[broonie]

Hi all,

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

  kernel/rcu/tree_plugin.h

between commit:

  04d4e665a6090 ("sched/isolation: Use single feature type while referring to housekeeping cpumask")

from the tip tree and commit:

  6a2c1d450a6a3 ("rcu: Replace cpumask_weight with cpumask_empty where appropriate")

from the rcu 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.

diff --cc kernel/rcu/tree_plugin.h
index 65f25a32f6d75,6b9bcd45c7b21..0000000000000
--- a/kernel/rcu/tree_plugin.h
+++ b/kernel/rcu/tree_plugin.h
@@@ -1214,10 -1219,11 +1219,11 @@@ static void rcu_boost_kthread_setaffini
  		if ((mask & leaf_node_cpu_bit(rnp, cpu)) &&
  		    cpu != outgoingcpu)
  			cpumask_set_cpu(cpu, cm);
 -	cpumask_and(cm, cm, housekeeping_cpumask(HK_FLAG_RCU));
 +	cpumask_and(cm, cm, housekeeping_cpumask(HK_TYPE_RCU));
- 	if (cpumask_weight(cm) == 0)
+ 	if (cpumask_empty(cm))
 -		cpumask_copy(cm, housekeeping_cpumask(HK_FLAG_RCU));
 +		cpumask_copy(cm, housekeeping_cpumask(HK_TYPE_RCU));
  	set_cpus_allowed_ptr(t, cm);
+ 	mutex_unlock(&rnp->boost_kthread_mutex);
  	free_cpumask_var(cm);
  }