From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Tejun Heo <tj@kernel.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Nina Schiff <ninasc@fb.com>,
"David S. Miller" <davem@davemloft.net>
Subject: linux-next: manual merge of the cgroup tree with Linus' tree
Date: Mon, 7 Dec 2015 17:36:05 +1100 [thread overview]
Message-ID: <20151207173605.37fe583d@canb.auug.org.au> (raw)
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
next reply other threads:[~2015-12-07 6:36 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-07 6:36 Stephen Rothwell [this message]
2015-12-07 15:20 ` linux-next: manual merge of the cgroup tree with Linus' tree Tejun Heo
2015-12-07 20:19 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2019-06-17 6:06 Stephen Rothwell
2019-07-08 23:25 ` Stephen Rothwell
2014-05-26 7:45 Stephen Rothwell
2013-03-14 2:31 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20151207173605.37fe583d@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=ninasc@fb.com \
--cc=tj@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).