Merge 5.9-rc5 into char-misc-next

We want the char/misc fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <[email protected]>

diff --combined MAINTAINERS
index 8cc25820dd8e1e26bed28d380a10d1990af4af9c,0d0862b19ce5ddc4215fdb17a7676d029802f4b1..3edf55b9954c3d67a6a9e01b2817c6b0c44f9d4d
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1694,7 -1694,6 +1694,6 @@@ F:      arch/arm/mach-cns3xxx
  
  ARM/CAVIUM THUNDER NETWORK DRIVER
  M:    Sunil Goutham <[email protected]>
- M:    Robert Richter <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
  F:    drivers/net/ethernet/cavium/thunder/
@@@ -3389,6 -3388,7 +3388,7 @@@ M:      Florian Fainelli <[email protected]
  L:    [email protected]
  L:    [email protected] (subscribers-only)
  S:    Supported
+ F:    Documentation/devicetree/bindings/net/dsa/b53.txt
  F:    drivers/net/dsa/b53/*
  F:    include/linux/platform_data/b53.h
  
@@@ -3574,13 -3574,28 +3574,28 @@@ L:   [email protected]
  S:    Maintained
  F:    drivers/phy/broadcom/phy-brcm-usb*
  
+ BROADCOM ETHERNET PHY DRIVERS
+ M:    Florian Fainelli <[email protected]>
+ L:    [email protected]
+ L:    [email protected]
+ S:    Supported
+ F:    Documentation/devicetree/bindings/net/broadcom-bcm87xx.txt
+ F:    drivers/net/phy/bcm*.[ch]
+ F:    drivers/net/phy/broadcom.c
+ F:    include/linux/brcmphy.h
+ 
  BROADCOM GENET ETHERNET DRIVER
  M:    Doug Berger <[email protected]>
  M:    Florian Fainelli <[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Supported
+ F:    Documentation/devicetree/bindings/net/brcm,bcmgenet.txt
+ F:    Documentation/devicetree/bindings/net/brcm,unimac-mdio.txt
  F:    drivers/net/ethernet/broadcom/genet/
+ F:    drivers/net/mdio/mdio-bcm-unimac.c
+ F:    include/linux/platform_data/bcmgenet.h
+ F:    include/linux/platform_data/mdio-bcm-unimac.h
  
  BROADCOM IPROC ARM ARCHITECTURE
  M:    Ray Jui <[email protected]>
@@@ -3932,8 -3947,8 +3947,8 @@@ W:      https://wireless.wiki.kernel.org/en/
  F:    drivers/net/wireless/ath/carl9170/
  
  CAVIUM I2C DRIVER
- M:    Robert Richter <rric[email protected]>
- S:    Supported
+ M:    Robert Richter <rric@kernel.org>
+ S:    Odd Fixes
  W:    http://www.marvell.com
  F:    drivers/i2c/busses/i2c-octeon*
  F:    drivers/i2c/busses/i2c-thunderx*
@@@ -3948,8 -3963,8 +3963,8 @@@ W:      http://www.marvell.co
  F:    drivers/net/ethernet/cavium/liquidio/
  
  CAVIUM MMC DRIVER
- M:    Robert Richter <rric[email protected]>
- S:    Supported
+ M:    Robert Richter <rric@kernel.org>
+ S:    Odd Fixes
  W:    http://www.marvell.com
  F:    drivers/mmc/host/cavium*
  
@@@ -3961,9 -3976,9 +3976,9 @@@ W:      http://www.marvell.co
  F:    drivers/crypto/cavium/cpt/
  
  CAVIUM THUNDERX2 ARM64 SOC
- M:    Robert Richter <rric[email protected]>
+ M:    Robert Richter <rric@kernel.org>
  L:    [email protected] (moderated for non-subscribers)
- S:    Maintained
+ S:    Odd Fixes
  F:    Documentation/devicetree/bindings/arm/cavium-thunder2.txt
  F:    arch/arm64/boot/dts/cavium/thunder2-99xx*
  
@@@ -4242,6 -4257,8 +4257,8 @@@ S:      Maintaine
  F:    .clang-format
  
  CLANG/LLVM BUILD SUPPORT
+ M:    Nathan Chancellor <[email protected]>
+ M:    Nick Desaulniers <[email protected]>
  L:    [email protected]
  S:    Supported
  W:    https://clangbuiltlinux.github.io/
@@@ -5240,6 -5257,7 +5257,7 @@@ DOCUMENTATIO
  M:    Jonathan Corbet <[email protected]>
  L:    [email protected]
  S:    Maintained
+ P:    Documentation/doc-guide/maintainer-profile.rst
  T:    git git://git.lwn.net/linux.git docs-next
  F:    Documentation/
  F:    scripts/documentation-file-ref-check
@@@ -6174,16 -6192,15 +6192,15 @@@ F:   drivers/edac/highbank
  
  EDAC-CAVIUM OCTEON
  M:    Ralf Baechle <[email protected]>
- M:    Robert Richter <[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Supported
  F:    drivers/edac/octeon_edac*
  
  EDAC-CAVIUM THUNDERX
- M:    Robert Richter <rric[email protected]>
+ M:    Robert Richter <rric@kernel.org>
  L:    [email protected]
- S:    Supported
+ S:    Odd Fixes
  F:    drivers/edac/thunderx_edac*
  
  EDAC-CORE
@@@ -6191,7 -6208,7 +6208,7 @@@ M:      Borislav Petkov <[email protected]
  M:    Mauro Carvalho Chehab <[email protected]>
  M:    Tony Luck <[email protected]>
  R:    James Morse <[email protected]>
- R:    Robert Richter <rric[email protected]>
+ R:    Robert Richter <rric@kernel.org>
  L:    [email protected]
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git edac-for-next
@@@ -6495,7 -6512,6 +6512,6 @@@ F:      net/bridge
  
  ETHERNET PHY LIBRARY
  M:    Andrew Lunn <[email protected]>
- M:    Florian Fainelli <[email protected]>
  M:    Heiner Kallweit <[email protected]>
  R:    Russell King <[email protected]>
  L:    [email protected]
@@@ -6885,6 -6901,14 +6901,14 @@@ L:    [email protected]
  S:    Maintained
  F:    drivers/dma/fsldma.*
  
+ FREESCALE DSPI DRIVER
+ M:    Vladimir Oltean <[email protected]>
+ L:    [email protected]
+ S:    Maintained
+ F:    Documentation/devicetree/bindings/spi/spi-fsl-dspi.txt
+ F:    drivers/spi/spi-fsl-dspi.c
+ F:    include/linux/spi/spi-fsl-dspi.h
+ 
  FREESCALE ENETC ETHERNET DRIVERS
  M:    Claudiu Manoil <[email protected]>
  L:    [email protected]
@@@ -7861,13 -7885,6 +7885,13 @@@ W:    http://www.hisilicon.co
  F:    Documentation/devicetree/bindings/net/hisilicon*.txt
  F:    drivers/net/ethernet/hisilicon/
  
 +HIKEY960 ONBOARD USB GPIO HUB DRIVER
 +M:    John Stultz <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/misc/hisi_hikey_usb.c
 +F:    Documentation/devicetree/bindings/misc/hisilicon-hikey-usb.yaml
 +
  HISILICON PMU DRIVER
  M:    Shaokun Zhang <[email protected]>
  S:    Supported
@@@ -8263,7 -8280,7 +8287,7 @@@ IA64 (Itanium) PLATFOR
  M:    Tony Luck <[email protected]>
  M:    Fenghua Yu <[email protected]>
  L:    [email protected]
- S:    Maintained
+ S:    Odd Fixes
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git
  F:    Documentation/ia64/
  F:    arch/ia64/
@@@ -9783,7 -9800,7 +9807,7 @@@ F:      drivers/scsi/53c700
  
  LEAKING_ADDRESSES
  M:    Tobin C. Harding <[email protected]>
- M:    Tycho Andersen <tycho@tycho.ws>
+ M:    Tycho Andersen <tycho@tycho.pizza>
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tobin/leaks.git
@@@ -13437,10 -13454,10 +13461,10 @@@ F:        Documentation/devicetree/bindings/pc
  F:    drivers/pci/controller/dwc/*artpec*
  
  PCIE DRIVER FOR CAVIUM THUNDERX
- M:    Robert Richter <rric[email protected]>
+ M:    Robert Richter <rric@kernel.org>
  L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
- S:    Supported
+ S:    Odd Fixes
  F:    drivers/pci/controller/pci-thunder-*
  
  PCIE DRIVER FOR HISILICON
@@@ -13577,12 -13594,18 +13601,18 @@@ F:        kernel/events/
  F:    tools/lib/perf/
  F:    tools/perf/
  
- PERFORMANCE EVENTS SUBSYSTEM ARM64 PMU EVENTS
+ PERFORMANCE EVENTS TOOLING ARM64
  R:    John Garry <[email protected]>
  R:    Will Deacon <[email protected]>
+ R:    Mathieu Poirier <[email protected]>
+ R:    Leo Yan <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
+ F:    tools/build/feature/test-libopencsd.c
+ F:    tools/perf/arch/arm*/
  F:    tools/perf/pmu-events/arch/arm64/
+ F:    tools/perf/util/arm-spe*
+ F:    tools/perf/util/cs-etm*
  
  PERSONALITY HANDLING
  M:    Christoph Hellwig <[email protected]>
@@@ -14373,7 -14396,7 +14403,7 @@@ M:   Rob Clark <[email protected]
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
- F:    drivers/iommu/qcom_iommu.c
+ F:    drivers/iommu/arm/arm-smmu/qcom_iommu.c
  
  QUALCOMM IPCC MAILBOX DRIVER
  M:    Manivannan Sadhasivam <[email protected]>
@@@ -15554,6 -15577,7 +15584,7 @@@ F:   include/uapi/linux/sed
  SECURITY CONTACT
  M:    Security Officers <[email protected]>
  S:    Supported
+ F:    Documentation/admin-guide/security-bugs.rst
  
  SECURITY SUBSYSTEM
  M:    James Morris <[email protected]>
@@@ -17222,8 -17246,8 +17253,8 @@@ S:   Maintaine
  F:    drivers/net/thunderbolt.c
  
  THUNDERX GPIO DRIVER
- M:    Robert Richter <rric[email protected]>
- S:    Maintained
+ M:    Robert Richter <rric@kernel.org>
+ S:    Odd Fixes
  F:    drivers/gpio/gpio-thunderx.c
  
  TI AM437X VPFE DRIVER