[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20151207173605.37fe583d@canb.auug.org.au>
Date: Mon, 7 Dec 2015 17:36:05 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Tejun Heo <tj@...nel.org>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Nina Schiff <ninasc@...com>,
"David S. Miller" <davem@...emloft.net>
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@...b.auug.org.au
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists