Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Thu, 24 Sep 2020 14:26:51 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Alex Williamson <alex.williamson@redhat.com>,
        Heiko Carstens <hca@linux.ibm.com>,
        Vasily Gorbik <gor@linux.ibm.com>,
        Christian Borntraeger <borntraeger@de.ibm.com>
Cc:     Niklas Schnelle <schnelle@linux.ibm.com>,
        Matthew Rosato <mjrosato@linux.ibm.com>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: linux-next: manual merge of the vfio tree with the s390 tree
Message-ID: <20200924142651.28382ed7@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/sJfuOahk28wU5Tj00PRZfid";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/sJfuOahk28wU5Tj00PRZfid
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

Today's linux-next merge of the vfio tree got a conflict in:

  arch/s390/pci/pci_bus.c

between commit:

  abb95b7550f8 ("s390/pci: consolidate SR-IOV specific code")

from the s390 tree and commit:

  08b6e22b850c ("s390/pci: Mark all VFs as not implementing PCI_COMMAND_MEM=
ORY")

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.

--=20
Cheers,
Stephen Rothwell

diff --cc arch/s390/pci/pci_bus.c
index 0c0db7c3a404,c93486a9989b..000000000000
--- a/arch/s390/pci/pci_bus.c
+++ b/arch/s390/pci/pci_bus.c
@@@ -135,9 -197,10 +135,10 @@@ void pcibios_bus_add_device(struct pci_
  	 * With pdev->no_vf_scan the common PCI probing code does not
  	 * perform PF/VF linking.
  	 */
- 	if (zdev->vfn)
+ 	if (zdev->vfn) {
 -		zpci_bus_setup_virtfn(zdev->zbus, pdev, zdev->vfn);
 +		zpci_iov_setup_virtfn(zdev->zbus, pdev, zdev->vfn);
-=20
+ 		pdev->no_command_memory =3D 1;
+ 	}
  }
 =20
  static int zpci_bus_add_device(struct zpci_bus *zbus, struct zpci_dev *zd=
ev)

--Sig_/sJfuOahk28wU5Tj00PRZfid
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl9sIAsACgkQAVBC80lX
0GyOAgf+LjgOiCcwzMMnKNDvP6LkQyqCIbQbP34iL0HJKKZbGAqACogClUany100
3AIFhxmBwk//IHC4r0hINIrDgYF1S61pInBinqRbujAMKnzXtVucgn0k4/UXF483
tMYXj4KmkSI1k5d5VtEwDTRQrThNuNZ9c4aL2xQv4qWISjX8p2B4yhnYETeWkzMn
824FwYr7JIqgLSmLuwefy9gGpFmaOe5pv7NZsqdwMulXyJA5hr1yFChl9rihZkYG
TeLReCo88f7kvpsuwYQNfkV27l3t8wc7zJ4XftxRy79sFogVr7UJRUj3brBzP0It
1+K5TfpBFjqT2rs6vWfgaFeHqMYujw==
=idjt
-----END PGP SIGNATURE-----

--Sig_/sJfuOahk28wU5Tj00PRZfid--