diff options
| author | Linus Torvalds <[email protected]> | 2021-03-05 12:59:37 -0800 | 
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2021-03-05 12:59:37 -0800 | 
| commit | 47454caf45f0481988912a4980ef751a1c637b76 (patch) | |
| tree | 71c8bc45cba3af9329e9f37259d176d8602a3975 /lib/dynamic_queue_limits.c | |
| parent | f292e8730a349577aaf13635399b39a50b8f5910 (diff) | |
| parent | a2b658e4a07d05fcf056e2b9524ed8cc214f486a (diff) | |
Merge tag 'block-5.12-2021-03-05' of git://git.kernel.dk/linux-block
Pull block fixes from Jens Axboe:
 - 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)
* tag 'block-5.12-2021-03-05' of git://git.kernel.dk/linux-block:
  nvmet: model_number must be immutable once set
  nvme-fabrics: fix kato initialization
  nvme-hwmon: Return error code when registration fails
  nvme-pci: add quirks for Lexar 256GB SSD
  nvme-pci: mark Kingston SKC2000 as not supporting the deepest power state
  nvme-pci: mark Seagate Nytro XM1440 as QUIRK_NO_NS_DESC_LIST.
  rsxx: Return -EFAULT if copy_to_user() fails
  block/bfq: update comments and default value in docs for fifo_expire
  rsxx: remove unused including <linux/version.h>
  block: Drop leftover references to RQF_SORTED
  block: revert "block: fix bd_size_lock use"
Diffstat (limited to 'lib/dynamic_queue_limits.c')
0 files changed, 0 insertions, 0 deletions