]> Git Repo - linux.git/commitdiff
Merge tag 'mips_fixes_5.6.1' into mips-next
authorThomas Bogendoerfer <[email protected]>
Mon, 23 Mar 2020 12:38:45 +0000 (13:38 +0100)
committerThomas Bogendoerfer <[email protected]>
Mon, 23 Mar 2020 12:38:45 +0000 (13:38 +0100)
Pull in mips-fixes avoiding conflicts with more CI20 DT changes.

A few MIPS fixes:

- DT fixes for CI20

- Fix command line handling

- Correct patchwork URL

Signed-off-by: Thomas Bogendoerfer <[email protected]>
1  2 
MAINTAINERS

diff --combined MAINTAINERS
index a0d86490c2c62d990709d3a8d534d713c9cde2f3,6f01bc6fa409f3161595460880f68452bae3370d..53d6ba9f70294a9c5714860229d944ae14579397
@@@ -2796,11 -2796,11 +2796,11 @@@ F:   drivers/block/aoe
  
  ATHEROS 71XX/9XXX GPIO DRIVER
  M:    Alban Bedel <[email protected]>
 +S:    Maintained
  W:    https://github.com/AlbanBedel/linux
  T:    git git://github.com/AlbanBedel/linux
 -S:    Maintained
 -F:    drivers/gpio/gpio-ath79.c
  F:    Documentation/devicetree/bindings/gpio/gpio-ath79.txt
 +F:    drivers/gpio/gpio-ath79.c
  
  ATHEROS 71XX/9XXX USB PHY DRIVER
  M:    Alban Bedel <[email protected]>
@@@ -3422,8 -3422,8 +3422,8 @@@ BROADCOM BRCMSTB GPIO DRIVE
  M:    Gregory Fong <[email protected]>
  L:    [email protected]
  S:    Supported
 -F:    drivers/gpio/gpio-brcmstb.c
  F:    Documentation/devicetree/bindings/gpio/brcm,brcmstb-gpio.txt
 +F:    drivers/gpio/gpio-brcmstb.c
  
  BROADCOM BRCMSTB I2C DRIVER
  M:    Kamal Dasu <[email protected]>
@@@ -3481,8 -3481,8 +3481,8 @@@ BROADCOM KONA GPIO DRIVE
  M:    Ray Jui <[email protected]>
  L:    [email protected]
  S:    Supported
 -F:    drivers/gpio/gpio-bcm-kona.c
  F:    Documentation/devicetree/bindings/gpio/brcm,kona-gpio.txt
 +F:    drivers/gpio/gpio-bcm-kona.c
  
  BROADCOM NETXTREME-E ROCE DRIVER
  M:    Selvin Xavier <[email protected]>
@@@ -3597,8 -3597,8 +3597,8 @@@ F:      sound/pci/bt87x.
  
  BT8XXGPIO DRIVER
  M:    Michael Buesch <[email protected]>
 -W:    http://bu3sch.de/btgpio.php
  S:    Maintained
 +W:    http://bu3sch.de/btgpio.php
  F:    drivers/gpio/gpio-bt8xx.c
  
  BTRFS FILE SYSTEM
@@@ -7143,18 -7143,18 +7143,18 @@@ GPIO SUBSYSTE
  M:    Linus Walleij <[email protected]>
  M:    Bartosz Golaszewski <[email protected]>
  L:    [email protected]
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git
  S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git
 +F:    Documentation/ABI/obsolete/sysfs-gpio
 +F:    Documentation/ABI/testing/gpio-cdev
 +F:    Documentation/admin-guide/gpio/
  F:    Documentation/devicetree/bindings/gpio/
  F:    Documentation/driver-api/gpio/
 -F:    Documentation/admin-guide/gpio/
 -F:    Documentation/ABI/testing/gpio-cdev
 -F:    Documentation/ABI/obsolete/sysfs-gpio
  F:    drivers/gpio/
 +F:    include/asm-generic/gpio.h
  F:    include/linux/gpio/
  F:    include/linux/gpio.h
  F:    include/linux/of_gpio.h
 -F:    include/asm-generic/gpio.h
  F:    include/uapi/linux/gpio.h
  F:    tools/gpio/
  
@@@ -8055,8 -8055,8 +8055,8 @@@ F:      drivers/scsi/ips.
  ICH LPC AND GPIO DRIVER
  M:    Peter Tyser <[email protected]>
  S:    Maintained
 -F:    drivers/mfd/lpc_ich.c
  F:    drivers/gpio/gpio-ich.c
 +F:    drivers/mfd/lpc_ich.c
  
  ICY I2C DRIVER
  M:    Max Staudt <[email protected]>
@@@ -11114,14 -11114,12 +11114,12 @@@ S:        Maintaine
  F:    drivers/usb/image/microtek.*
  
  MIPS
- M:    Ralf Baechle <[email protected]>
- M:    Paul Burton <[email protected]>
+ M:    Thomas Bogendoerfer <[email protected]>
  L:    [email protected]
  W:    http://www.linux-mips.org/
- T:    git git://git.linux-mips.org/pub/scm/ralf/linux.git
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git
- Q:    http://patchwork.linux-mips.org/project/linux-mips/list/
- S:    Supported
+ Q:    https://patchwork.kernel.org/project/linux-mips/list/
+ S:    Maintained
  F:    Documentation/devicetree/bindings/mips/
  F:    Documentation/mips/
  F:    arch/mips/
@@@ -16075,8 -16073,8 +16073,8 @@@ F:   Documentation/devicetree/bindings/re
  SYNOPSYS CREG GPIO DRIVER
  M:    Eugeniy Paltsev <[email protected]>
  S:    Maintained
 -F:    drivers/gpio/gpio-creg-snps.c
  F:    Documentation/devicetree/bindings/gpio/snps,creg-gpio.txt
 +F:    drivers/gpio/gpio-creg-snps.c
  
  SYNOPSYS DESIGNWARE 8250 UART DRIVER
  R:    Andy Shevchenko <[email protected]>
@@@ -16087,8 -16085,8 +16085,8 @@@ SYNOPSYS DESIGNWARE APB GPIO DRIVE
  M:    Hoan Tran <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/gpio/gpio-dwapb.c
  F:    Documentation/devicetree/bindings/gpio/snps-dwapb-gpio.txt
 +F:    drivers/gpio/gpio-dwapb.c
  
  SYNOPSYS DESIGNWARE AXI DMAC DRIVER
  M:    Eugeniy Paltsev <[email protected]>
@@@ -18414,8 -18412,8 +18412,8 @@@ M:   Nandor Han <[email protected]
  M:    Semi Malinen <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/gpio/gpio-xra1403.c
  F:    Documentation/devicetree/bindings/gpio/gpio-xra1403.txt
 +F:    drivers/gpio/gpio-xra1403.c
  
  XTENSA XTFPGA PLATFORM SUPPORT
  M:    Max Filippov <[email protected]>
This page took 0.123467 seconds and 4 git commands to generate.