]> git.itanic.dy.fi Git - linux-stable/commit
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 24 Apr 2024 07:53:53 +0000 (17:53 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 24 Apr 2024 07:53:53 +0000 (17:53 +1000)
commit6a4f8b02f8b15eb9b3858c7f710be6a4a4274a18
tree57a8eb54be83b14974c41bdbf71f1925bb37b01d
parentf4d70b816b562e3360bb8526e66f27d531c1ca3d
parentd02a66d84baa250592ab4036db9b98f67ba1bb7b
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git

# Conflicts:
# drivers/iommu/amd/amd_iommu.h
Documentation/admin-guide/cgroup-v2.rst
Documentation/filesystems/proc.rst
drivers/iommu/amd/iommu.c
drivers/iommu/dma-iommu.c
drivers/iommu/intel/irq_remapping.c