From: Thierry Reding <thierry.reding@gmail•com>
To: Tejun Heo <tj@kernel•org>, Li Zefan <lizefan@huawei•com>,
Johannes Weiner <hannes@cmpxchg•org>,
Michal Hocko <mhocko@suse•cz>,
Balbir Singh <bsingharora@gmail•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org
Subject: linux-next: manual merge of the cgroup tree
Date: Tue, 1 Oct 2013 13:07:19 +0200 [thread overview]
Message-ID: <1380625644-11331-3-git-send-email-treding@nvidia.com> (raw)
In-Reply-To: <20131001110344.GA20249@ulmo.nvidia.com>
Today's linux-next merge of the cgroup tree got a conflict in:
mm/memcontrol.c
I fixed it up (see below). Please check if the resolution looks correct.
Thanks,
Thierry
---
diff --cc mm/memcontrol.c
index 1c52ddb,65a46ef..84dcc5c
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@@ -6203,9 -5979,6 +6216,8 @@@ static void __mem_cgroup_free(struct me
int node;
size_t size = memcg_size();
+ mem_cgroup_remove_from_trees(memcg);
- free_css_id(&mem_cgroup_subsys, &memcg->css);
+
for_each_node(node)
free_mem_cgroup_per_zone_info(memcg, node);
next prev parent reply other threads:[~2013-10-01 11:07 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-01 11:03 linux-next: Tree for Oct 1 Thierry Reding
2013-10-01 11:07 ` linux-next: manual merge of the bcon tree Thierry Reding
2013-10-01 14:26 ` Jörn Engel
2013-10-01 11:07 ` linux-next: manual merge of the block tree Thierry Reding
2013-10-01 11:07 ` Thierry Reding [this message]
2013-10-01 11:07 ` linux-next: manual merge of the driver-core tree Thierry Reding
2013-10-01 13:54 ` Greg Kroah-Hartman
2013-10-01 11:07 ` linux-next: manual merge of the net-next tree Thierry Reding
2013-10-01 11:07 ` linux-next: manual merge of the random tree Thierry Reding
2013-10-01 11:29 ` Theodore Ts'o
2013-10-01 11:07 ` linux-next: manual merge of the sh tree Thierry Reding
2013-10-01 13:53 ` Greg Kroah-Hartman
2013-10-01 11:07 ` linux-next: manual merge of the vfs tree Thierry Reding
-- strict thread matches above, loose matches on Subject: below --
2013-09-30 11:26 linux-next: manual merge of the bcon tree Thierry Reding
[not found] ` <1380540373-25352-1-git-send-email-treding-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
2013-09-30 11:26 ` linux-next: manual merge of the cgroup tree Thierry Reding
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=1380625644-11331-3-git-send-email-treding@nvidia.com \
--to=thierry.reding@gmail$(echo .)com \
--cc=bsingharora@gmail$(echo .)com \
--cc=hannes@cmpxchg$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=lizefan@huawei$(echo .)com \
--cc=mhocko@suse$(echo .)cz \
--cc=tj@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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