On Fri, Nov 04, 2022 at 09:33:28AM -0300, Jason Gunthorpe wrote:
> On Fri, Nov 04, 2022 at 03:24:34PM +1100, Stephen Rothwell wrote:
> > Hi all,
> >
> > Today's linux-next merge of the iommufd tree got conflicts in:
> >
> > drivers/iommu/iommu.c
> > include/linux/iommu.h
> >
> > between commits from the iommu and iommufd trees.
> >
> > I don't have time to disentangle this, so I have just dropped the iommufd
> > tree for today. Please coordinate.
>
> Urk - this is caused by merging the Intel SVA cleanup series into the
> iommu tree
>
> Most likely I'll have to take commit 69e61edebea0 ("Merge tag
> 'for-joerg' of
> git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd into core")
> from the iommu tree as a shared branch
>
> Check again tomorrow please
It is sorted out now.
Jason
