Skip to contentSkip to conversation

Block followup fixes for 4.4-rc3

GIT PULL Jens Axboe 1 participant 1 message Nov 25, 2015

lore
Share & tools
lore

Jens Axboe

author
#0 lore raw

Hi Linus,

Wasn't going to send off a new pull before next week, but the blk flush fix from Jan from the other day introduced a regression. It's rare enough not to have hit during testing, since it requires both a device that rejects the first flush, and bad timing while it does that. But since someone did hit it, let's get the revert into 4.4-rc3 so we don't have a released rc with that known issue.

Apart from that revert, three other fixes:

- From Christoph, a fix for a missing unmap in NVMe request preparation.

- An NVMe fix from Nishanth that fixes data corruption on powerpc.

- Also from Christoph, fix a list_del() attempt on blk-mq that didn't have a matching list_add() at timer start.

Please pull!

git://git.kernel.dk/linux-block.git for-linus

----------------------------------------------------------------
Christoph Hellwig (2):
nvme: add missing unmaps in nvme_queue_rq
block: fix blk_abort_request for blk-mq drivers

Jens Axboe (1):
Revert "blk-flush: Queue through IO scheduler when flush not required"

Nishanth Aravamudan (1):
NVMe: default to 4k device page size

 block/blk-flush.c       |  2 +-
 block/blk-timeout.c     |  8 +++++---
 drivers/nvme/host/pci.c | 30 ++++++++++++++++++------------
 3 files changed, 24 insertions(+), 16 deletions(-)
Signature · 1 line
Jens Axboe