From: Tejun Heo <tj@kernel.org>
To: sfr@canb.auug.org.au, Andrew Morton <akpm@linux-foundation.org>
Cc: linux-next@vger.kernel.org, Johannes Weiner <hannes@cmpxchg.org>,
Michal Hocko <mhocko@suse.cz>,
Balbir Singh <bsingharora@gmail.com>,
KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>,
cgroups@vger.kernel.org, linux-mm@kvack.org
Subject: [HEADSUP] conflicts between cgroup/for-3.12 and memcg
Date: Thu, 8 Aug 2013 20:34:02 -0400 [thread overview]
Message-ID: <20130809003402.GC13427@mtj.dyndns.org> (raw)
Hello, Stephen, Andrew.
I just applied rather invasive API update to cgroup/for-3.12, which
led to conflicts in two files - include/net/netprio_cgroup.h and
mm/memcontrol.c. The former is trivial context conflict and the two
changes conflicting are independent. The latter contains several
conflicts and unfortunately isn't trivial, especially the iterator
update and the memcg patches should probably be rebased.
I can hold back pushing for-3.12 into for-next until the memcg patches
are rebased. Would that work?
Thanks.
--
tejun
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next reply other threads:[~2013-08-09 0:34 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-09 0:34 Tejun Heo [this message]
2013-08-09 7:22 ` [HEADSUP] conflicts between cgroup/for-3.12 and memcg Michal Hocko
2013-08-09 14:19 ` Tejun Heo
2013-08-09 15:47 ` Michal Hocko
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=20130809003402.GC13427@mtj.dyndns.org \
--to=tj@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=bsingharora@gmail.com \
--cc=cgroups@vger.kernel.org \
--cc=hannes@cmpxchg.org \
--cc=kamezawa.hiroyu@jp.fujitsu.com \
--cc=linux-mm@kvack.org \
--cc=linux-next@vger.kernel.org \
--cc=mhocko@suse.cz \
--cc=sfr@canb.auug.org.au \
/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).