lkml.org 
[lkml]   [2015]   [Dec]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-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


\
 
 \ /
  Last update: 2015-12-07 08:01    [from the cache]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and my Meterkast|Read the blog