linux-kernel - linux-next: manual merge of the pci tree with Linus' tree

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>] [day] [month] [year] [list]

Message-ID: <20210825105741.4ee2fa1f@canb.auug.org.au>
Date:   Wed, 25 Aug 2021 10:57:41 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Bjorn Helgaas <bhelgaas@...gle.com>
Cc:     Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Lorenzo Pieralisi <lorenzo.pieralisi@....com>,
        Rahul Tanwar <rtanwar@...linear.com>,
        Srikanth Thokala <srikanth.thokala@...el.com>,
        Wan Ahmad Zainie <wan.ahmad.zainie.wan.mohamad@...el.com>
Subject: linux-next: manual merge of the pci tree with Linus' tree

Hi all,

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

  MAINTAINERS

between commit:

  e2f55370b422 ("MAINTAINERS: Add Rahul Tanwar as Intel LGM Gateway PCIe maintainer")

from Linus' tree and commit:

  0c87f90b4c13 ("PCI: keembay: Add support for Intel Keem Bay")

from the pci 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 MAINTAINERS
index 0e03d2903c07,23e614e9c669..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -14463,13 -14422,13 +14463,20 @@@ S:	Maintaine
  F:	Documentation/devicetree/bindings/pci/hisilicon-histb-pcie.txt
  F:	drivers/pci/controller/dwc/pcie-histb.c
  
+ PCIE DRIVER FOR INTEL KEEM BAY
+ M:	Srikanth Thokala <srikanth.thokala@...el.com>
+ L:	linux-pci@...r.kernel.org
+ S:	Supported
+ F:	Documentation/devicetree/bindings/pci/intel,keembay-pcie*
+ F:	drivers/pci/controller/dwc/pcie-keembay.c
+ 
 +PCIE DRIVER FOR INTEL LGM GW SOC
 +M:	Rahul Tanwar <rtanwar@...linear.com>
 +L:	linux-pci@...r.kernel.org
 +S:	Maintained
 +F:	Documentation/devicetree/bindings/pci/intel-gw-pcie.yaml
 +F:	drivers/pci/controller/dwc/pcie-intel-gw.c
 +
  PCIE DRIVER FOR MEDIATEK
  M:	Ryder Lee <ryder.lee@...iatek.com>
  M:	Jianjun Wang <jianjun.wang@...iatek.com>

Content of type "application/pgp-signature" skipped