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

[Stephen Rothwell]

Hi Tejun,

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

  kernel/events/core.c
  kernel/sched/core.c

between commits:

  516792e67c39 ("perf/core: Delete PF_EXITING checks from perf_cgroup_exit() callback")
  446685e9bfa1 ("sched/core: Delete PF_EXITING checks from cpu_cgroup_exit() callback")

from the tip tree and commit:

  2e91fa7f6d45 ("cgroup: keep zombies associated with their original cgroups")

from the cgroup tree.

I fixed it up (the latter removed the two functions that were modified
by the former 2 commits) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/