Linus Torvalds
68d47a137c
Merge branch 'for-3.7-hierarchy' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup ...
Pull cgroup hierarchy update from Tejun Heo:
"Currently, different cgroup subsystems handle nested cgroups
completely differently. There's no consistency among subsystems and
the behaviors often are outright broken.
People at least seem to agree that the broken hierarhcy behaviors need
to be weeded out if any progress is gonna be made on this front and
that the fallouts from deprecating the broken behaviors should be
acceptable especially given that the current behaviors don't make much
sense when nested.
This patch makes cgroup emit warning messages if cgroups for
subsystems with broken hierarchy behavior are nested to prepare for
fixing them in the future. This was put in a separate branch because
more related changes were expected (didn't make it this round) and the
memory cgroup wanted to pull in this and make changes on top."
* 'for-3.7-hierarchy' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
cgroup: mark subsystems with broken hierarchy support and whine if cgroups are nested for them
2012-10-02 10:52:28 -07:00
s390/partitions: make partition detection independent from DASD ioctls
2012-09-26 15:45:05 +02:00
cgroup: mark subsystems with broken hierarchy support and whine if cgroups are nested for them
2012-09-14 12:01:16 -07:00
blkcg: implement per-blkg request allocation
2012-06-26 18:42:49 -04:00
Merge branch 'for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
2012-10-02 09:54:49 -07:00
[SCSI] block: Fix blk_execute_rq_nowait() dead queue handling
2012-07-20 08:58:39 +01:00
blk-flush: move the queue kick into
2011-10-24 16:24:31 +02:00
block: add export.h to files using EXPORT_SYMBOL/THIS_MODULE macros
2011-10-31 19:31:12 -04:00
block: uninitialized ioc->nr_tasks triggers WARN_ON
2012-08-01 12:17:27 +02:00
tree-wide: fix assorted typos all over the place
2009-12-04 15:39:55 +01:00
block: split discard into aligned requests
2012-08-02 09:48:50 +02:00
block: re-use existing 'reading' variable instead of checking direction again
2011-12-21 15:27:24 +01:00
block: Add blk_bio_map_sg() helper
2012-08-02 23:42:04 +02:00
block: do not artificially constrain max_sectors for stacking drivers
2012-08-01 10:44:28 +02:00
sched, block: Unify cache detection
2012-01-27 13:28:48 +01:00
blkcg: implement per-blkg request allocation
2012-06-26 18:42:49 -04:00
block: fix blk_queue_end_tag()
2011-12-29 09:16:28 +01:00
workqueue: use mod_delayed_work() instead of __cancel + queue
2012-08-21 13:18:24 -07:00
block: Drop dead function blk_abort_queue()
2012-06-15 08:46:23 +02:00
block: remove dead func declaration
2012-08-01 12:25:54 +02:00
block: drop custom queue draining used by scsi_transport_{iscsi|fc}
2012-06-25 11:53:48 +02:00
bsg: fix sysfs link remove warning
2012-02-08 20:02:03 +01:00
block: blkcg_policy_cfq shouldn't be used if !CONFIG_CFQ_GROUP_IOSCHED
2012-06-04 10:02:29 +02:00
block: Add BLKROTATIONAL ioctl
2012-01-11 16:29:31 +01:00
elevator: make elevator_init_fn() return 0/-errno
2012-03-06 21:27:21 +01:00
blkcg: implement per-queue policy activation
2012-04-20 10:06:06 +02:00
Merge branch 'for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
2012-10-02 09:54:49 -07:00
blk: add an upper sanity check on partition adding
2012-09-18 11:56:29 +02:00
move fs/partitions to block/
2012-01-03 22:54:06 -05:00
blkcg: make CONFIG_BLK_CGROUP bool
2012-03-06 21:27:21 +01:00
separate partition format handling from generic code
2012-01-03 22:54:06 -05:00
elevator: make elevator_init_fn() return 0/-errno
2012-03-06 21:27:21 +01:00
block: add partition resize function to blkpg ioctl
2012-08-01 12:24:18 +02:00
scsi: Silence unnecessary warnings about ioctl to partition
2012-06-15 12:52:46 +02:00
68d47a137c