Date:   Mon, 30 Jan 2023 10:55:49 -0700
From:   Alex Williamson <alex.williamson@redhat.com>
To:     Joerg Roedel <jroedel@suse.de>
Cc:     Stephen Rothwell <sfr@canb.auug.org.au>,
        Joerg Roedel <joro@8bytes.org>,
        Jason Gunthorpe <jgg@nvidia.com>,
        Jason Gunthorpe <jgg@ziepe.ca>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Niklas Schnelle <schnelle@linux.ibm.com>
Subject: Re: linux-next: manual merge of the iommu tree with Linus' tree
Message-ID: <20230130105549.70044a51.alex.williamson@redhat.com>
In-Reply-To: <Y9eEjCsWUWeFccGd@suse.de>
References: <20230127141330.28b2c653@canb.auug.org.au>
        <Y9eEjCsWUWeFccGd@suse.de>
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Precedence: bulk

On Mon, 30 Jan 2023 09:49:16 +0100
Joerg Roedel <jroedel@suse.de> wrote:

> Thanks for the report, Stephen.
> 
> Alex,
> 
> On Fri, Jan 27, 2023 at 02:13:30PM +1100, Stephen Rothwell wrote:
> > Hi all,
> > 
> > Today's linux-next merge of the iommu tree got a conflict in:
> > 
> >   drivers/vfio/vfio_iommu_type1.c
> > 
> > between commit:
> > 
> >   895c0747f726 ("vfio/type1: Respect IOMMU reserved regions in vfio_test_domain_fgsp()")
> > 
> > from Linus' tree and commit:
> > 
> >   1369459b2e21 ("iommu: Add a gfp parameter to iommu_map()")
> > 
> > from the iommu tree.  
> 
> In case you want to fix this up in your tree, the patch-set causing this
> is in a separate branch in the IOMMU tree which you can merge into your
> tree:
> 
> 	git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git iommu-memory-accounting

Hi Joerg,

The conflict is with mainline, not my next branch.  The commit above
went in as a fix for v6.2.  Thanks,

Alex