Commit 9a1d6c9e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-5.15/drivers-2021-08-30' of git://git.kernel.dk/linux-block

Pull block driver updates from Jens Axboe:
 "Sitting on top of the core block changes, here are the driver changes
  for the 5.15 merge window:

   - NVMe updates via Christoph:
       - suspend improvements for devices with an HMB (Keith Busch)
       - handle double completions more gacefull (Sagi Grimberg)
       - cleanup the selects for the nvme core code a bit (Sagi Grimberg)
       - don't update queue count when failing to set io queues (Ruozhu Li)
       - various nvmet connect fixes (Amit Engel)
       - cleanup lightnvm leftovers (Keith Busch, me)
       - small cleanups (Colin Ian King, Hou Pu)
       - add tracing for the Set Features command (Hou Pu)
       - CMB sysfs cleanups (Keith Busch)
       - add a mutex_destroy call (Keith Busch)

   - remove lightnvm subsystem. It's served its purpose and ultimately
     led to zoned nvme support, we no longer need it (Christoph)

   - revert floppy O_NDELAY fix (Denis)

   - nbd fixes (Hou, Pavel, Baokun)

   - nbd locking fixes (Tetsuo)

   - nbd device removal fixes (Christoph)

   - raid10 rcu warning fix (Xiao)

   - raid1 write behind fix (Guoqing)

   - rnbd fixes (Gioh, Md Haris)

   - misc fixes (Colin)"

* tag 'for-5.15/drivers-2021-08-30' of git://git.kernel.dk/linux-block: (42 commits)
  Revert "floppy: reintroduce O_NDELAY fix"
  raid1: ensure write behind bio has less than BIO_MAX_VECS sectors
  md/raid10: Remove unnecessary rcu_dereference in raid10_handle_discard
  nbd: remove nbd->destroy_complete
  nbd: only return usable devices from nbd_find_unused
  nbd: set nbd->index before releasing nbd_index_mutex
  nbd: prevent IDR lookups from finding partially initialized devices
  nbd: reset NBD to NULL when restarting in nbd_genl_connect
  nbd: add missing locking to the nbd_dev_add error path
  nvme: remove the unused NVME_NS_* enum
  nvme: remove nvm_ndev from ns
  nvme: Have NVME_FABRICS select NVME_CORE instead of transport drivers
  block: nbd: add sanity check for first_minor
  nvmet: check that host sqsize does not exceed ctrl MQES
  nvmet: avoid duplicate qid in connect cmd
  nvmet: pass back cntlid on successful completion
  nvme-rdma: don't update queue count when failing to set io queues
  nvme-tcp: don't update queue count when failing to set io queues
  nvme-tcp: pair send_mutex init with destroy
  nvme: allow user toggling hmb usage
  ...
parents 67936911 b5b0eba5
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -85,7 +85,6 @@ available subsections can be seen below.
   io-mapping
   io_ordering
   generic-counter
   lightnvm-pblk
   memory-devices/index
   men-chameleon-bus
   ntb
+0 −21
Original line number Diff line number Diff line
pblk: Physical Block Device Target
==================================

pblk implements a fully associative, host-based FTL that exposes a traditional
block I/O interface. Its primary responsibilities are:

  - Map logical addresses onto physical addresses (4KB granularity) in a
    logical-to-physical (L2P) table.
  - Maintain the integrity and consistency of the L2P table as well as its
    recovery from normal tear down and power outage.
  - Deal with controller- and media-specific constrains.
  - Handle I/O errors.
  - Implement garbage collection.
  - Maintain consistency across the I/O stack during synchronization points.

For more information please refer to:

  http://lightnvm.io

which maintains updated FAQs, manual pages, technical documentation, tools,
contacts, etc.
+0 −1
Original line number Diff line number Diff line
@@ -160,7 +160,6 @@ Code Seq# Include File Comments
'K'   all    linux/kd.h
'L'   00-1F  linux/loop.h                                            conflict!
'L'   10-1F  drivers/scsi/mpt3sas/mpt3sas_ctl.h                      conflict!
'L'   20-2F  linux/lightnvm.h
'L'   E0-FF  linux/ppdd.h                                            encrypted disk device driver
                                                                     <http://linux01.gwdg.de/~alatham/ppdd.html>
'M'   all    linux/soundcard.h                                       conflict!
+0 −9
Original line number Diff line number Diff line
@@ -10619,15 +10619,6 @@ F: LICENSES/
F:	scripts/spdxcheck-test.sh
F:	scripts/spdxcheck.py
LIGHTNVM PLATFORM SUPPORT
M:	Matias Bjorling <mb@lightnvm.io>
L:	linux-block@vger.kernel.org
S:	Maintained
W:	http://github/OpenChannelSSD
F:	drivers/lightnvm/
F:	include/linux/lightnvm.h
F:	include/uapi/linux/lightnvm.h
LINEAR RANGES HELPERS
M:	Mark Brown <broonie@kernel.org>
R:	Matti Vaittinen <matti.vaittinen@fi.rohmeurope.com>
+0 −2
Original line number Diff line number Diff line
@@ -51,8 +51,6 @@ source "drivers/net/Kconfig"

source "drivers/isdn/Kconfig"

source "drivers/lightnvm/Kconfig"

# input before char - char/joystick depends on it. As does USB.

source "drivers/input/Kconfig"
Loading