From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jason Gunthorpe <jgg@nvidia•com>,
Alex Williamson <alex.williamson@redhat•com>
Cc: Anthony DeRossi <ajderossi@gmail•com>,
Jason Gunthorpe <jgg@ziepe•ca>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: linux-next: manual merge of the iommufd tree with the vfio-fixes tree
Date: Fri, 11 Nov 2022 15:37:35 +1100 [thread overview]
Message-ID: <20221111153735.07a2bee1@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 827 bytes --]
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. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2022-11-11 4:37 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-11 4:37 Stephen Rothwell [this message]
2022-11-14 13:35 ` linux-next: manual merge of the iommufd tree with the vfio-fixes tree Jason Gunthorpe
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=20221111153735.07a2bee1@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=ajderossi@gmail$(echo .)com \
--cc=alex.williamson@redhat$(echo .)com \
--cc=jgg@nvidia$(echo .)com \
--cc=jgg@ziepe$(echo .)ca \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/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