projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6b0de7d 6961b5e)
Merge tag 'nvme-5.19-2022-07-14' of git://git.infradead.org/nvme into block-5.19
authorJens Axboe <axboe@kernel.dk>
Thu, 14 Jul 2022 16:29:56 +0000 (10:29 -0600)
committerJens Axboe <axboe@kernel.dk>
Thu, 14 Jul 2022 16:29:56 +0000 (10:29 -0600)
Pull NVMe fixes from Christoph:

"nvme fixes for Linux 5.19

 - fix a block device naming collision (Israel Rukshin)
 - fix freeze accounting for PCI error handling (Keith Busch)"

* tag 'nvme-5.19-2022-07-14' of git://git.infradead.org/nvme:
  nvme: fix block device naming collision
  nvme-pci: fix freeze accounting for error handling


Trivial merge
ep93xx device tree rework repo: git://git.maquefel.me/linux.git