diff options
| author | Linus Torvalds <[email protected]> | 2023-02-16 20:05:33 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2023-02-16 20:05:33 +0000 |
| commit | d3d6f0eb086d3d68960ded479e846e7dcfcec2bb (patch) | |
| tree | 8b9eb60ada2b4d4c9ede3776643a774a8faf036e /net/ipv6/tcp_ipv6.c | |
| parent | Merge tag 'spi-v6.2-rc8-abi' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
| parent | Merge tag 'nvme-6.2-2023-02-15' of git://git.infradead.org/nvme into block-6.2 (diff) | |
| download | kernel-d3d6f0eb086d3d68960ded479e846e7dcfcec2bb.tar.gz kernel-d3d6f0eb086d3d68960ded479e846e7dcfcec2bb.zip | |
Merge tag 'block-6.2-2023-02-16' of git://git.kernel.dk/linux
Pull block fixes from Jens Axboe:
"Just a few NVMe fixes that should go into the 6.2 release, adding a
quirk and fixing two issues introduced in this release:
- NVMe fixes via Christoph:
- Always return an ERR_PTR from nvme_pci_alloc_dev (Irvin Cote)
- Add bogus ID quirk for ADATA SX6000PNP (Daniel Wagner)
- Set the DMA mask earlier (Christoph Hellwig)"
* tag 'block-6.2-2023-02-16' of git://git.kernel.dk/linux:
nvme-pci: always return an ERR_PTR from nvme_pci_alloc_dev
nvme-pci: set the DMA mask earlier
nvme-pci: add bogus ID quirk for ADATA SX6000PNP
Diffstat (limited to 'net/ipv6/tcp_ipv6.c')
0 files changed, 0 insertions, 0 deletions
