Merge branch 'for-linus' of git://git.kernel.dk/linux-block

Browse source

Pull block fixes from Jens Axboe:
 "A few fixes that should go into this series:

   - Regression fix for ide-cd, ensuring that a request is fully
     initialized. From Hongxu.

   - Ditto fix for virtio_blk, from Bart.

   - NVMe fix from Keith, ensuring that we set the right block size on
     revalidation. If the block size changed, we'd be in trouble without
     it.

   - NVMe rdma fix from Sagi, fixing a potential hang while the
     controller is being removed"

* 'for-linus' of git://git.kernel.dk/linux-block:
  ide:ide-cd: fix kernel panic resulting from missing scsi_req_init
  nvme: Fix setting logical block format when revalidating
  virtio_blk: Fix an SG_IO regression
  nvme-rdma: fix possible hang when issuing commands during ctrl removal

...

This commit is contained in:

Linus Torvalds 2017-11-01 14:46:38 -07:00

parent 4f2ba5dc18 79d73346ac

commit 1cc15701cd

4 changed files with 21 additions and 4 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

12

drivers/block/virtio_blk.c

View file

1

drivers/ide/ide-cd.c

View file

1

drivers/nvme/host/core.c

View file

11

drivers/nvme/host/rdma.c

View file