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

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

[Stephen Rothwell]

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

Hi all,

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

  MAINTAINERS

between commit:

  80e62bc8487b ("MAINTAINERS: re-sort all entries and fields")

from Linus' tree and commit:

  31345a0f5901 ("MAINTAINERS: Replace my email address")

from the broadcom 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 062962cb35aa,040ffd682131..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -3910,8 -3913,36 +3910,8 @@@ F:	drivers/net/dsa/bcm_sf2
  F:	include/linux/dsa/brcm.h
  F:	include/linux/platform_data/b53.h
  
 -BROADCOM BCMBCA ARM ARCHITECTURE
 -M:	William Zhang <william.zhang@broadcom.com>
 -M:	Anand Gore <anand.gore@broadcom.com>
 -M:	Kursad Oney <kursad.oney@broadcom.com>
 -M:	Florian Fainelli <florian.fainelli@broadcom.com>
 -M:	Rafał Miłecki <rafal@milecki.pl>
 -R:	Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
 -L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -S:	Maintained
 -T:	git https://github.com/broadcom/stblinux.git
 -F:	Documentation/devicetree/bindings/arm/bcm/brcm,bcmbca.yaml
 -F:	arch/arm64/boot/dts/broadcom/bcmbca/*
 -N:	bcmbca
 -N:	bcm[9]?47622
 -N:	bcm[9]?4912
 -N:	bcm[9]?63138
 -N:	bcm[9]?63146
 -N:	bcm[9]?63148
 -N:	bcm[9]?63158
 -N:	bcm[9]?63178
 -N:	bcm[9]?6756
 -N:	bcm[9]?6813
 -N:	bcm[9]?6846
 -N:	bcm[9]?6855
 -N:	bcm[9]?6856
 -N:	bcm[9]?6858
 -N:	bcm[9]?6878
 -
  BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE
- M:	Florian Fainelli <f.fainelli@gmail.com>
+ M:	Florian Fainelli <florian.fainelli@broadcom.com>
  R:	Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
  L:	linux-rpi-kernel@lists.infradead.org (moderated for non-subscribers)
  L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -4007,34 -4039,6 +4008,34 @@@ N:	brcmst
  N:	bcm7038
  N:	bcm7120
  
 +BROADCOM BCMBCA ARM ARCHITECTURE
 +M:	William Zhang <william.zhang@broadcom.com>
 +M:	Anand Gore <anand.gore@broadcom.com>
 +M:	Kursad Oney <kursad.oney@broadcom.com>
- M:	Florian Fainelli <f.fainelli@gmail.com>
++M:	Florian Fainelli <florian.fainelli@broadcom.com>
 +M:	Rafał Miłecki <rafal@milecki.pl>
 +R:	Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
 +L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +S:	Maintained
 +T:	git https://github.com/broadcom/stblinux.git
 +F:	Documentation/devicetree/bindings/arm/bcm/brcm,bcmbca.yaml
 +F:	arch/arm64/boot/dts/broadcom/bcmbca/*
 +N:	bcmbca
 +N:	bcm[9]?47622
 +N:	bcm[9]?4912
 +N:	bcm[9]?63138
 +N:	bcm[9]?63146
 +N:	bcm[9]?63148
 +N:	bcm[9]?63158
 +N:	bcm[9]?63178
 +N:	bcm[9]?6756
 +N:	bcm[9]?6813
 +N:	bcm[9]?6846
 +N:	bcm[9]?6855
 +N:	bcm[9]?6856
 +N:	bcm[9]?6858
 +N:	bcm[9]?6878
 +
  BROADCOM BDC DRIVER
  M:	Justin Chen <justinpopo6@gmail.com>
  M:	Al Cooper <alcooperx@gmail.com>

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