linux-next: manual merge of the net-next tree with the reset tree

[Stephen Rothwell <sfr@canb.auug.org.au>]

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

Hi all,

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

  MAINTAINERS

between commit:

  86f134941a4b ("MAINTAINERS: Add the Microchip LAN966x PCI driver entry")

from the reset tree and commit:

  7280f01e79cc ("net: lan969x: add match data for lan969x")

from the net-next 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 a0cad73c28d0,c4027397286b..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -15179,12 -15091,13 +15185,19 @@@ S:	Maintaine
  F:	Documentation/devicetree/bindings/interrupt-controller/microchip,lan966x-oic.yaml
  F:	drivers/irqchip/irq-lan966x-oic.c
  
 +MICROCHIP LAN966X PCI DRIVER
 +M:	Herve Codina <herve.codina@bootlin.com>
 +S:	Maintained
 +F:	drivers/misc/lan966x_pci.c
 +F:	drivers/misc/lan966x_pci.dtso
 +
+ MICROCHIP LAN969X ETHERNET DRIVER
+ M:	Daniel Machon <daniel.machon@microchip.com>
+ M:	UNGLinuxDriver@microchip.com
+ L:	netdev@vger.kernel.org
+ S:	Maintained
+ F:	drivers/net/ethernet/microchip/lan969x/*
+ 
  MICROCHIP LCDFB DRIVER
  M:	Nicolas Ferre <nicolas.ferre@microchip.com>
  L:	linux-fbdev@vger.kernel.org

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