From: Bjorn Helgaas <bhelgaas@google.com>
Date: Fri, 3 Oct 2025 17:13:10 +0000 (-0500)
Subject: Merge branch 'pci/p2pdma'
X-Git-Tag: v6.18-rc1~60^2~26
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0bb65e32495e6235a069b60e787140da99e9c122;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'pci/p2pdma'

- Free struct p2p_pgmap, not a member within it, in the
  pci_p2pdma_add_resource() error path (Sungho Kim)

- Make pci_has_p2pmem() static (Leon Romanovsky)

* pci/p2pdma:
  PCI/P2PDMA: Reduce scope of pci_has_p2pmem()
  PCI/P2PDMA: Fix incorrect pointer usage in devm_kfree() call
---

0bb65e32495e6235a069b60e787140da99e9c122