diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-20 13:06:20 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-20 13:06:20 -0800 |
| commit | 5a1efc6e68a095917277459091fafba6a6baef17 (patch) | |
| tree | 9f3d9b14893689cee1b7918e51b15ca135f6563a /crypto/async_tx/async_xor.c | |
| parent | Merge tag 'md/3.13' of git://neil.brown.name/md (diff) | |
| parent | blk-mq: add blktrace insert event trace (diff) | |
| download | linux-dev-5a1efc6e68a095917277459091fafba6a6baef17.tar.xz linux-dev-5a1efc6e68a095917277459091fafba6a6baef17.zip | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
Pull block IO fixes from Jens Axboe:
"Normally I'd defer my initial for-linus pull request until after the
merge window, but a race was uncovered in the virtio-blk conversion to
blk-mq that could cause hangs. So here's a small collection of fixes
for you to pull:
- The fix for the virtio-blk IO hang reported by Dave Chinner, from
Shaohua and myself.
- Add the Insert blktrace event for blk-mq. This makes 'btt' happy
when it is doing it's state transition analysis.
- Ensure that blk-mq has disk/partition stats enabled by default,
instead of making it opt-in.
- A fix for __bio_add_page() and large sector counts"
* 'for-linus' of git://git.kernel.dk/linux-block:
blk-mq: add blktrace insert event trace
virtio-blk: virtqueue_kick() must be ordered with other virtqueue operations
blk-mq: ensure that we set REQ_IO_STAT so diskstats work
bio: fix argument of __bio_add_page() for max_sectors > 0xffff
Diffstat (limited to 'crypto/async_tx/async_xor.c')
0 files changed, 0 insertions, 0 deletions