[GIT,PULL] Block fixes for 5.12-rc2

Pull-request

git://git.kernel.dk/linux-block.git tags/block-5.12-2021-03-05

Message

Jens Axboe March 5, 2021, 6:09 p.m. UTC

Hi Linus,

Changes that should go into 5.12-rc2:

- NVMe fixes:
	- more device quirks (Julian Einwag, Zoltán Böszörményi,
	  Pascal Terjan)
	- fix a hwmon error return (Daniel Wagner)
	- fix the keep alive timeout initialization (Martin George)
	- ensure the model_number can't be changed on a used subsystem
	  (Max Gurtovoy)

- rsxx missing -EFAULT on copy_to_user() failure (Dan)

- rsxx remove unused linux.h include (Tian)

- Kill unused RQF_SORTED (Jean)

- Updated outdated BFQ comments (Joseph)

- Revert work-around commit for bd_size_lock, since we removed the
  offending user in this merge window (Damien)

Please pull!


The following changes since commit fe07bfda2fb9cdef8a4d4008a409bb02f35f1bd8:

  Linux 5.12-rc1 (2021-02-28 16:05:19 -0800)

are available in the Git repository at:

  git://git.kernel.dk/linux-block.git tags/block-5.12-2021-03-05

for you to fetch changes up to a2b658e4a07d05fcf056e2b9524ed8cc214f486a:

  Merge tag 'nvme-5.12-2021-03-05' of git://git.infradead.org/nvme into block-5.12 (2021-03-05 09:13:07 -0700)

----------------------------------------------------------------
block-5.12-2021-03-05

----------------------------------------------------------------
Damien Le Moal (1):
      block: revert "block: fix bd_size_lock use"

Dan Carpenter (1):
      rsxx: Return -EFAULT if copy_to_user() fails

Daniel Wagner (1):
      nvme-hwmon: Return error code when registration fails

Jean Delvare (1):
      block: Drop leftover references to RQF_SORTED

Jens Axboe (1):
      Merge tag 'nvme-5.12-2021-03-05' of git://git.infradead.org/nvme into block-5.12

Joseph Qi (1):
      block/bfq: update comments and default value in docs for fifo_expire

Julian Einwag (1):
      nvme-pci: mark Seagate Nytro XM1440 as QUIRK_NO_NS_DESC_LIST.

Martin George (1):
      nvme-fabrics: fix kato initialization

Max Gurtovoy (1):
      nvmet: model_number must be immutable once set

Pascal Terjan (1):
      nvme-pci: add quirks for Lexar 256GB SSD

Tian Tao (1):
      rsxx: remove unused including <linux/version.h>

Zoltán Böszörményi (1):
      nvme-pci: mark Kingston SKC2000 as not supporting the deepest power state

 Documentation/block/bfq-iosched.rst |  4 +--
 block/bfq-iosched.c                 |  2 +-
 block/blk-mq-debugfs.c              |  1 -
 block/blk-mq-sched.c                |  6 +----
 block/genhd.c                       |  5 ++--
 block/partitions/core.c             |  6 ++---
 drivers/block/rsxx/core.c           |  8 +++---
 drivers/block/rsxx/rsxx_priv.h      |  1 -
 drivers/nvme/host/fabrics.c         |  5 +++-
 drivers/nvme/host/hwmon.c           |  1 +
 drivers/nvme/host/pci.c             |  8 +++++-
 drivers/nvme/target/admin-cmd.c     | 36 ++++++++++++++++++--------
 drivers/nvme/target/configfs.c      | 50 +++++++++++++++++--------------------
 drivers/nvme/target/core.c          |  2 +-
 drivers/nvme/target/nvmet.h         |  7 +-----
 include/linux/blkdev.h              |  2 --
 16 files changed, 75 insertions(+), 69 deletions(-)

Comments

[e-mail] March 5, 2021, 9:59 p.m. UTC | #1

The pull request you sent on Fri, 5 Mar 2021 11:09:21 -0700:

> git://git.kernel.dk/linux-block.git tags/block-5.12-2021-03-05

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/47454caf45f0481988912a4980ef751a1c637b76

Thank you!