Merge tag 'arm-soc/for-6.5/maintainers' of https://github.com/Broadcom/stblinux into...
authorArnd Bergmann <arnd@arndb.de>
Thu, 22 Jun 2023 15:28:18 +0000 (17:28 +0200)
committerArnd Bergmann <arnd@arndb.de>
Thu, 22 Jun 2023 15:28:28 +0000 (17:28 +0200)
This pull request contains MAINTAINERS file updates for 6.5, please pull
the following:

- Justin, Kamal and Florian update their email to use their corporate
  Broadcom email address

* tag 'arm-soc/for-6.5/maintainers' of https://github.com/Broadcom/stblinux:
  MAINTAINERS: Replace my email address
  MAINTAINERS: Replace my email address
  MAINTAINERS: Replace my email address

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
1  2 
MAINTAINERS

diff --cc MAINTAINERS
@@@ -3901,8 -3913,36 +3901,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)
@@@ -3998,39 -4038,11 +3998,39 @@@ N:   brcmst
  N:    bcm7038
  N:    bcm7120
  
- M:    Florian Fainelli <f.fainelli@gmail.com>
 +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 BDC DRIVER
- M:    Justin Chen <justinpopo6@gmail.com>
+ M:    Justin Chen <justin.chen@broadcom.com>
  M:    Al Cooper <alcooperx@gmail.com>
 -L:    linux-usb@vger.kernel.org
  R:    Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
 +L:    linux-usb@vger.kernel.org
  S:    Maintained
  F:    Documentation/devicetree/bindings/usb/brcm,bdc.yaml
  F:    drivers/usb/gadget/udc/bdc/