projects / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 23a1b46 2ccdd1b)
Merge tag 'v6.5-rc6' into iommufd for-next
authorJason Gunthorpe <jgg@nvidia.com>
Tue, 15 Aug 2023 13:01:26 +0000 (10:01 -0300)
committerJason Gunthorpe <jgg@nvidia.com>
Tue, 15 Aug 2023 13:01:26 +0000 (10:01 -0300)
commita35762dd14adb952442e487d8dad4bb50b614b2b
tree4d21de11837f293860db8abbea8db161f1018edbtree | snapshot
parent23a1b46f15d57583927742738579363f179942b1commit | diff
parent2ccdd1b13c591d306f0401d98dedc4bdcd02b421commit | diff
Merge tag 'v6.5-rc6' into iommufd for-next

Required for following patches.

Resolve merge conflict by using the hunk from the for-next branch and
shifting the iommufd_object_deref_user() into iommufd_hw_pagetable_put()

Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
drivers/iommu/iommufd/device.c diff1 | diff2 | blob | history
drivers/iommu/iommufd/iommufd_private.h diff1 | diff2 | blob | history
drivers/iommu/iommufd/main.c diff1 | diff2 | blob | history
ep93xx device tree rework repo: git://git.maquefel.me/linux.git