Skip to content
Commit a35762dd authored by Jason Gunthorpe's avatar Jason Gunthorpe
Browse files

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: default avatarJason Gunthorpe <jgg@nvidia.com>
parents 23a1b46f 2ccdd1b1
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment