linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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 Wilczyński" <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
Date: Mon, 9 Oct 2023 13:47:01 +1100	[thread overview]
Message-ID: <20231009134701.17ab655e@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 1296 bytes --]

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 DRD 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.

-- 
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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

             reply	other threads:[~2023-10-09  2:47 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-10-09  2:47 Stephen Rothwell [this message]
2023-10-31 23:15 ` linux-next: manual merge of the tip tree with the pci tree Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2022-11-21  4:11 Stephen Rothwell
2020-11-30  4:03 Stephen Rothwell
2020-11-30 10:21 ` Borislav Petkov
2020-11-30 17:40   ` Bjorn Helgaas
2020-10-01  6:38 Stephen Rothwell
2020-10-01 16:06 ` Bjorn Helgaas
2020-09-25  5:35 Stephen Rothwell
2020-10-13  3:34 ` Stephen Rothwell
2020-09-25  5:21 Stephen Rothwell
2020-10-13  3:31 ` Stephen Rothwell
2017-06-28  3:15 Stephen Rothwell
2017-06-29  0:14 ` Christoph Hellwig
2016-12-09  2:38 Stephen Rothwell
2016-12-12 16:09 ` Bjorn Helgaas
2014-11-24  5:18 Stephen Rothwell
2014-11-24 10:51 ` Thomas Gleixner
2014-03-12 22:18 Mark Brown
2014-03-03  6:07 Stephen Rothwell
2014-03-03  6:03 Stephen Rothwell
2014-03-03  9:26 ` Liviu Dudau
2013-10-29  6:33 Stephen Rothwell

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=20231009134701.17ab655e@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=bhelgaas@google.com \
    --cc=hpa@zytor.com \
    --cc=kw@linux.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=lpieralisi@kernel.org \
    --cc=mingo@kernel.org \
    --cc=mingo@redhat.com \
    --cc=muralidhara.mk@amd.com \
    --cc=peterz@infradead.org \
    --cc=suma.hegde@amd.com \
    --cc=tglx@linutronix.de \
    --cc=vi@endrift.com \
    /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).