projects / platform / kernel / linux-rpi.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b4ff830 c9c3395)
Merge tag 'v6.2' into iommufd.git for-next
authorJason Gunthorpe <jgg@nvidia.com>
Tue, 21 Feb 2023 15:11:03 +0000 (11:11 -0400)
committerJason Gunthorpe <jgg@nvidia.com>
Tue, 21 Feb 2023 15:11:03 +0000 (11:11 -0400)
commit939204e4df962982cbc84acc26b29b421dd530a8
tree753698947a28ff1f18857d198a671317352f16c8tree | snapshot
parentb4ff830eca097df51af10a9be29e8cc817327919commit | diff
parentc9c3395d5e3dcc6daee66c6908354d47bf98cb0ccommit | 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>
drivers/infiniband/hw/usnic/usnic_uiom.c diff1 | diff2 | blob | history
drivers/iommu/iommu.c diff1 | diff2 | blob | history
drivers/vfio/vfio_iommu_type1.c diff1 | diff2 | blob | history
kernel/irq/irqdomain.c diff1 | diff2 | blob | history
kernel/irq/msi.c diff1 | diff2 | blob | history
Domain: System / Kernel;