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
..
aoe	aoe: Fix unitialized var usage	2013-03-25 13:46:14 -06:00
drbd	drbd: convert to idr_alloc()	2013-02-27 19:10:15 -08:00
mtip32xx	mtip32xx: fix error return code in mtip_pci_probe()	2013-03-22 08:58:23 -06:00
paride
rsxx	rsxx: remove unused variable	2013-03-26 14:48:12 -06:00
xen-blkback	xen-blkback: don't store dev_bus_addr	2013-03-19 12:50:00 -04:00
amiflop.c
ataflop.c
brd.c	block: Add bio_end_sector()	2013-03-23 14:15:29 -07:00
cciss_cmd.h
cciss_scsi.c
cciss_scsi.h
cciss.c	cciss: fix invalid use of sizeof in cciss_find_cfgtables()	2013-03-22 12:22:49 -06:00
cciss.h
cpqarray.c
cpqarray.h
cryptoloop.c
DAC960.c	Merge branch 'for-3.9/drivers' of git://git.kernel.dk/linux-block	2013-02-28 13:16:07 -08:00
DAC960.h
floppy.c	block: Remove bi_idx references	2013-03-23 14:15:31 -07:00
hd.c
ida_cmd.h
ida_ioctl.h
Kconfig	block: IBM RamSan 70/80 branding changes.	2013-03-11 19:53:55 +01:00
loop.c	loop: cleanup partitions when detaching loop device	2013-03-22 12:21:53 -06:00
Makefile
mg_disk.c	mg_disk: fix error return code in mg_probe()	2013-03-28 09:43:43 -06:00
nbd.c	nbd: fix sparse warning	2013-02-27 19:10:22 -08:00
nvme.c	Merge git://git.infradead.org/users/willy/linux-nvme	2013-03-22 16:43:53 -07:00
osdblk.c
pktcdvd.c	pktcdvd: Use bio_reset() in disabled code to kill bi_idx usage	2013-03-23 14:15:37 -07:00
ps3disk.c
ps3vram.c
rbd_types.h
rbd.c	Merge branch 'writeback-workqueue' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq into for-3.10/core	2013-04-02 10:04:39 +02:00
smart1,2.h
sunvdc.c
swim3.c	drivers/block/swim3.c: fix null pointer dereference	2013-02-22 10:42:46 +01:00
swim_asm.S
swim.c
sx8.c
umem.c
umem.h
virtio_blk.c
xen-blkfront.c	xen-blkfront: remove frame list from blk_shadow	2013-03-19 12:50:07 -04:00
xsysace.c
z2ram.c