]> Git Repo - linux.git/commitdiff
Merge tag 'mips_fixes_5.6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/mips...
authorLinus Torvalds <[email protected]>
Wed, 11 Mar 2020 16:49:47 +0000 (09:49 -0700)
committerLinus Torvalds <[email protected]>
Wed, 11 Mar 2020 16:49:47 +0000 (09:49 -0700)
Pull MIPS fixes from Thomas Bogendoerfer:
 "A few MIPS fixes:

   - DT fixes for CI20

   - Fix command line handling

   - Correct patchwork URL"

* tag 'mips_fixes_5.6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux:
  MAINTAINERS: Correct MIPS patchwork URL
  MIPS: DTS: CI20: fix interrupt for pcf8563 RTC
  MIPS: DTS: CI20: fix PMU definitions for ACT8600
  MIPS: Fix CONFIG_MIPS_CMDLINE_DTB_EXTEND handling

1  2 
MAINTAINERS

diff --combined MAINTAINERS
index a6fbdf354d3437a50109102244c3a39c70ef5a16,6f01bc6fa409f3161595460880f68452bae3370d..235ab38ed4788c77c68b069a72326b7875336779
@@@ -693,7 -693,7 +693,7 @@@ ALLWINNER CPUFREQ DRIVE
  M:    Yangtao Li <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/devicetree/bindings/opp/sun50i-nvmem-cpufreq.txt
 +F:    Documentation/devicetree/bindings/opp/allwinner,sun50i-h6-operating-points.yaml
  F:    drivers/cpufreq/sun50i-cpufreq-nvmem.c
  
  ALLWINNER CRYPTO DRIVERS
@@@ -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
@@@ -3649,7 -3649,6 +3649,7 @@@ F:      sound/pci/oxygen
  
  C-SKY ARCHITECTURE
  M:    Guo Ren <[email protected]>
 +L:    [email protected]
  T:    git https://github.com/c-sky/csky-linux.git
  S:    Supported
  F:    arch/csky/
@@@ -3910,7 -3909,7 +3910,7 @@@ S:      Supporte
  F:    Documentation/filesystems/ceph.txt
  F:    fs/ceph/
  
 -CERTIFICATE HANDLING:
 +CERTIFICATE HANDLING
  M:    David Howells <[email protected]>
  M:    David Woodhouse <[email protected]>
  L:    [email protected]
@@@ -3920,7 -3919,7 +3920,7 @@@ F:      certs
  F:    scripts/sign-file.c
  F:    scripts/extract-cert.c
  
 -CERTIFIED WIRELESS USB (WUSB) SUBSYSTEM:
 +CERTIFIED WIRELESS USB (WUSB) SUBSYSTEM
  L:    [email protected]
  S:    Obsolete
  F:    drivers/staging/wusbcore/
@@@ -4017,7 -4016,7 +4017,7 @@@ M:      Cheng-Yi Chiang <[email protected]
  S:    Maintained
  R:    Enric Balletbo i Serra <[email protected]>
  R:    Guenter Roeck <[email protected]>
 -F:    Documentation/devicetree/bindings/sound/google,cros-ec-codec.txt
 +F:    Documentation/devicetree/bindings/sound/google,cros-ec-codec.yaml
  F:    sound/soc/codecs/cros_ec_codec.*
  
  CIRRUS LOGIC AUDIO CODEC DRIVERS
@@@ -4475,7 -4474,7 +4475,7 @@@ L:      [email protected]
  T:    git git://linuxtv.org/media_tree.git
  S:    Maintained
  F:    drivers/media/platform/sunxi/sun6i-csi/
 -F:    Documentation/devicetree/bindings/media/sun6i-csi.txt
 +F:    Documentation/devicetree/bindings/media/allwinner,sun6i-a31-csi.yaml
  
  CW1200 WLAN driver
  M:    Solomon Peachy <[email protected]>
@@@ -5668,7 -5667,7 +5668,7 @@@ L:      [email protected]
  T:    git git://anongit.freedesktop.org/drm/drm-misc
  S:    Maintained
  F:    drivers/gpu/drm/stm
 -F:    Documentation/devicetree/bindings/display/st,stm32-ltdc.txt
 +F:    Documentation/devicetree/bindings/display/st,stm32-ltdc.yaml
  
  DRM DRIVERS FOR TI LCDC
  M:    Jyri Sarha <[email protected]>
@@@ -5933,12 -5932,12 +5933,12 @@@ S:   Maintaine
  F:    drivers/media/dvb-frontends/ec100*
  
  ECRYPT FILE SYSTEM
 -M:    Tyler Hicks <tyhicks@canonical.com>
 +M:    Tyler Hicks <code@tyhicks.com>
  L:    [email protected]
  W:    http://ecryptfs.org
  W:    https://launchpad.net/ecryptfs
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git
 -S:    Supported
 +S:    Odd Fixes
  F:    Documentation/filesystems/ecryptfs.txt
  F:    fs/ecryptfs/
  
@@@ -7048,7 -7047,7 +7048,7 @@@ L:      [email protected]
  S:    Supported
  F:    drivers/uio/uio_pci_generic.c
  
 -GENERIC VDSO LIBRARY:
 +GENERIC VDSO LIBRARY
  M:    Andy Lutomirski <[email protected]>
  M:    Thomas Gleixner <[email protected]>
  M:    Vincenzo Frascino <[email protected]>
@@@ -7144,18 -7143,18 +7144,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/
  
@@@ -7738,7 -7737,7 +7738,7 @@@ Hyper-V CORE AND DRIVER
  M:    "K. Y. Srinivasan" <[email protected]>
  M:    Haiyang Zhang <[email protected]>
  M:    Stephen Hemminger <[email protected]>
 -M:    Sasha Levin <sashal@kernel.org>
 +M:    Wei Liu <wei.liu@kernel.org>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git
  L:    [email protected]
  S:    Supported
@@@ -8056,8 -8055,8 +8056,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]>
@@@ -8393,7 -8392,7 +8393,7 @@@ M:      Joonas Lahtinen <joonas.lahtinen@lin
  M:    Rodrigo Vivi <[email protected]>
  L:    [email protected]
  W:    https://01.org/linuxgraphics/
 -B:    https://01.org/linuxgraphics/documentation/how-report-bugs
 +B:    https://gitlab.freedesktop.org/drm/intel/-/wikis/How-to-file-i915-bugs
  C:    irc://chat.freenode.net/intel-gfx
  Q:    http://patchwork.freedesktop.org/project/intel-gfx/
  T:    git git://anongit.freedesktop.org/drm-intel
@@@ -9279,7 -9278,7 +9279,7 @@@ F:      include/keys/trusted-type.
  F:    security/keys/trusted.c
  F:    include/keys/trusted.h
  
 -KEYS/KEYRINGS:
 +KEYS/KEYRINGS
  M:    David Howells <[email protected]>
  M:    Jarkko Sakkinen <[email protected]>
  L:    [email protected]
@@@ -10164,7 -10163,7 +10164,7 @@@ MAXBOTIX ULTRASONIC RANGER IIO DRIVE
  M:    Andreas Klinger <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/devicetree/bindings/iio/proximity/maxbotix,mb1232.txt
 +F:    Documentation/devicetree/bindings/iio/proximity/maxbotix,mb1232.yaml
  F:    drivers/iio/proximity/mb1232.c
  
  MAXIM MAX77650 PMIC MFD DRIVER
@@@ -10467,7 -10466,7 +10467,7 @@@ M:   Hugues Fruchet <[email protected]
  L:    [email protected]
  T:    git git://linuxtv.org/media_tree.git
  S:    Supported
 -F:    Documentation/devicetree/bindings/media/st,stm32-dcmi.txt
 +F:    Documentation/devicetree/bindings/media/st,stm32-dcmi.yaml
  F:    drivers/media/platform/stm32/stm32-dcmi.c
  
  MEDIA DRIVERS FOR NVIDIA TEGRA - VDE
@@@ -11119,7 -11118,7 +11119,7 @@@ M:   Thomas Bogendoerfer <tsbogend@alpha.
  L:    [email protected]
  W:    http://www.linux-mips.org/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git
- Q:    http://patchwork.linux-mips.org/project/linux-mips/list/
+ Q:    https://patchwork.kernel.org/project/linux-mips/list/
  S:    Maintained
  F:    Documentation/devicetree/bindings/mips/
  F:    Documentation/mips/
@@@ -11483,7 -11482,7 +11483,7 @@@ F:   drivers/scsi/mac_scsi.
  F:    drivers/scsi/sun3_scsi.*
  F:    drivers/scsi/sun3_scsi_vme.c
  
 -NCSI LIBRARY:
 +NCSI LIBRARY
  M:    Samuel Mendoza-Jonas <[email protected]>
  S:    Maintained
  F:    net/ncsi/
@@@ -12739,7 -12738,7 +12739,7 @@@ M:   Tom Joseph <[email protected]
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/pci/cdns,*.txt
 -F:    drivers/pci/controller/pcie-cadence*
 +F:    drivers/pci/controller/cadence/
  
  PCI DRIVER FOR FREESCALE LAYERSCAPE
  M:    Minghuan Lian <[email protected]>
@@@ -12952,6 -12951,7 +12952,6 @@@ M:   Robert Richter <[email protected]
  L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
 -F:    Documentation/devicetree/bindings/pci/pci-thunder-*
  F:    drivers/pci/controller/pci-thunder-*
  
  PCIE DRIVER FOR HISILICON
  S:    Maintained
  F:    drivers/block/ps3vram.c
  
 -PSAMPLE PACKET SAMPLING SUPPORT:
 +PSAMPLE PACKET SAMPLING SUPPORT
  M:    Yotam Gigi <[email protected]>
  S:    Maintained
  F:    net/psample
@@@ -14226,7 -14226,7 +14226,7 @@@ F:   include/dt-bindings/reset
  F:    include/linux/reset.h
  F:    include/linux/reset/
  F:    include/linux/reset-controller.h
 -K:      \b(?:devm_|of_)?reset_control(?:ler_[a-z]+|_[a-z_]+)?\b
 +K:    \b(?:devm_|of_)?reset_control(?:ler_[a-z]+|_[a-z_]+)?\b
  
  RESTARTABLE SEQUENCES SUPPORT
  M:    Mathieu Desnoyers <[email protected]>
@@@ -14580,10 -14580,10 +14580,10 @@@ F:        drivers/media/pci/saa7146
  F:    include/media/drv-intf/saa7146*
  
  SAFESETID SECURITY MODULE
 -M:     Micah Morton <[email protected]>
 -S:     Supported
 -F:     security/safesetid/
 -F:     Documentation/admin-guide/LSM/SafeSetID.rst
 +M:    Micah Morton <[email protected]>
 +S:    Supported
 +F:    security/safesetid/
 +F:    Documentation/admin-guide/LSM/SafeSetID.rst
  
  SAMSUNG AUDIO (ASoC) DRIVERS
  M:    Krzysztof Kozlowski <[email protected]>
@@@ -15921,7 -15921,7 +15921,7 @@@ F:   drivers/*/stm32-*timer
  F:    drivers/pwm/pwm-stm32*
  F:    include/linux/*/stm32-*tim*
  F:    Documentation/ABI/testing/*timer-stm32
 -F:    Documentation/devicetree/bindings/*/stm32-*timer*
 +F:    Documentation/devicetree/bindings/*/*stm32-*timer*
  F:    Documentation/devicetree/bindings/pwm/pwm-stm32*
  
  STMMAC ETHERNET DRIVER
@@@ -16073,22 -16073,20 +16073,22 @@@ 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]>
  S:    Maintained
  F:    drivers/tty/serial/8250/8250_dw.c
 +F:    drivers/tty/serial/8250/8250_dwlib.*
 +F:    drivers/tty/serial/8250/8250_lpss.c
  
  SYNOPSYS DESIGNWARE APB GPIO DRIVER
  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]>
@@@ -16552,8 -16550,8 +16552,8 @@@ M:   Michael Jamet <[email protected]
  M:    Mika Westerberg <[email protected]>
  M:    Yehezkel Bernat <[email protected]>
  L:    [email protected]
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git
  S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git
  F:    Documentation/admin-guide/thunderbolt.rst
  F:    drivers/thunderbolt/
  F:    include/linux/thunderbolt.h
@@@ -17080,7 -17078,7 +17080,7 @@@ S:   Maintaine
  F:    Documentation/admin-guide/ufs.rst
  F:    fs/ufs/
  
 -UHID USERSPACE HID IO DRIVER:
 +UHID USERSPACE HID IO DRIVER
  M:    David Herrmann <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -17094,18 -17092,18 +17094,18 @@@ S:        Maintaine
  F:    drivers/usb/common/ulpi.c
  F:    include/linux/ulpi/
  
 -ULTRA-WIDEBAND (UWB) SUBSYSTEM:
 +ULTRA-WIDEBAND (UWB) SUBSYSTEM
  L:    [email protected]
  S:    Obsolete
  F:    drivers/staging/uwb/
  
 -UNICODE SUBSYSTEM:
 +UNICODE SUBSYSTEM
  M:    Gabriel Krisman Bertazi <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    fs/unicode/
  
 -UNICORE32 ARCHITECTURE:
 +UNICORE32 ARCHITECTURE
  M:    Guan Xuetao <[email protected]>
  W:    http://mprc.pku.edu.cn/~guanxuetao/linux
  S:    Maintained
@@@ -17392,14 -17390,11 +17392,14 @@@ F:        drivers/usb
  F:    include/linux/usb.h
  F:    include/linux/usb/
  
 -USB TYPEC PI3USB30532 MUX DRIVER
 -M:    Hans de Goede <hdegoede@redhat.com>
 +USB TYPEC BUS FOR ALTERNATE MODES
 +M:    Heikki Krogerus <[email protected].com>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/usb/typec/mux/pi3usb30532.c
 +F:    Documentation/ABI/testing/sysfs-bus-typec
 +F:    Documentation/driver-api/usb/typec_bus.rst
 +F:    drivers/usb/typec/altmodes/
 +F:    include/linux/usb/typec_altmode.h
  
  USB TYPEC CLASS
  M:    Heikki Krogerus <[email protected]>
@@@ -17410,11 -17405,14 +17410,11 @@@ F:        Documentation/driver-api/usb/typec.r
  F:    drivers/usb/typec/
  F:    include/linux/usb/typec.h
  
 -USB TYPEC BUS FOR ALTERNATE MODES
 -M:    Heikki Krogerus <[email protected].com>
 +USB TYPEC PI3USB30532 MUX DRIVER
 +M:    Hans de Goede <hdegoede@redhat.com>
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/ABI/testing/sysfs-bus-typec
 -F:    Documentation/driver-api/usb/typec_bus.rst
 -F:    drivers/usb/typec/altmodes/
 -F:    include/linux/usb/typec_altmode.h
 +F:    drivers/usb/typec/mux/pi3usb30532.c
  
  USB TYPEC PORT CONTROLLER DRIVERS
  M:    Guenter Roeck <[email protected]>
@@@ -17791,7 -17789,7 +17791,7 @@@ F:   include/linux/vbox_utils.
  F:    include/uapi/linux/vbox*.h
  F:    drivers/virt/vboxguest/
  
 -VIRTUAL BOX SHARED FOLDER VFS DRIVER:
 +VIRTUAL BOX SHARED FOLDER VFS DRIVER
  M:    Hans de Goede <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -18414,8 -18412,8 +18414,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.153167 seconds and 4 git commands to generate.