hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEm+Rq3+YGJdiR9yuFh9CWnEQHBwQFAl2wpgAACgkQh9CWnEQH
 BwRl1xAAjMyQL8gKTBDuGyfznSMlMUn1gwR6BlgLg1SE/0iotCgDHRGwI1ej/0ER
 q4cCtYgslNb1y2tiENpLvJ8jZZzyWQlG6VvvIjD3qIFHrijVUnwBZZLhsP6nkWX3
 +NN/nWfUggNCYDldiNX+uu6J22PlYZ0gTs7bJMW+z7w6nhenCkJvmTeTEuQTSpx3
 6xVuOpNulQlQUJfctk/Bg5RG76SpoFrhwbeY6YyQyJ9rs9kivn1LIx6VSo26w12h
 Qxyf9gRfeACrGrSqfb2h6L2cODAgW/pyO7WLs3tkoKTebCZc65PptvNIxNaKbfgA
 86VT1YC8/tU1Qg6QgxE1TRw24fyy8xV8zpKxP3fK687XI2ZjsndDNPKnIcXBa8jB
 zKCDFGAyhA3EFnb6uU4pgPyZbzQaB2jdfhGFYV0EWc+1DtRGbP2njZnJko4MDpQK
 ggmHQjgslRKzd1PLvXJkCTjw2jHNfA6VhORS0WDom2LdVeqwnmpubvmzwEf+I/Gc
 XrIVDk1/Hhsa/+R58nO4HlK1fiL6xkZFa3PLkXXrNAIXCxb/vXUDQcgOeD961cDl
 vxloCzA5SQ1SzU7+qXUQBnPVHXrvNKJ9W9g4Sjnl5SEjZepNT/HINjz1QERIYAgy
 j9aQOojX9sjmSKHBio/g+1r87tfs3iQUD0xq+bkgYM2OWpS+nBU=
 =fGuD
 -----END PGP SIGNATURE-----

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: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2019-10-23 20:01:24 -07:00
parent d4267a57d3 0d660ffbca
commit 116c05bfa1
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.mailmap
View File

@ -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> <shuah.khan@hp.com>
Shuah Khan <shuah@kernel.org> <shuahkh@osg.samsung.com> Shuah Khan <shuah@kernel.org> <shuahkh@osg.samsung.com>
Shuah Khan <shuah@kernel.org> <shuah.kh@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> Simon Kelley <simon@thekelleys.org.uk>
Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr> Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>
Stephen Hemminger <shemminger@osdl.org> Stephen Hemminger <shemminger@osdl.org>

5
MAINTAINERS
View File

@ -3189,7 +3189,7 @@ N: bcm216*
N: kona N: kona
F: arch/arm/mach-bcm/ F: arch/arm/mach-bcm/
BROADCOM BCM2835 ARM ARCHITECTURE BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE
M: Eric Anholt <eric@anholt.net> M: Eric Anholt <eric@anholt.net>
M: Stefan Wahren <wahrenst@gmx.net> M: Stefan Wahren <wahrenst@gmx.net>
L: bcm-kernel-feedback-list@broadcom.com 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) L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
T: git git://github.com/anholt/linux T: git git://github.com/anholt/linux
S: Maintained S: Maintained
N: bcm2711
N: bcm2835 N: bcm2835
F: drivers/staging/vc04_services F: drivers/staging/vc04_services
@ -3243,8 +3244,6 @@ S: Maintained
F: drivers/usb/gadget/udc/bcm63xx_udc.* F: drivers/usb/gadget/udc/bcm63xx_udc.*
BROADCOM BCM7XXX ARM ARCHITECTURE 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: Florian Fainelli <f.fainelli@gmail.com>
M: bcm-kernel-feedback-list@broadcom.com M: bcm-kernel-feedback-list@broadcom.com
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)