Linus Torvalds 0d167518e0 Merge branch 'for-3.5/core' of git://git.kernel.dk/linux-block ... Merge block/IO core bits from Jens Axboe: "This is a bit bigger on the core side than usual, but that is purely because we decided to hold off on parts of Tejun's submission on 3.4 to give it a bit more time to simmer. As a consequence, it's seen a long cycle in for-next. It contains: - Bug fix from Dan, wrong locking type. - Relax splice gifting restriction from Eric. - A ton of updates from Tejun, primarily for blkcg. This improves the code a lot, making the API nicer and cleaner, and also includes fixes for how we handle and tie policies and re-activate on switches. The changes also include generic bug fixes. - A simple fix from Vivek, along with a fix for doing proper delayed allocation of the blkcg stats." Fix up annoying conflict just due to different merge resolution in Documentation/feature-removal-schedule.txt * 'for-3.5/core' of git://git.kernel.dk/linux-block: (92 commits) blkcg: tg_stats_alloc_lock is an irq lock vmsplice: relax alignement requirements for SPLICE_F_GIFT blkcg: use radix tree to index blkgs from blkcg blkcg: fix blkcg->css ref leak in __blkg_lookup_create() block: fix elvpriv allocation failure handling block: collapse blk_alloc_request() into get_request() blkcg: collapse blkcg_policy_ops into blkcg_policy blkcg: embed struct blkg_policy_data in policy specific data blkcg: mass rename of blkcg API blkcg: style cleanups for blk-cgroup.h blkcg: remove blkio_group->path[] blkcg: blkg_rwstat_read() was missing inline blkcg: shoot down blkgs if all policies are deactivated blkcg: drop stuff unused after per-queue policy activation update blkcg: implement per-queue policy activation blkcg: add request_queue->root_blkg blkcg: make request_queue bypassing on allocation blkcg: make sure blkg_lookup() returns %NULL if @q is bypassing blkcg: make blkg_conf_prep() take @pol and return with queue lock held blkcg: remove static policy ID enums ...		2012-05-30 08:52:42 -07:00
..
partitions	s390/dasd: re-prioritize partition detection message	2012-05-16 14:42:51 +02:00
blk-cgroup.c	blkcg: use radix tree to index blkgs from blkcg	2012-04-20 10:06:40 +02:00
blk-cgroup.h	blkcg: use radix tree to index blkgs from blkcg	2012-04-20 10:06:40 +02:00
blk-core.c	Linux 3.4-rc5	2012-05-01 14:29:55 +02:00
blk-exec.c
blk-flush.c
blk-integrity.c
blk-ioc.c	Merge branch 'for-3.5' of ../cgroup into block/for-3.5/core-merged	2012-04-01 12:55:00 -07:00
blk-iopoll.c
blk-lib.c
blk-map.c
blk-merge.c
blk-settings.c
blk-softirq.c
blk-sysfs.c
blk-tag.c
blk-throttle.c	blkcg: tg_stats_alloc_lock is an irq lock	2012-05-23 12:16:21 +02:00
blk-timeout.c
blk.h	Merge branch 'for-3.5' of ../cgroup into block/for-3.5/core-merged	2012-04-01 12:55:00 -07:00
bsg-lib.c
bsg.c
cfq-iosched.c	Linux 3.4-rc5	2012-05-01 14:29:55 +02:00
compat_ioctl.c
deadline-iosched.c
elevator.c	blkcg: implement per-queue policy activation	2012-04-20 10:06:06 +02:00
genhd.c	block: fix buffer overflow when printing partition UUIDs	2012-05-15 08:22:04 +02:00
ioctl.c
Kconfig
Kconfig.iosched
Makefile
noop-iosched.c
partition-generic.c
scsi_ioctl.c