From: Jason Gunthorpe <jgg@nvidia.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Alex Williamson <alex.williamson@redhat.com>,
Anthony DeRossi <ajderossi@gmail.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the iommufd tree with the vfio-fixes tree
Date: Mon, 14 Nov 2022 09:35:39 -0400 [thread overview]
Message-ID: <Y3JEK376qqpBcYAq@nvidia.com> (raw)
In-Reply-To: <20221111153735.07a2bee1@canb.auug.org.au>
On Fri, Nov 11, 2022 at 03:37:35PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the iommufd tree got a conflict in:
>
> drivers/vfio/vfio_main.c
>
> between commit:
>
> 7fdba0011157 ("vfio: Fix container device registration life cycle")
>
> from the vfio-fixes tree and commit:
>
> 55e16a188913 ("vfio: Move vfio_device driver open/close code to a function")
>
> from the iommufd tree.
>
> I fixed it up (I just used the latter version since it seems to
> incorporate the former change) and can carry the fix as necessary.
Yes, that is right, it is as Alex and I discussed
Thanks
Jason
next prev parent reply other threads:[~2022-11-14 13:35 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-11 4:37 linux-next: manual merge of the iommufd tree with the vfio-fixes tree Stephen Rothwell
2022-11-14 13:35 ` Jason Gunthorpe [this message]
2022-11-14 15:32 ` Alex Williamson
2022-11-14 15:34 ` 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=Y3JEK376qqpBcYAq@nvidia.com \
--to=jgg@nvidia.com \
--cc=ajderossi@gmail.com \
--cc=alex.williamson@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).