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

Posted by Stephen Rothwell 9 months, 1 week ago
Hi all,

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

  MAINTAINERS

between commit:

  0747c136753e ("MAINTAINERS: Move Manivannan Sadhasivam as PCI Native host bridge and endpoint maintainer")

from Linus' tree and commit:

  69dcbfec5f02 ("MAINTAINERS: Update Krzysztof Wilczyński email address")

from the pci-current 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 51b64cabe308,ef64f4bd2de7..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -18763,8 -18632,8 +18763,8 @@@ F:	drivers/pci/controller/pci-xgene-msi
  
  PCI NATIVE HOST BRIDGE AND ENDPOINT DRIVERS
  M:	Lorenzo Pieralisi <lpieralisi@kernel.org>
- M:	Krzysztof Wilczyński <kw@linux.com>
+ M:	Krzysztof Wilczyński <kwilczynski@kernel.org>
 -R:	Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
 +M:	Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
  R:	Rob Herring <robh@kernel.org>
  L:	linux-pci@vger.kernel.org
  S:	Supported