]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
projects / thirdparty / kernel / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1cb15d2 83014d8)
Merge branch 'pci/p2pdma'
authorBjorn Helgaas <bhelgaas@google.com>
Fri, 6 Feb 2026 23:09:17 +0000 (17:09 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Fri, 6 Feb 2026 23:09:17 +0000 (17:09 -0600)
- Release per-CPU pgmap ref when vm_insert_page() fails so we don't hang
  when removing the PCI device (Hou Tao)

- Remove incorrect p2pmem_alloc_mmap() warning about page refcount (Hou
  Tao)

- Reset page reference count when page mapping fails (Alistair Popple)

* pci/p2pdma:
  PCI/P2PDMA: Reset page reference count when page mapping fails
  PCI/P2PDMA: Fix p2pmem_alloc_mmap() warning condition
  PCI/P2PDMA: Release per-CPU pgmap ref when vm_insert_page() fails


Trivial merge
A mirror of Linus' kernel repository