mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-11-01 09:13:37 +00:00
ee89f81252
Pull block IO core bits from Jens Axboe:
"Below are the core block IO bits for 3.9. It was delayed a few days
since my workstation kept crashing every 2-8h after pulling it into
current -git, but turns out it is a bug in the new pstate code (divide
by zero, will report separately). In any case, it contains:
- The big cfq/blkcg update from Tejun and and Vivek.
- Additional block and writeback tracepoints from Tejun.
- Improvement of the should sort (based on queues) logic in the plug
flushing.
- _io() variants of the wait_for_completion() interface, using
io_schedule() instead of schedule() to contribute to io wait
properly.
- Various little fixes.
You'll get two trivial merge conflicts, which should be easy enough to
fix up"
Fix up the trivial conflicts due to hlist traversal cleanups (commit
|
||
|---|---|---|
| .. | ||
| 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 | ||