lkml.org 
[lkml]   [2022]   [Jul]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
SubjectRe: linux-next: manual merge of the vfio tree with the kvms390 tree
From
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.

\
 
 \ /
  Last update: 2022-07-11 10:01    [W:0.223 / U:0.064 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site