You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Linus Torvalds d206e09036 Merge branch 'for-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup ... Pull cgroup changes from Tejun Heo: "A lot of activities on cgroup side. The big changes are focused on making cgroup hierarchy handling saner. - cgroup_rmdir() had peculiar semantics - it allowed cgroup destruction to be vetoed by individual controllers and tried to drain refcnt synchronously. The vetoing never worked properly and caused good deal of contortions in cgroup. memcg was the last reamining user. Michal Hocko removed the usage and cgroup_rmdir() path has been simplified significantly. This was done in a separate branch so that the memcg people can base further memcg changes on top. - The above allowed cleaning up cgroup lifecycle management and implementation of generic cgroup iterators which are used to improve hierarchy support. - cgroup_freezer updated to allow migration in and out of a frozen cgroup and handle hierarchy. If a cgroup is frozen, all descendant cgroups are frozen. - netcls_cgroup and netprio_cgroup updated to handle hierarchy properly. - Various fixes and cleanups. - Two merge commits. One to pull in memcg and rmdir cleanups (needed to build iterators). The other pulled in cgroup/for-3.7-fixes for device_cgroup fixes so that further device_cgroup patches can be stacked on top." Fixed up a trivial conflict in mm/memcontrol.c as per Tejun (due to commit bea8c150a7 ("memcg: fix hotplugged memory zone oops") in master touching code close to commit 2ef37d3fe4 ("memcg: Simplify mem_cgroup_force_empty_list error handling") in for-3.8) * 'for-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup: (65 commits) cgroup: update Documentation/cgroups/00-INDEX cgroup_rm_file: don't delete the uncreated files cgroup: remove subsystem files when remounting cgroup cgroup: use cgroup_addrm_files() in cgroup_clear_directory() cgroup: warn about broken hierarchies only after css_online cgroup: list_del_init() on removed events cgroup: fix lockdep warning for event_control cgroup: move list add after list head initilization netprio_cgroup: allow nesting and inherit config on cgroup creation netprio_cgroup: implement netprio[_set]_prio() helpers netprio_cgroup: use cgroup->id instead of cgroup_netprio_state->prioidx netprio_cgroup: reimplement priomap expansion netprio_cgroup: shorten variable names in extend_netdev_table() netprio_cgroup: simplify write_priomap() netcls_cgroup: move config inheritance to ->css_online() and remove .broken_hierarchy marking cgroup: remove obsolete guarantee from cgroup_task_migrate. cgroup: add cgroup->id cgroup, cpuset: remove cgroup_subsys->post_clone() cgroup: s/CGRP_CLONE_CHILDREN/CGRP_CPUSET_CLONE_CHILDREN/ cgroup: rename ->create/post_create/pre_destroy/destroy() to ->css_alloc/online/offline/free() ...		12 years ago
..
Kconfig	PM / Domains: Add power off/on function for system core suspend stage	13 years ago
Makefile	PM / Sleep: Add user space interface for manipulating wakeup sources, v3	13 years ago
autosleep.c	PM / Sleep: Add "prevent autosleep time" statistics to wakeup sources	13 years ago
block_io.c	…
console.c	PM / VT: Cleanup #if defined uglyness and fix compile error	14 years ago
hibernate.c	Power management updates for 3.6	13 years ago
main.c	PM / sysfs: replace strict_str* with kstrto*	12 years ago
power.h	PM / Hibernate: Enable suspend to both for in-kernel hibernation.	13 years ago
poweroff.c	properly __init-annotate pm_sysrq_init()	13 years ago
process.c	freezer: change ptrace_stop/do_signal_stop to use freezable_schedule()	12 years ago
qos.c	Merge branch 'pm-sleep'	12 years ago
snapshot.c	Power management updates for 3.4	13 years ago
suspend.c	Revert "NMI watchdog: fix for lockup detector breakage on resume"	13 years ago
suspend_test.c	…
swap.c	PM / Hibernate: use rb_entry	12 years ago
user.c	Make wait_for_device_probe() also do scsi_complete_async_scans()	13 years ago
wakelock.c	PM / Sleep: Require CAP_BLOCK_SUSPEND to use wake_lock/wake_unlock	13 years ago