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
Date: Mon, 30 Jan 2023 10:55:49 -0700 [thread overview]
Message-ID: <20230130105549.70044a51.alex.williamson@redhat.com> (raw)
In-Reply-To: <Y9eEjCsWUWeFccGd@suse.de>
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
next prev parent reply other threads:[~2023-01-30 17:56 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-27 3:13 linux-next: manual merge of the iommu tree with Linus' tree Stephen Rothwell
2023-01-30 8:49 ` Joerg Roedel
2023-01-30 17:55 ` Alex Williamson [this message]
2023-01-30 18:00 ` Jason Gunthorpe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230130105549.70044a51.alex.williamson@redhat.com \
--to=alex.williamson@redhat$(echo .)com \
--cc=jgg@nvidia$(echo .)com \
--cc=jgg@ziepe$(echo .)ca \
--cc=joro@8bytes$(echo .)org \
--cc=jroedel@suse$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=schnelle@linux$(echo .)ibm.com \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox