Messages in this thread |  | | Date | Mon, 7 Dec 2015 17:36:05 +1100 | | From | Stephen Rothwell <> | | Subject | linux-next: manual merge of the cgroup tree with Linus' tree |
| |
Hi Tejun,
Today's linux-next merge of the cgroup tree got a conflict in:
net/core/netclassid_cgroup.c
between commit:
3b13758f51de ("cgroups: Allow dynamically changing net_classid")
from Linus' tree and commit:
1f7dd3e5a6e4 ("cgroup: fix handling of multi-destination migration from subtree_control enabling")
from the cgroup tree.
I couldn't figure out how to fix this up, so I have just dropped the cgroup tree for today.
Tejun, maybe you could merge Linus' tree (probably -rc4?) and fix this up yourself?
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au
|  |