From: Tejun Heo <tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
To: Linus Torvalds
<torvalds-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b@public.gmane.org>
Cc: cgroups-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
containers-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org,
linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Subject: [GIT PULL] cgroup changes for 3.5-rc1
Date: Tue, 22 May 2012 10:34:50 -0700 [thread overview]
Message-ID: <20120522173450.GG14339@google.com> (raw)
Hello, Linus.
Please pull from the following branch to receive cgroup changes for
3.5-rc1.
git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git for-3.5
cgroup file type addition / removal is updated so that file types are
added and removed instead of individual files so that dynamic file
type addition / removal can be implemented by cgroup and used by
controllers. blkio controller changes which will come through block
tree are dependent on this. Other changes include res_counter cleanup
and disallowing kthread / PF_THREAD_BOUND threads to be attached to
non-root cgroups.
There's a reported bug with the file type addition / removal handling
which can lead to oops on cgroup umount. The issue is being looked
into. It shouldn't cause problems for most setups and isn't a
security concern.
Merging with mainline causes a conflict in
feature-removal-schedule.txt. Simple append collision which can be
trivially resolved.
Thanks.
Frederic Weisbecker (2):
res_counter: Merge res_counter_charge and res_counter_charge_nofail
res_counter: Account max_usage when calling res_counter_charge_nofail()
Glauber Costa (2):
cgroup: pass struct mem_cgroup instead of struct cgroup to socket memcg
cgroup: get rid of populate for memcg
Mike Galbraith (1):
cgroups: disallow attaching kthreadd or PF_THREAD_BOUND threads
Tejun Heo (16):
cgroup: deprecate remount option changes
cgroup: move cgroup_clear_directory() call out of cgroup_populate_dir()
cgroup: build list of all cgroups under a given cgroupfs_root
cgroup: implement cgroup_add_cftypes() and friends
cgroup: merge cft_release_agent cftype array into the base files array
cgroup: relocate cftype and cgroup_subsys definitions in controllers
cgroup: convert all non-memcg controllers to the new cftype interface
memcg: always create memsw files if CONFIG_CGROUP_MEM_RES_CTLR_SWAP
cgroup: convert memcg controller to the new cftype interface
cgroup: remove cgroup_add_file[s]()
cgroup: relocate __d_cgrp() and __d_cft()
cgroup: introduce struct cfent
cgroup: implement cgroup_rm_cftypes()
cgroup: use negative bias on css->refcnt to block css_tryget()
cgroup: make css->refcnt clearing on cgroup removal optional
cgroup: remove cgroup_subsys->populate()
Documentation/cgroups/resource_counter.txt | 4 +-
Documentation/feature-removal-schedule.txt | 9 +
block/blk-cgroup.c | 45 +--
include/linux/cgroup.h | 81 +++--
include/linux/res_counter.h | 2 +-
include/net/sock.h | 12 +-
include/net/tcp_memcontrol.h | 4 +-
kernel/cgroup.c | 564 +++++++++++++++++++++-------
kernel/cgroup_freezer.c | 11 +-
kernel/cpuset.c | 31 +-
kernel/res_counter.c | 71 ++--
kernel/sched/core.c | 16 +-
mm/memcontrol.c | 115 +++---
net/core/netprio_cgroup.c | 30 +-
net/core/sock.c | 10 +-
net/ipv4/tcp_memcontrol.c | 77 ++--
net/sched/cls_cgroup.c | 31 +-
security/device_cgroup.c | 10 +-
18 files changed, 685 insertions(+), 438 deletions(-)
--
tejun
WARNING: multiple messages have this Message-ID (diff)
From: Tejun Heo <tj@kernel.org>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: linux-kernel@vger.kernel.org, Li Zefan <lizefan@huawei.com>,
containers@lists.linux-foundation.org, cgroups@vger.kernel.org
Subject: [GIT PULL] cgroup changes for 3.5-rc1
Date: Tue, 22 May 2012 10:34:50 -0700 [thread overview]
Message-ID: <20120522173450.GG14339@google.com> (raw)
Hello, Linus.
Please pull from the following branch to receive cgroup changes for
3.5-rc1.
git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git for-3.5
cgroup file type addition / removal is updated so that file types are
added and removed instead of individual files so that dynamic file
type addition / removal can be implemented by cgroup and used by
controllers. blkio controller changes which will come through block
tree are dependent on this. Other changes include res_counter cleanup
and disallowing kthread / PF_THREAD_BOUND threads to be attached to
non-root cgroups.
There's a reported bug with the file type addition / removal handling
which can lead to oops on cgroup umount. The issue is being looked
into. It shouldn't cause problems for most setups and isn't a
security concern.
Merging with mainline causes a conflict in
feature-removal-schedule.txt. Simple append collision which can be
trivially resolved.
Thanks.
Frederic Weisbecker (2):
res_counter: Merge res_counter_charge and res_counter_charge_nofail
res_counter: Account max_usage when calling res_counter_charge_nofail()
Glauber Costa (2):
cgroup: pass struct mem_cgroup instead of struct cgroup to socket memcg
cgroup: get rid of populate for memcg
Mike Galbraith (1):
cgroups: disallow attaching kthreadd or PF_THREAD_BOUND threads
Tejun Heo (16):
cgroup: deprecate remount option changes
cgroup: move cgroup_clear_directory() call out of cgroup_populate_dir()
cgroup: build list of all cgroups under a given cgroupfs_root
cgroup: implement cgroup_add_cftypes() and friends
cgroup: merge cft_release_agent cftype array into the base files array
cgroup: relocate cftype and cgroup_subsys definitions in controllers
cgroup: convert all non-memcg controllers to the new cftype interface
memcg: always create memsw files if CONFIG_CGROUP_MEM_RES_CTLR_SWAP
cgroup: convert memcg controller to the new cftype interface
cgroup: remove cgroup_add_file[s]()
cgroup: relocate __d_cgrp() and __d_cft()
cgroup: introduce struct cfent
cgroup: implement cgroup_rm_cftypes()
cgroup: use negative bias on css->refcnt to block css_tryget()
cgroup: make css->refcnt clearing on cgroup removal optional
cgroup: remove cgroup_subsys->populate()
Documentation/cgroups/resource_counter.txt | 4 +-
Documentation/feature-removal-schedule.txt | 9 +
block/blk-cgroup.c | 45 +--
include/linux/cgroup.h | 81 +++--
include/linux/res_counter.h | 2 +-
include/net/sock.h | 12 +-
include/net/tcp_memcontrol.h | 4 +-
kernel/cgroup.c | 564 +++++++++++++++++++++-------
kernel/cgroup_freezer.c | 11 +-
kernel/cpuset.c | 31 +-
kernel/res_counter.c | 71 ++--
kernel/sched/core.c | 16 +-
mm/memcontrol.c | 115 +++---
net/core/netprio_cgroup.c | 30 +-
net/core/sock.c | 10 +-
net/ipv4/tcp_memcontrol.c | 77 ++--
net/sched/cls_cgroup.c | 31 +-
security/device_cgroup.c | 10 +-
18 files changed, 685 insertions(+), 438 deletions(-)
--
tejun
next reply other threads:[~2012-05-22 17:34 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-22 17:34 Tejun Heo [this message]
2012-05-22 17:34 ` [GIT PULL] cgroup changes for 3.5-rc1 Tejun Heo
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=20120522173450.GG14339@google.com \
--to=tj-dgejt+ai2ygdnm+yrofe0a@public.gmane.org \
--cc=cgroups-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=containers-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org \
--cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=torvalds-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b@public.gmane.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.