Re: linux-next: manual merge of the iommufd tree with the iommu tree
On Fri, Nov 03, 2023 at 10:53:12AM +1100, Stephen Rothwell wrote: > > I have used the conflict resolution below now. > > This is now a conflict between the iommu tree and Linus' tree.
My PR has instructions for the resolution to both: