Commit 116c05bf authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'arm-soc/for-5.5/maintainers' of https://github.com/Broadcom/stblinux into arm/fixes 

This pull request contains MAINTAINERS file updates for Broadcom SoCs
for the 5.5 kernel, please pull the following:

- Simon adds a .mailmap alias for his old email

- Stefan updates the existing BCM2835 with BCM2711 which is the chip
  name for the Raspberry Pi 4

- Florian removes Gregory and Brian from the MAINTAINERS file for
  BRCMSTB SoCs

* tag 'arm-soc/for-5.5/maintainers' of https://github.com/Broadcom/stblinux:
  MAINTAINERS: Remove Gregory and Brian for ARCH_BRCMSTB
  mailmap: Add Simon Arlott (replacement for expired email address)
  MAINTAINERS: Add BCM2711 to BCM2835 ARCH

Link: https://lore.kernel.org/r/20191023212814.30622-3-f.fainelli@gmail.com


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents d4267a57 0d660ffb

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -229,6 +229,7 @@ Shuah Khan <shuah@kernel.org> <shuahkhan@gmail.com> 
Shuah Khan <shuah@kernel.org> <shuah.khan@hp.com>

Shuah Khan <shuah@kernel.org> <shuahkh@osg.samsung.com>

Shuah Khan <shuah@kernel.org> <shuah.kh@samsung.com>

Simon Arlott <simon@octiron.net> <simon@fire.lp0.eu>

Simon Kelley <simon@thekelleys.org.uk>

Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>

Stephen Hemminger <shemminger@osdl.org>

MAINTAINERS

+2 −3
Original line number Diff line number Diff line
@@ -3189,7 +3189,7 @@ N: bcm216* 
N:	kona

F:	arch/arm/mach-bcm/













BROADCOM BCM2835 ARM ARCHITECTURE













BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE















M:	Eric Anholt <eric@anholt.net>















M:	Stefan Wahren <wahrenst@gmx.net>















L:	bcm-kernel-feedback-list@broadcom.com









@@ -3197,6 +3197,7 @@ L:	linux-rpi-kernel@lists.infradead.org (moderated for non-subscribers)













L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)















T:	git git://github.com/anholt/linux















S:	Maintained













N:	bcm2711















N:	bcm2835















F:	drivers/staging/vc04_services
























@@ -3243,8 +3244,6 @@ S:	Maintained













F:	drivers/usb/gadget/udc/bcm63xx_udc.*





























BROADCOM BCM7XXX ARM ARCHITECTURE













M:	Brian Norris <computersforpeace@gmail.com>













M:	Gregory Fong <gregory.0xf0@gmail.com>















M:	Florian Fainelli <f.fainelli@gmail.com>















M:	bcm-kernel-feedback-list@broadcom.com















L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)



































































CRA Git | Maintained and supported by SUSTech CRA and CCSE