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
..
calibrate.c	init: check printed flag to skip printing message	2012-03-23 16:58:38 -07:00
do_mounts_initrd.c	get rid of pointless includes of ext2_fs.h	2012-03-31 16:03:15 -04:00
do_mounts_md.c	init: mark __user address space on string literals	2010-10-26 16:52:15 -07:00
do_mounts_rd.c	new helper: ext2_image_size()	2012-03-31 16:03:16 -04:00
do_mounts.c	init: don't try mounting device as nfs root unless type fully matches	2012-05-05 10:04:40 -07:00
do_mounts.h	md: move lots of #include lines out of .h files and into .c	2009-03-31 14:33:13 +11:00
init_task.c	init_task: Create generic init_task instance	2012-05-05 13:00:21 +02:00
initramfs.c	init/initramfs.c: should use umode_t	2012-01-03 22:55:14 -05:00
Kconfig	Merge branch 'for-3.5/core' of git://git.kernel.dk/linux-block	2012-05-30 08:52:42 -07:00
main.c	Driver core pull for 3.5-rc1	2012-05-22 16:02:13 -07:00
Makefile	init_task: Replace CONFIG_HAVE_GENERIC_INIT_TASK	2012-05-05 13:00:46 +02:00
noinitramfs.c	init: mark __user address space on string literals	2010-10-26 16:52:15 -07:00
version.c	userns: add a user_namespace as creator/owner of uts_namespace	2011-03-23 19:46:59 -07:00