lists.openwall.net   lists  /  announce  owl-users  owl-dev  john-users  john-dev  passwdqc-users  yescrypt  popa3d-users  /  oss-security  kernel-hardening  musl  sabotage  tlsify  passwords  /  crypt-dev  xvendor  /  Bugtraq  Full-Disclosure  linux-kernel  linux-netdev  linux-ext4  linux-hardening  linux-cve-announce  PHC 
Open Source and information security mailing list archives
 
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20231101101521.1d28e795@canb.auug.org.au>
Date:   Wed, 1 Nov 2023 10:15:21 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Bjorn Helgaas <bhelgaas@...gle.com>,
        Lorenzo Pieralisi <lpieralisi@...nel.org>,
        Krzysztof WilczyƄski <kw@...ux.com>
Cc:     Thomas Gleixner <tglx@...utronix.de>,
        Ingo Molnar <mingo@...hat.com>,
        "H. Peter Anvin" <hpa@...or.com>,
        Peter Zijlstra <peterz@...radead.org>,
        Ingo Molnar <mingo@...nel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Muralidhara M K <muralidhara.mk@....com>,
        Suma Hegde <suma.hegde@....com>, Vicki Pfau <vi@...rift.com>
Subject: Re: linux-next: manual merge of the tip tree with the pci tree

Hi all,

On Mon, 9 Oct 2023 13:47:01 +1100 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
> 
> 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

This is now a conflict between the pci tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped

Powered by blists - more mailing lists

Powered by Openwall GNU/*/Linux Powered by OpenVZ