diff options
| author | Jason Gunthorpe <jgg@nvidia.com> | 2023-02-21 11:11:03 -0400 |
|---|---|---|
| committer | Jason Gunthorpe <jgg@nvidia.com> | 2023-02-21 11:11:03 -0400 |
| commit | 939204e4df962982cbc84acc26b29b421dd530a8 (patch) | |
| tree | 753698947a28ff1f18857d198a671317352f16c8 /drivers/iommu/amd/quirks.c | |
| parent | b4ff830eca097df51af10a9be29e8cc817327919 (diff) | |
| parent | c9c3395d5e3dcc6daee66c6908354d47bf98cb0c (diff) | |
Merge tag 'v6.2' into iommufd.git for-next
Resolve conflicts from the signature change in iommu_map:
- drivers/infiniband/hw/usnic/usnic_uiom.c
Switch iommu_map_atomic() to iommu_map(.., GFP_ATOMIC)
- drivers/vfio/vfio_iommu_type1.c
Following indenting change for GFP_KERNEL
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
Diffstat (limited to 'drivers/iommu/amd/quirks.c')
0 files changed, 0 insertions, 0 deletions