From: Christian Borntraeger <borntraeger@de.ibm.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
Alex Williamson <alex.williamson@redhat.com>,
Janosch Frank <frankja@linux.ibm.com>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Matthew Rosato <mjrosato@linux.ibm.com>
Subject: Re: linux-next: manual merge of the vfio tree with the kvms390 tree
Date: Mon, 11 Jul 2022 10:00:20 +0200 [thread overview]
Message-ID: <0f498561-4bd3-3247-4ef4-796dc15cdaf3@de.ibm.com> (raw)
In-Reply-To: <20220711171353.2b8eb09a@canb.auug.org.au>
Am 11.07.22 um 09:13 schrieb Stephen Rothwell:
> Betreff:
> linux-next: manual merge of the vfio tree with the kvms390 tree
> Von:
> Stephen Rothwell <sfr@canb.auug.org.au>
> Datum:
> 11.07.22, 09:13
>
> An:
> Alex Williamson <alex.williamson@redhat.com>, Christian Borntraeger <borntraeger@de.ibm.com>, Janosch Frank <frankja@linux.ibm.com>
> Kopie (CC):
> Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Linux Next Mailing List <linux-next@vger.kernel.org>, Matthew Rosato <mjrosato@linux.ibm.com>
>
>
> Hi all,
>
> Today's linux-next merge of the vfio tree got a conflict in:
>
> include/linux/vfio_pci_core.h
>
> between commits:
>
> b6a7066f4e9b ("vfio/pci: introduce CONFIG_VFIO_PCI_ZDEV_KVM")
> 6518ebc68c72 ("vfio-pci/zdev: add open/close device hooks")
>
> from the kvms390 tree and commit:
>
> d1877e639bc6 ("vfio: de-extern-ify function prototypes")
>
> from the vfio tree.
>
> I fixed it up (see below) 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.
>
Alex, Paolo,
I do have a topic branch that we could merge, but I think the conflict is trivial enough for the time being.
prev parent reply other threads:[~2022-07-11 8:00 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-11 7:13 linux-next: manual merge of the vfio tree with the kvms390 tree Stephen Rothwell
2022-07-11 8:00 ` Christian Borntraeger [this message]
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=0f498561-4bd3-3247-4ef4-796dc15cdaf3@de.ibm.com \
--to=borntraeger@de.ibm.com \
--cc=alex.williamson@redhat.com \
--cc=frankja@linux.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mjrosato@linux.ibm.com \
--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).