diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-12-21 11:13:37 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-12-21 11:13:37 -0800 |
commit | 9035a8961b504d0997369509ab8c6b1f0a4ee33d (patch) | |
tree | 99aad197f1c60efe849185fff7a8f14a7792f748 /kernel | |
parent | 409232a45096a2c0d06634269a7c1c3412ecf910 (diff) | |
parent | 6d0e4827b72afc71349784336d5eb6df4df106e6 (diff) | |
download | linux-stable-9035a8961b504d0997369509ab8c6b1f0a4ee33d.tar.gz linux-stable-9035a8961b504d0997369509ab8c6b1f0a4ee33d.tar.bz2 linux-stable-9035a8961b504d0997369509ab8c6b1f0a4ee33d.zip |
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
Pull block fixes from Jens Axboe:
"It's been a few weeks, so here's a small collection of fixes that
should go into the current series.
This contains:
- NVMe pull request from Christoph, with a few important fixes.
- kyber hang fix from Omar.
- A blk-throttl fix from Shaohua, fixing a case where we double
charge a bio.
- Two call_single_data alignment fixes from me, fixing up some
unfortunate changes that went into 4.14 without being properly
reviewed on the block side (since nobody was CC'ed on the
patch...).
- A bounce buffer fix in two parts, one from me and one from Ming.
- Revert bdi debug error handling patch. It's causing boot issues for
some folks, and a week down the line, we're still no closer to a
fix. Revert this patch for now until it's figured out, then we can
retry for 4.16"
* 'for-linus' of git://git.kernel.dk/linux-block:
Revert "bdi: add error handle for bdi_debug_register"
null_blk: unalign call_single_data
block: unalign call_single_data in struct request
block-throttle: avoid double charge
block: fix blk_rq_append_bio
block: don't let passthrough IO go into .make_request_fn()
nvme: setup streams after initializing namespace head
nvme: check hw sectors before setting chunk sectors
nvme: call blk_integrity_unregister after queue is cleaned up
nvme-fc: remove double put reference if admin connect fails
nvme: set discard_alignment to zero
kyber: fix another domain token wait queue hang
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions