Hi all,

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

  kernel/cgroup/cpuset.c

between commit:

  7dec062cfcf2 ("timers/migration: Exclude isolated cpus from hierarchy")

from the tip tree and commit:

  be04e96ba911 ("cgroup/cpuset: Globally track isolated_cpus update")

from the cgroup 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/cgroup/cpuset.c
index 72891976475c,1e3aadc09d3a..000000000000
--- a/kernel/cgroup/cpuset.c
+++ b/kernel/cgroup/cpuset.c
@@@ -1397,16 -1477,14 +1477,18 @@@ static void update_isolation_cpumasks(v
  {
  	int ret;
  
- 	lockdep_assert_cpus_held();
- 
- 	if (!isolcpus_updated)
+ 	if (!isolated_cpus_updating)
  		return;
  
+ 	lockdep_assert_cpus_held();
+ 
  	ret = workqueue_unbound_exclude_cpumask(isolated_cpus);
  	WARN_ON_ONCE(ret < 0);
 +
 +	ret = tmigr_isolated_exclude_cpumask(isolated_cpus);
 +	WARN_ON_ONCE(ret < 0);
++
+ 	isolated_cpus_updating = false;
  }
  
  /**