diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-09-02 16:44:30 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-09-02 16:44:30 -0700 |
| commit | d895ec7938c431fe61a731939da76a6461bc6133 (patch) | |
| tree | d38e4b37cbd2764883358617dee966e4c9bee585 /MAINTAINERS | |
| parent | cec53f4c8df0b3f45796127a31c10b86ec125f55 (diff) | |
| parent | 7a3d2225f1ae9e591fefd65c3bb1715dc54d96f1 (diff) | |
| download | lwn-d895ec7938c431fe61a731939da76a6461bc6133.tar.gz lwn-d895ec7938c431fe61a731939da76a6461bc6133.zip | |
Merge tag 'block-6.0-2022-09-02' of git://git.kernel.dk/linux-block
Pull block fixes from Jens Axboe:
- NVMe pull request via Christoph:
- error handling fix for the new auth code (Hannes Reinecke)
- fix unhandled tcp states in nvmet_tcp_state_change (Maurizio
Lombardi)
- add NVME_QUIRK_BOGUS_NID for Lexar NM610 (Shyamin Ayesh)
- Add documentation for the ublk driver merged in this merge window
(Ming)
* tag 'block-6.0-2022-09-02' of git://git.kernel.dk/linux-block:
Documentation: document ublk
nvmet-tcp: fix unhandled tcp states in nvmet_tcp_state_change()
nvmet-auth: add missing goto in nvmet_setup_auth()
nvme-pci: add NVME_QUIRK_BOGUS_NID for Lexar NM610
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 589517372408..1ba68f9d7a2f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -20764,6 +20764,7 @@ UBLK USERSPACE BLOCK DRIVER M: Ming Lei <ming.lei@redhat.com> L: linux-block@vger.kernel.org S: Maintained +F: Documentation/block/ublk.rst F: drivers/block/ublk_drv.c F: include/uapi/linux/ublk_cmd.h |