mirror of https://github.com/torvalds/linux.git
64f8de4da7
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. |
||
|---|---|---|
| .. | ||
| 9p.h | ||
| asoc.h | ||
| block.h | ||
| btrfs.h | ||
| compaction.h | ||
| ext3.h | ||
| ext4.h | ||
| gfpflags.h | ||
| gpio.h | ||
| irq.h | ||
| jbd.h | ||
| jbd2.h | ||
| kmem.h | ||
| kvm.h | ||
| lock.h | ||
| mce.h | ||
| migrate.h | ||
| module.h | ||
| napi.h | ||
| net.h | ||
| oom.h | ||
| power.h | ||
| printk.h | ||
| random.h | ||
| ras.h | ||
| rcu.h | ||
| regmap.h | ||
| regulator.h | ||
| rpm.h | ||
| sched.h | ||
| scsi.h | ||
| signal.h | ||
| skb.h | ||
| sock.h | ||
| sunrpc.h | ||
| syscalls.h | ||
| task.h | ||
| timer.h | ||
| udp.h | ||
| vmscan.h | ||
| workqueue.h | ||
| writeback.h | ||
| xen.h | ||