The pull request you sent on Thu, 24 Mar 2022 11:04:20 +0100:
> git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git
> tags/iommu-updates-v5.18
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/34af78c4e616c359ed428d79fe4758a35d2c5473
Thank you!
--
Deet-doot-d
Hi Linus,
there is a conflict this time when merging the IOMMU tree updates. It is
in drivers/iommu/intel/iommu.c and comes from the fact that the tip-tree
patched functions in that file which get removed with these updates. So
the merge resolution is to use the changes from the IOMMU tree. With
t
