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
..
acpi	Fixes:	2013-03-12 20:25:53 -07:00
asm-generic	asm-generic: move cmpxchg*_local defs to cmpxchg.h	2013-03-13 06:11:05 +01:00
clocksource	ImgTec Meta architecture changes for v3.9-rc1	2013-03-03 12:06:09 -08:00
crypto
drm	drm/radeon: add Richland pci ids	2013-03-15 18:47:19 -04:00
keys
linux	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
math-emu
media
memory
misc
net	ipv4: Fix ip-header identification for gso packets.	2013-03-26 13:50:05 -04:00
pcmcia
ras	edac: add support for error type "Info"	2013-02-21 14:16:27 -03:00
rdma	IB/core: Add "type 2" memory windows support	2013-02-21 11:51:45 -08:00
rxrpc
scsi	SCSI for-linus on 20130301	2013-03-02 11:42:16 -08:00
sound	arm-soc: late OMAP changes	2013-02-28 20:00:40 -08:00
target	target: Rename spc_get_write_same_sectors -> sbc_get_write_same_sectors	2013-02-23 12:46:14 -08:00
trace	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
uapi	net: fix *_DIAG_MAX constants	2013-03-21 12:36:33 -04:00
video	ARM: at91: fix LCD-wiring mode	2013-03-13 11:05:04 +01:00
xen	for-linus-20130331	2013-03-31 11:38:59 -07:00
Kbuild