Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32;
Date:   Mon, 9 Oct 2023 13:47:01 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Thomas Gleixner <tglx@linutronix.de>,
        Ingo Molnar <mingo@redhat.com>,
        "H. Peter Anvin" <hpa@zytor.com>,
        Peter Zijlstra <peterz@infradead.org>,
        Bjorn Helgaas <bhelgaas@google.com>,
        Lorenzo Pieralisi <lpieralisi@kernel.org>,
        Krzysztof =?UTF-8?B?V2lsY3p5xYRza2k=?= <kw@linux.com>
Cc:     Ingo Molnar <mingo@kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Muralidhara M K <muralidhara.mk@amd.com>,
        Suma Hegde <suma.hegde@amd.com>, Vicki Pfau <vi@endrift.com>
Subject: linux-next: manual merge of the tip tree with the pci tree
Message-ID: <20231009134701.17ab655e@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/YC2iVetli5G3AUnxDwC4D9H";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

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

Hi all,

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

  include/linux/pci_ids.h

between commit:

  7e6f3b6d2c35 ("PCI: Prevent xHCI driver from claiming AMD VanGogh USB3 DR=
D device")

from the pci tree and commit:

  24775700eaa9 ("x86/amd_nb: Add AMD Family MI300 PCI IDs")

from the tip 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 include/linux/pci_ids.h
index 3a8e24e9a93f,91b457de262e..000000000000
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@@ -579,7 -579,7 +579,8 @@@
  #define PCI_DEVICE_ID_AMD_1AH_M00H_DF_F3 0x12c3
  #define PCI_DEVICE_ID_AMD_1AH_M20H_DF_F3 0x16fb
  #define PCI_DEVICE_ID_AMD_MI200_DF_F3	0x14d3
+ #define PCI_DEVICE_ID_AMD_MI300_DF_F3	0x152b
 +#define PCI_DEVICE_ID_AMD_VANGOGH_USB	0x163a
  #define PCI_DEVICE_ID_AMD_CNB17H_F3	0x1703
  #define PCI_DEVICE_ID_AMD_LANCE		0x2000
  #define PCI_DEVICE_ID_AMD_LANCE_HOME	0x2001

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

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmUjaaUACgkQAVBC80lX
0Gzn/Af8D9MdpLiMde1xuXcD9H+cQoRqy5CFZAZ8Fi5BLKDstBmUNvtjZ+PUsEsK
u2uSZ+UanHjM3CL1Eig/VsV/475HUb6u9Bk5m5gegbV/VywwVvWzIDWIDNno4b0r
C0kT2WgkS6K62rUHA+Bad3343Q/oopxCS2XH2xNUAo76NzxWafo8NIHNJkv9izH0
P0/w5GzmlI/5IqunrkUKHMBDM6Nc72Ccjlcyxr8IiISpxm1VohsxheD7oAax1cl2
C5ybVaqevWChv0R0IPiEHuVtuCkpKkV7lmUBNYjWd//a/wxWrblO2fsMK4XcOQP3
ODjE4878OnnWkEjgp2QEoHeOj5g8XQ==
=Pou1
-----END PGP SIGNATURE-----

--Sig_/YC2iVetli5G3AUnxDwC4D9H--