Jens Axboe 64f8de4da7 Merge branch 'writeback-workqueue' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq into for-3.10/core ... Tejun writes: ----- This is the pull request for the earlier patchset[1] with the same name. It's only three patches (the first one was committed to workqueue tree) but the merge strategy is a bit involved due to the dependencies. * Because the conversion needs features from wq/for-3.10, block/for-3.10/core is based on rc3, and wq/for-3.10 has conflicts with rc3, I pulled mainline (rc5) into wq/for-3.10 to prevent those workqueue conflicts from flaring up in block tree. * Resolving the issue that Jan and Dave raised about debugging requires arch-wide changes. The patchset is being worked on[2] but it'll have to go through -mm after these changes show up in -next, and not included in this pull request. The three commits are located in the following git branch. git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git writeback-workqueue Pulling it into block/for-3.10/core produces a conflict in drivers/md/raid5.c between the following two commits. e3620a3ad5 ("MD RAID5: Avoid accessing gendisk or queue structs when not available") 2f6db2a707 ("raid5: use bio_reset()") The conflict is trivial - one removes an "if ()" conditional while the other removes "rbi->bi_next = NULL" right above it. We just need to remove both. The merged branch is available at git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git block-test-merge so that you can use it for verification. The test merge commit has proper merge description. While these changes are a bit of pain to route, they make code simpler and even have, while minute, measureable performance gain[3] even on a workload which isn't particularly favorable to showing the benefits of this conversion. ---- Fixed up the conflict. Conflicts: drivers/md/raid5.c Signed-off-by: Jens Axboe <axboe@kernel.dk>		2013-04-02 10:04:39 +02:00
..
partitions	block/partitions: optimize memory allocation in check_partition()	2013-02-27 19:10:21 -08:00
blk-cgroup.c	Merge branch 'for-3.9/core' of git://git.kernel.dk/linux-block	2013-02-28 12:52:24 -08:00
blk-cgroup.h	blkcg: implement blkg_[rw]stat_recursive_sum() and blkg_[rw]stat_merge()	2013-01-09 08:05:12 -08:00
blk-core.c	Merge branch 'for-jens' of http://evilpiepirate.org/git/linux-bcache into for-3.10/core	2013-03-24 21:38:59 -06:00
blk-exec.c	Merge branch 'for-3.9/core' of git://git.kernel.dk/linux-block	2013-02-28 12:52:24 -08:00
blk-flush.c	Block: blk-flush: Fixed indent code style	2013-03-22 12:22:51 -06:00
blk-integrity.c	bdi: allow block devices to say that they require stable page writes	2013-02-21 17:22:19 -08:00
blk-ioc.c	hlist: drop the node parameter from iterators	2013-02-27 19:10:24 -08:00
blk-iopoll.c	tree-wide: fix assorted typos all over the place	2009-12-04 15:39:55 +01:00
blk-lib.c	block: account iowait time when waiting for completion of IO request	2013-02-15 16:45:07 +01:00
blk-map.c	block: re-use existing 'reading' variable instead of checking direction again	2011-12-21 15:27:24 +01:00
blk-merge.c	block: Implement support for WRITE SAME	2012-09-20 14:31:45 +02:00
blk-settings.c	block: discard granularity might not be power of 2	2012-12-14 20:46:04 +01:00
blk-softirq.c	sched, block: Unify cache detection	2012-01-27 13:28:48 +01:00
blk-sysfs.c	block: RCU free request_queue	2013-01-09 08:05:13 -08:00
blk-tag.c	block/blk-tag.c: Remove useless kfree	2012-09-12 22:25:12 +02:00
blk-throttle.c	block: Rename queue dead flag	2012-12-06 14:30:58 +01:00
blk-timeout.c	block: Drop dead function blk_abort_queue()	2012-06-15 08:46:23 +02:00
blk.h	block,elevator: use new hashtable implementation	2013-01-11 14:43:13 +01:00
bsg-lib.c	bsg: Remove unused function bsg_goose_queue()	2012-12-06 14:33:02 +01:00
bsg.c	hlist: drop the node parameter from iterators	2013-02-27 19:10:24 -08:00
cfq-iosched.c	block: Add bio_end_sector()	2013-03-23 14:15:29 -07:00
compat_ioctl.c	block: Add BLKROTATIONAL ioctl	2012-01-11 16:29:31 +01:00
deadline-iosched.c	block: Add bio_end_sector()	2013-03-23 14:15:29 -07:00
elevator.c	block: implement runtime pm strategy	2013-03-22 22:22:15 -06:00
genhd.c	block: convert to idr_alloc()	2013-02-27 19:10:15 -08:00
ioctl.c	Merge branch 'for-3.7/core' of git://git.kernel.dk/linux-block	2012-10-11 09:04:23 +09:00
Kconfig	block: don't select PERCPU_RWSEM	2013-02-22 10:42:45 +01:00
Kconfig.iosched	blkcg: make CONFIG_BLK_CGROUP bool	2012-03-06 21:27:21 +01:00
Makefile	separate partition format handling from generic code	2012-01-03 22:54:06 -05:00
noop-iosched.c	elevator: make elevator_init_fn() return 0/-errno	2012-03-06 21:27:21 +01:00
partition-generic.c	loop: cleanup partitions when detaching loop device	2013-03-22 12:21:53 -06:00
scsi_ioctl.c	scsi: Silence unnecessary warnings about ioctl to partition	2012-06-15 12:52:46 +02:00