Merge tag 'for-v5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux...

author Linus Torvalds <[email protected]>

Tue, 20 Oct 2020 17:56:34 +0000 (10:56 -0700)

committer Linus Torvalds <[email protected]>

Tue, 20 Oct 2020 17:56:34 +0000 (10:56 -0700)
author Linus Torvalds <[email protected]>
Tue, 20 Oct 2020 17:56:34 +0000 (10:56 -0700)
committer Linus Torvalds <[email protected]>
Tue, 20 Oct 2020 17:56:34 +0000 (10:56 -0700)
diff --combined MAINTAINERS

index bf7ba6d7993c5b0d0c960ee62812fc65c759916b,a733a80748ffeb558a9d432784893d9f3d2bfec1..17ca7c8490a9d743dd43b94bcbb3a7f556a7c796
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -405,7 -405,7 +405,7 @@@ F: drivers/platform/x86/i2c-multi-insta
   ACPI PMIC DRIVERS
   M:    "Rafael J. Wysocki" <[email protected]>
   M:    Len Brown <[email protected]>
- -R:    Andy Shevchenko <and[email protected]>
+ +R:    Andy Shevchenko <and[email protected]>
   R:    Mika Westerberg <[email protected]>
   L:    [email protected]
   S:    Supported
@@@ -802,13 -802,6 +802,13 @@@ S:       Maintaine
   F:    Documentation/devicetree/bindings/interrupt-controller/amazon,al-fic.txt
   F:    drivers/irqchip/irq-al-fic.c
   
+ +AMAZON ANNAPURNA LABS MEMORY CONTROLLER EDAC
+ +M:    Talel Shenhar <[email protected]>
+ +M:    Talel Shenhar <[email protected]>
+ +S:    Maintained
+ +F:    Documentation/devicetree/bindings/edac/amazon,al-mc-edac.yaml
+ +F:    drivers/edac/al_mc_edac.c
+ +
   AMAZON ANNAPURNA LABS THERMAL MMIO DRIVER
   M:    Talel Shenhar <[email protected]>
   S:    Maintained
@@@ -950,12 -943,37 +950,12 @@@ S:      Supporte
   F:    arch/arm64/boot/dts/amd/amd-seattle-xgbe*.dtsi
   F:    drivers/net/ethernet/amd/xgbe/
   
- -ANALOG DEVICES INC AD5686 DRIVER
- -M:    Michael Hennerich <[email protected]>
- -L:    [email protected]
- -S:    Supported
- -W:    http://ez.analog.com/community/linux-device-drivers
- -F:    drivers/iio/dac/ad5686*
- -F:    drivers/iio/dac/ad5696*
- -
- -ANALOG DEVICES INC AD5758 DRIVER
- -M:    Michael Hennerich <[email protected]>
+ +AMS AS73211 DRIVER
+ +M:    Christian Eggers <[email protected]>
   L:    [email protected]
- -S:    Supported
- -W:    http://ez.analog.com/community/linux-device-drivers
- -F:    Documentation/devicetree/bindings/iio/dac/ad5758.txt
- -F:    drivers/iio/dac/ad5758.c
- -
- -ANALOG DEVICES INC AD7091R5 DRIVER
- -M:    Beniamin Bia <[email protected]>
- -L:    [email protected]
- -S:    Supported
- -W:    http://ez.analog.com/community/linux-device-drivers
- -F:    Documentation/devicetree/bindings/iio/adc/adi,ad7091r5.yaml
- -F:    drivers/iio/adc/ad7091r5.c
- -
- -ANALOG DEVICES INC AD7124 DRIVER
- -M:    Michael Hennerich <[email protected]>
- -L:    [email protected]
- -S:    Supported
- -W:    http://ez.analog.com/community/linux-device-drivers
- -F:    Documentation/devicetree/bindings/iio/adc/adi,ad7124.yaml
- -F:    drivers/iio/adc/ad7124.c
+ +S:    Maintained
+ +F:    Documentation/devicetree/bindings/iio/light/ams,as73211.yaml
+ +F:    drivers/iio/light/as73211.c
   
   ANALOG DEVICES INC AD7192 DRIVER
   M:    Alexandru Tachici <[email protected]>
@@@ -973,6 -991,15 +973,6 @@@ W:        http://ez.analog.com/community/linux
   F:    Documentation/devicetree/bindings/iio/adc/adi,ad7292.yaml
   F:    drivers/iio/adc/ad7292.c
   
- -ANALOG DEVICES INC AD7606 DRIVER
- -M:    Michael Hennerich <[email protected]>
- -M:    Beniamin Bia <[email protected]>
- -L:    [email protected]
- -S:    Supported
- -W:    http://ez.analog.com/community/linux-device-drivers
- -F:    Documentation/devicetree/bindings/iio/adc/adi,ad7606.yaml
- -F:    drivers/iio/adc/ad7606.c
- -
   ANALOG DEVICES INC AD7768-1 DRIVER
   M:    Michael Hennerich <[email protected]>
   L:    [email protected]
@@@ -1034,6 -1061,7 +1034,6 @@@ F:      drivers/iio/imu/adis16475.
   F:    Documentation/devicetree/bindings/iio/imu/adi,adis16475.yaml
   
   ANALOG DEVICES INC ADM1177 DRIVER
- -M:    Beniamin Bia <[email protected]>
   M:    Michael Hennerich <[email protected]>
   L:    [email protected]
   S:    Supported
@@@ -1080,13 -1108,6 +1080,13 @@@ L:    [email protected]
   S:    Maintained
   F:    drivers/media/i2c/adv7842*
   
+ +ANALOG DEVICES INC ADXRS290 DRIVER
+ +M:    Nishant Malpani <[email protected]>
+ +L:    [email protected]
+ +S:    Supported
+ +F:    drivers/iio/gyro/adxrs290.c
+ +F:    Documentation/devicetree/bindings/iio/gyroscope/adi,adxrs290.yaml
+ +
   ANALOG DEVICES INC ASOC CODEC DRIVERS
   M:    Lars-Peter Clausen <[email protected]>
   M:    Nuno Sá <[email protected]>
@@@ -1107,6 -1128,15 +1107,6 @@@ S:     Supporte
   W:    http://ez.analog.com/community/linux-device-drivers
   F:    drivers/dma/dma-axi-dmac.c
   
- -ANALOG DEVICES INC HMC425A DRIVER
- -M:    Beniamin Bia <[email protected]>
- -M:    Michael Hennerich <[email protected]>
- -L:    [email protected]
- -S:    Supported
- -W:    http://ez.analog.com/community/linux-device-drivers
- -F:    Documentation/devicetree/bindings/iio/amplifiers/adi,hmc425a.yaml
- -F:    drivers/iio/amplifiers/hmc425a.c
- -
   ANALOG DEVICES INC IIO DRIVERS
   M:    Lars-Peter Clausen <[email protected]>
   M:    Michael Hennerich <[email protected]>
@@@ -1115,11 -1145,8 +1115,11 @@@ W:    http://wiki.analog.com
   W:    http://ez.analog.com/community/linux-device-drivers
   F:    Documentation/ABI/testing/sysfs-bus-iio-frequency-ad9523
   F:    Documentation/ABI/testing/sysfs-bus-iio-frequency-adf4350
+ +F:    Documentation/devicetree/bindings/iio/*/adi,*
+ +F:    Documentation/devicetree/bindings/iio/dac/ad5758.txt
   F:    drivers/iio/*/ad*
   F:    drivers/iio/adc/ltc249*
+ +F:    drivers/iio/amplifiers/hmc425a.c
   F:    drivers/staging/iio/*/ad*
   X:    drivers/iio/*/adjd*
   
@@@ -1259,7 -1286,7 +1259,7 @@@ S:      Supporte
   F:    Documentation/devicetree/bindings/net/apm-xgene-enet.txt
   F:    Documentation/devicetree/bindings/net/apm-xgene-mdio.txt
   F:    drivers/net/ethernet/apm/xgene/
- -F:    drivers/net/phy/mdio-xgene.c
+ +F:    drivers/net/mdio/mdio-xgene.c
   
   APPLIED MICRO (APM) X-GENE SOC PMU
   M:    Khuong Dinh <[email protected]>
@@@ -1433,11 -1460,6 +1433,11 @@@ S:    Odd Fixe
   F:    drivers/amba/
   F:    include/linux/amba/bus.h
   
+ +ARM PRIMECELL CLCD PL110 DRIVER
+ +M:    Russell King <[email protected]>
+ +S:    Odd Fixes
+ +F:    drivers/video/fbdev/amba-clcd.*
+ +
   ARM PRIMECELL KMI PL050 DRIVER
   M:    Russell King <[email protected]>
   S:    Odd Fixes
@@@ -1484,7 -1506,8 +1484,7 @@@ L:      [email protected]
   S:    Maintained
   F:    Documentation/devicetree/bindings/iommu/arm,smmu*
   F:    drivers/iommu/arm/
- -F:    drivers/iommu/io-pgtable-arm-v7s.c
- -F:    drivers/iommu/io-pgtable-arm.c
+ +F:    drivers/iommu/io-pgtable-arm*
   
   ARM SUB-ARCHITECTURES
   L:    [email protected] (moderated for non-subscribers)
@@@ -1500,11 -1523,10 +1500,11 @@@ L:   [email protected]
   S:    Maintained
   F:    Documentation/devicetree/bindings/arm/actions.yaml
   F:    Documentation/devicetree/bindings/clock/actions,owl-cmu.txt
- -F:    Documentation/devicetree/bindings/dma/owl-dma.txt
+ +F:    Documentation/devicetree/bindings/dma/owl-dma.yaml
   F:    Documentation/devicetree/bindings/i2c/i2c-owl.txt
+ +F:    Documentation/devicetree/bindings/interrupt-controller/actions,owl-sirq.yaml
   F:    Documentation/devicetree/bindings/mmc/owl-mmc.yaml
- -F:    Documentation/devicetree/bindings/pinctrl/actions,s900-pinctrl.txt
+ +F:    Documentation/devicetree/bindings/pinctrl/actions,*
   F:    Documentation/devicetree/bindings/power/actions,owl-sps.txt
   F:    Documentation/devicetree/bindings/timer/actions,owl-timer.txt
   F:    arch/arm/boot/dts/owl-*
@@@ -1514,7 -1536,6 +1514,7 @@@ F:      drivers/clk/actions
   F:    drivers/clocksource/timer-owl*
   F:    drivers/dma/owl-dma.c
   F:    drivers/i2c/busses/i2c-owl.c
+ +F:    drivers/irqchip/irq-owl-sirq.c
   F:    drivers/mmc/host/owl-mmc.c
   F:    drivers/pinctrl/actions/*
   F:    drivers/soc/actions/
@@@ -1602,7 -1623,7 +1602,7 @@@ N:      meso
   
   ARM/Annapurna Labs ALPINE ARCHITECTURE
   M:    Tsahee Zidenberg <[email protected]>
- -M:    Antoine Tenart <a[email protected]>
+ +M:    Antoine Tenart <a[email protected]>
   L:    [email protected] (moderated for non-subscribers)
   S:    Maintained
   F:    arch/arm/boot/dts/alpine*
@@@ -1673,6 -1694,7 +1673,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/
@@@ -1725,7 -1747,6 +1725,7 @@@ ARM/CORESIGHT FRAMEWORK AND DRIVER
   M:    Mathieu Poirier <[email protected]>
   R:    Suzuki K Poulose <[email protected]>
   R:    Mike Leach <[email protected]>
+ +L:    [email protected] (moderated for non-subscribers)
   L:    [email protected] (moderated for non-subscribers)
   S:    Maintained
   F:    Documentation/ABI/testing/sysfs-bus-coresight-devices-*
@@@ -2425,7 -2446,7 +2425,7 @@@ L:      [email protected] (m
   L:    [email protected]
   S:    Maintained
   F:    Documentation/devicetree/bindings/media/s5p-cec.txt
- -F:    drivers/media/platform/s5p-cec/
+ +F:    drivers/media/cec/platform/s5p/
   
   ARM/SAMSUNG S5P SERIES JPEG CODEC SUPPORT
   M:    Andrzej Pietrasiewicz <[email protected]>
@@@ -2484,7 -2505,7 +2484,7 @@@ S:      Maintaine
   F:    drivers/clk/socfpga/
   
   ARM/SOCFPGA EDAC SUPPORT
- -M:    Thor Thayer <[email protected]>
+ +M:    Dinh Nguyen <[email protected]>
   S:    Maintained
   F:    drivers/edac/altera_edac.
   
@@@ -2570,7 -2591,7 +2570,7 @@@ L:      [email protected]
   L:    [email protected]
   S:    Maintained
   F:    Documentation/devicetree/bindings/media/tegra-cec.txt
- -F:    drivers/media/platform/tegra-cec/
+ +F:    drivers/media/cec/platform/tegra/
   
   ARM/TETON BGA MACHINE SUPPORT
   M:    "Mark F. Brown" <[email protected]>
@@@ -3184,7 -3205,6 +3184,7 @@@ S:      Maintaine
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git
   F:    block/
   F:    drivers/block/
+ +F:    include/linux/blk*
   F:    kernel/trace/blktrace.c
   F:    lib/sbitmap.c
   
@@@ -3238,7 -3258,7 +3238,7 @@@ M:      Daniel Borkmann <[email protected]
   R:    Martin KaFai Lau <[email protected]>
   R:    Song Liu <[email protected]>
   R:    Yonghong Song <[email protected]>
- -R:    Andrii Nakryiko <andrii[email protected]>
+ +R:    Andrii Nakryiko <andrii@kernel.org>
   R:    John Fastabend <[email protected]>
   R:    KP Singh <[email protected]>
   L:    [email protected]
@@@ -3368,7 -3388,6 +3368,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
   
@@@ -3455,14 -3474,6 +3455,14 @@@ F:    drivers/bus/brcmstb_gisb.
   F:    drivers/pci/controller/pcie-brcmstb.c
   N:    brcmstb
   
+ +BROADCOM BDC DRIVER
+ +M:    Al Cooper <[email protected]>
+ +L:    [email protected]
+ +L:    [email protected]
+ +S:    Maintained
+ +F:    Documentation/devicetree/bindings/usb/brcm,bdc.txt
+ +F:    drivers/usb/gadget/udc/bdc/
+ +
   BROADCOM BMIPS CPUFREQ DRIVER
   M:    Markus Mayer <[email protected]>
   M:    [email protected]
@@@ -3495,17 -3506,13 +3495,17 @@@ F:   drivers/net/ethernet/broadcom/bnx2.
   F:    drivers/net/ethernet/broadcom/bnx2_*
   
   BROADCOM BNX2FC 10 GIGABIT FCOE DRIVER
- -M:    [email protected]
+ +M:    Saurav Kashyap <[email protected]>
+ +M:    Javed Hasan <[email protected]>
+ +M:    [email protected]
   L:    [email protected]
   S:    Supported
   F:    drivers/scsi/bnx2fc/
   
   BROADCOM BNX2I 1/10 GIGABIT iSCSI DRIVER
- -M:    [email protected]
+ +M:    Nilesh Javali <[email protected]>
+ +M:    Manish Rangankar <[email protected]>
+ +M:    [email protected]
   L:    [email protected]
   S:    Supported
   F:    drivers/scsi/bnx2i/
@@@ -3566,28 -3573,13 +3566,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]>
@@@ -3840,16 -3832,6 +3840,16 @@@ S:    Orpha
   F:    Documentation/devicetree/bindings/mtd/cadence-nand-controller.txt
   F:    drivers/mtd/nand/raw/cadence-nand-controller.c
   
+ +CADENCE USB3 DRD IP DRIVER
+ +M:    Peter Chen <[email protected]>
+ +M:    Pawel Laszczak <[email protected]>
+ +M:    Roger Quadros <[email protected]>
+ +L:    [email protected]
+ +S:    Maintained
+ +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git
+ +F:    Documentation/devicetree/bindings/usb/cdns-usb3.txt
+ +F:    drivers/usb/cdns3/
+ +
   CADET FM/AM RADIO RECEIVER DRIVER
   M:    Hans Verkuil <[email protected]>
   L:    [email protected]
@@@ -3914,7 -3896,6 +3914,7 @@@ F:      include/net/netns/can.
   F:    include/uapi/linux/can.h
   F:    include/uapi/linux/can/bcm.h
   F:    include/uapi/linux/can/gw.h
+ +F:    include/uapi/linux/can/isotp.h
   F:    include/uapi/linux/can/raw.h
   F:    net/can/
   
@@@ -3950,8 -3931,8 +3950,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*
@@@ -3966,8 -3947,8 +3966,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*
   
@@@ -3979,9 -3960,9 +3979,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*
   
@@@ -4033,7 -4014,7 +4033,7 @@@ S:      Supporte
   W:    http://linuxtv.org
   T:    git git://linuxtv.org/media_tree.git
   F:    Documentation/devicetree/bindings/media/cec-gpio.txt
- -F:    drivers/media/platform/cec-gpio/
+ +F:    drivers/media/cec/platform/cec-gpio/
   
   CELL BROADBAND ENGINE ARCHITECTURE
   M:    Arnd Bergmann <[email protected]>
@@@ -4103,11 -4084,6 +4103,11 @@@ T:    git git://git.kernel.org/pub/scm/lin
   F:    drivers/char/
   F:    drivers/misc/
   F:    include/linux/miscdevice.h
+ +X:    drivers/char/agp/
+ +X:    drivers/char/hw_random/
+ +X:    drivers/char/ipmi/
+ +X:    drivers/char/random.c
+ +X:    drivers/char/tpm/
   
   CHECKPATCH
   M:    Andy Whitcroft <[email protected]>
@@@ -4178,7 -4154,6 +4178,7 @@@ CIRRUS LOGIC AUDIO CODEC DRIVER
   M:    James Schulman <[email protected]>
   M:    David Rhodes <[email protected]>
   L:    [email protected] (moderated for non-subscribers)
+ +L:    [email protected]
   S:    Maintained
   F:    sound/soc/codecs/cs*
   
@@@ -4256,6 -4231,7 +4256,6 @@@ F:      drivers/net/ethernet/cisco/enic
   CISCO VIC LOW LATENCY NIC DRIVER
   M:    Christian Benvenuti <[email protected]>
   M:    Nelson Escobar <[email protected]>
- -M:    Parvi Kaustubhi <[email protected]>
   S:    Supported
   F:    drivers/infiniband/hw/usnic/
   
@@@ -4265,8 -4241,6 +4265,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/
@@@ -4415,7 -4389,12 +4415,7 @@@ S:     Supporte
   T:    git git://git.infradead.org/users/hch/configfs.git
   F:    fs/configfs/
   F:    include/linux/configfs.h
- -
- -CONNECTOR
- -M:    Evgeniy Polyakov <[email protected]>
- -L:    [email protected]
- -S:    Maintained
- -F:    drivers/connector/
+ +F:    samples/configfs/
   
   CONSOLE SUBSYSTEM
   M:    Greg Kroah-Hartman <[email protected]>
@@@ -4713,15 -4692,6 +4713,15 @@@ S:    Supporte
   W:    http://www.chelsio.com
   F:    drivers/crypto/chelsio
   
+ +CXGB4 INLINE CRYPTO DRIVER
+ +M:    Ayush Sawal <[email protected]>
+ +M:    Vinay Kumar Yadav <[email protected]>
+ +M:    Rohit Maheshwari <[email protected]>
+ +L:    [email protected]
+ +S:    Supported
+ +W:    http://www.chelsio.com
+ +F:    drivers/net/ethernet/chelsio/inline_crypto/
+ +
   CXGB4 ETHERNET DRIVER (CXGB4)
   M:    Vishal Kulkarni <[email protected]>
   L:    [email protected]
@@@ -5024,12 -4994,6 +5024,12 @@@ S:    Maintaine
   F:    drivers/base/devcoredump.c
   F:    include/linux/devcoredump.h
   
+ +DEVICE DEPENDENCY HELPER SCRIPT
+ +M:    Saravana Kannan <[email protected]>
+ +L:    [email protected]
+ +S:    Maintained
+ +F:    scripts/dev-needs.sh
+ +
   DEVICE DIRECT ACCESS (DAX)
   M:    Dan Williams <[email protected]>
   M:    Vishal Verma <[email protected]>
@@@ -5086,7 -5050,7 +5086,7 @@@ F:      include/linux/dm-*.
   F:    include/uapi/linux/dm-*.h
   
   DEVLINK
- -M:    Jiri Pirko <jiri@mellanox.com>
+ +M:    Jiri Pirko <jiri@nvidia.com>
   L:    [email protected]
   S:    Supported
   F:    Documentation/networking/devlink
@@@ -5226,12 -5190,11 +5226,11 @@@ T:   git git://git.infradead.org/users/hc
   F:    include/asm-generic/dma-mapping.h
   F:    include/linux/dma-direct.h
   F:    include/linux/dma-mapping.h
- -F:    include/linux/dma-noncoherent.h
+ +F:    include/linux/dma-map-ops.h
   F:    kernel/dma/
   
   DMA-BUF HEAPS FRAMEWORK
   M:    Sumit Semwal <[email protected]>
- R:    Andrew F. Davis <[email protected]>
   R:    Benjamin Gaignard <[email protected]>
   R:    Liam Mark <[email protected]>
   R:    Laura Abbott <[email protected]>
@@@ -5275,7 -5238,6 +5274,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
@@@ -5398,6 -5360,7 +5397,6 @@@ F:      include/linux/kobj
   F:    lib/kobj*
   
   DRIVERS FOR ADAPTIVE VOLTAGE SCALING (AVS)
- -M:    Kevin Hilman <[email protected]>
   M:    Nishanth Menon <[email protected]>
   L:    [email protected]
   S:    Maintained
@@@ -5428,7 -5391,7 +5427,7 @@@ F:      drivers/gpu/drm/panel/panel-arm-vers
   
   DRM DRIVER FOR ASPEED BMC GFX
   M:    Joel Stanley <[email protected]>
- -L:    [email protected]
+ +L:    [email protected] (moderated for non-subscribers)
   S:    Supported
   T:    git git://anongit.freedesktop.org/drm/drm-misc
   F:    Documentation/devicetree/bindings/gpu/aspeed-gfx.txt
@@@ -5436,10 -5399,7 +5435,10 @@@ F:    drivers/gpu/drm/aspeed
   
   DRM DRIVER FOR AST SERVER GRAPHICS CHIPS
   M:    Dave Airlie <[email protected]>
- -S:    Odd Fixes
+ +R:    Thomas Zimmermann <[email protected]>
+ +L:    [email protected]
+ +S:    Supported
+ +T:    git git://anongit.freedesktop.org/drm/drm-misc
   F:    drivers/gpu/drm/ast/
   
   DRM DRIVER FOR BOCHS VIRTUAL GPU
@@@ -5513,24 -5473,14 +5512,24 @@@ S:   Maintaine
   F:    drivers/gpu/drm/panel/panel-lvds.c
   F:    Documentation/devicetree/bindings/display/panel/lvds.yaml
   
+ +DRM DRIVER FOR MANTIX MLAF057WE51 PANELS
+ +M:    Guido Günther <[email protected]>
+ +R:    Purism Kernel Team <[email protected]>
+ +S:    Maintained
+ +F:    Documentation/devicetree/bindings/display/panel/mantix,mlaf057we51-x.yaml
+ +F:    drivers/gpu/drm/panel/panel-mantix-mlaf057we51.c
+ +
   DRM DRIVER FOR MATROX G200/G400 GRAPHICS CARDS
   S:    Orphan / Obsolete
   F:    drivers/gpu/drm/mga/
   F:    include/uapi/drm/mga_drm.h
   
- -DRM DRIVER FOR MGA G200 SERVER GRAPHICS CHIPS
+ +DRM DRIVER FOR MGA G200 GRAPHICS CHIPS
   M:    Dave Airlie <[email protected]>
- -S:    Odd Fixes
+ +R:    Thomas Zimmermann <[email protected]>
+ +L:    [email protected]
+ +S:    Supported
+ +T:    git git://anongit.freedesktop.org/drm/drm-misc
   F:    drivers/gpu/drm/mgag200/
   
   DRM DRIVER FOR MI0283QT
@@@ -5611,13 -5561,12 +5610,13 @@@ S:   Maintaine
   F:    Documentation/devicetree/bindings/display/panel/raydium,rm67191.yaml
   F:    drivers/gpu/drm/panel/panel-raydium-rm67191.c
   
- -DRM DRIVER FOR ROCKTECH JH057N00900 PANELS
+ +DRM DRIVER FOR SITRONIX ST7703 PANELS
   M:    Guido Günther <[email protected]>
   R:    Purism Kernel Team <[email protected]>
+ +R:    Ondrej Jirman <[email protected]>
   S:    Maintained
- -F:    Documentation/devicetree/bindings/display/panel/rocktech,jh057n00900.txt
- -F:    drivers/gpu/drm/panel/panel-rocktech-jh057n00900.c
+ +F:    Documentation/devicetree/bindings/display/panel/rocktech,jh057n00900.yaml
+ +F:    drivers/gpu/drm/panel/panel-sitronix-st7703.c
   
   DRM DRIVER FOR SAVAGE VIDEO CARDS
   S:    Orphan / Obsolete
@@@ -5676,15 -5625,13 +5675,15 @@@ F:   drivers/gpu/drm/panel/panel-tpo-tpg1
   DRM DRIVER FOR USB DISPLAYLINK VIDEO ADAPTERS
   M:    Dave Airlie <[email protected]>
   R:    Sean Paul <[email protected]>
+ +R:    Thomas Zimmermann <[email protected]>
   L:    [email protected]
- -S:    Odd Fixes
+ +S:    Supported
   T:    git git://anongit.freedesktop.org/drm/drm-misc
   F:    drivers/gpu/drm/udl/
   
   DRM DRIVER FOR VIRTUAL KERNEL MODESETTING (VKMS)
   M:    Rodrigo Siqueira <[email protected]>
+ +M:    Melissa Wen <[email protected]>
   R:    Haneen Mohammed <[email protected]>
   R:    Daniel Vetter <[email protected]>
   L:    [email protected]
@@@ -5819,7 -5766,7 +5818,7 @@@ F:      drivers/gpu/drm/gma500
   
   DRM DRIVERS FOR HISILICON
   M:    Xinliang Liu <[email protected]>
- -M:    Rongrong Zou <zourongrong@gmail.com>
+ +M:    Tian Tao  <tiantao6@hisilicon.com>
   R:    John Stultz <[email protected]>
   R:    Xinwei Kong <[email protected]>
   R:    Chen Feng <[email protected]>
@@@ -5845,7 -5792,6 +5844,7 @@@ L:      [email protected]
   S:    Supported
   F:    Documentation/devicetree/bindings/display/mediatek/
   F:    drivers/gpu/drm/mediatek/
+ +F:    drivers/phy/mediatek/phy-mtk-hdmi*
   
   DRM DRIVERS FOR NVIDIA TEGRA
   M:    Thierry Reding <[email protected]>
@@@ -5867,7 -5813,7 +5866,7 @@@ L:      [email protected]
   S:    Supported
   T:    git git://linuxtv.org/pinchartl/media drm/du/next
   F:    Documentation/devicetree/bindings/display/bridge/renesas,dw-hdmi.txt
- -F:    Documentation/devicetree/bindings/display/bridge/renesas,lvds.txt
+ +F:    Documentation/devicetree/bindings/display/bridge/renesas,lvds.yaml
   F:    Documentation/devicetree/bindings/display/renesas,du.txt
   F:    drivers/gpu/drm/rcar-du/
   F:    drivers/gpu/drm/shmobile/
@@@ -6134,7 -6080,7 +6133,7 @@@ F:      include/linux/dynamic_debug.
   F:    lib/dynamic_debug.c
   
   DYNAMIC INTERRUPT MODERATION
- -M:    Tal Gilboa <talgi@mellanox.com>
+ +M:    Tal Gilboa <talgi@nvidia.com>
   S:    Maintained
   F:    Documentation/networking/net_dim.rst
   F:    include/linux/dim.h
@@@ -6214,27 -6160,28 +6213,27 @@@ F:   Documentation/devicetree/bindings/ed
   F:    drivers/edac/aspeed_edac.c
   
   EDAC-BLUEFIELD
- -M:    Shravan Kumar Ramani <sramani@mellanox.com>
+ +M:    Shravan Kumar Ramani <shravankr@nvidia.com>
   S:    Supported
   F:    drivers/edac/bluefield_edac.c
   
   EDAC-CALXEDA
- -M:    Robert Richter <[email protected]>
+ +M:    Andre Przywara <[email protected]>
   L:    [email protected]
   S:    Maintained
   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
@@@ -6242,7 -6189,7 +6241,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
@@@ -6535,8 -6482,8 +6534,8 @@@ S:      Odd Fixe
   F:    drivers/net/ethernet/agere/
   
   ETHERNET BRIDGE
- -M:    Roopa Prabhu <roopa@cumulusnetworks.com>
- -M:    Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
+ +M:    Roopa Prabhu <roopa@nvidia.com>
+ +M:    Nikolay Aleksandrov <nikolay@nvidia.com>
   L:    [email protected] (moderated for non-subscribers)
   L:    [email protected]
   S:    Maintained
@@@ -6546,6 -6493,7 +6545,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]
@@@ -6555,14 -6503,11 +6554,14 @@@ F:   Documentation/devicetree/bindings/ne
   F:    Documentation/devicetree/bindings/net/mdio*
   F:    Documentation/devicetree/bindings/net/qca,ar803x.yaml
   F:    Documentation/networking/phy.rst
+ +F:    drivers/net/mdio/
+ +F:    drivers/net/mdio/of_mdio.c
+ +F:    drivers/net/pcs/
   F:    drivers/net/phy/
- -F:    drivers/of/of_mdio.c
   F:    drivers/of/of_net.c
   F:    include/dt-bindings/net/qca-ar803x.h
   F:    include/linux/*mdio*.h
+ +F:    include/linux/mdio/*.h
   F:    include/linux/of_net.h
   F:    include/linux/phy.h
   F:    include/linux/phy_fixed.h
@@@ -6638,7 -6583,6 +6637,7 @@@ F:      fs/proc/bootconfig.
   F:    include/linux/bootconfig.h
   F:    lib/bootconfig.c
   F:    tools/bootconfig/*
+ +F:    tools/bootconfig/scripts/*
   
   EXYNOS DP DRIVER
   M:    Jingoo Han <[email protected]>
@@@ -6652,6 -6596,13 +6651,6 @@@ L:     [email protected]
   S:    Maintained
   F:    drivers/iommu/exynos-iommu.c
   
- -EZchip NPS platform support
- -M:    Vineet Gupta <[email protected]>
- -M:    Ofer Levi <[email protected]>
- -S:    Supported
- -F:    arch/arc/boot/dts/eznps.dts
- -F:    arch/arc/plat-eznps
- -
   F2FS FILE SYSTEM
   M:    Jaegeuk Kim <[email protected]>
   M:    Chao Yu <[email protected]>
@@@ -6859,17 -6810,14 +6858,17 @@@ F:   drivers/net/ethernet/nvidia/
   
   FPGA DFL DRIVERS
   M:    Wu Hao <[email protected]>
+ +R:    Tom Rix <[email protected]>
   L:    [email protected]
   S:    Maintained
+ +F:    Documentation/ABI/testing/sysfs-bus-dfl
   F:    Documentation/fpga/dfl.rst
   F:    drivers/fpga/dfl*
   F:    include/uapi/linux/fpga-dfl.h
   
   FPGA MANAGER FRAMEWORK
   M:    Moritz Fischer <[email protected]>
+ +R:    Tom Rix <[email protected]>
   L:    [email protected]
   S:    Maintained
   W:    http://www.rocketboards.org
@@@ -6935,14 -6883,6 +6934,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]
@@@ -6992,7 -6932,7 +6991,7 @@@ M:      Frank Li <[email protected]
   L:    [email protected]
   S:    Maintained
   F:    Documentation/admin-guide/perf/imx-ddr.rst
- -F:    Documentation/devicetree/bindings/perf/fsl-imx-ddr.txt
+ +F:    Documentation/devicetree/bindings/perf/fsl-imx-ddr.yaml
   F:    drivers/perf/fsl_imx8_ddr_perf.c
   
   FREESCALE IMX I2C DRIVER
@@@ -7000,7 -6940,7 +6999,7 @@@ M:      Oleksij Rempel <o.rempel@pengutronix
   R:    Pengutronix Kernel Team <[email protected]>
   L:    [email protected]
   S:    Maintained
- -F:    Documentation/devicetree/bindings/i2c/i2c-imx.txt
+ +F:    Documentation/devicetree/bindings/i2c/i2c-imx.yaml
   F:    drivers/i2c/busses/i2c-imx.c
   
   FREESCALE IMX LPI2C DRIVER
@@@ -7008,7 -6948,7 +7007,7 @@@ M:      Dong Aisheng <[email protected]
   L:    [email protected]
   L:    [email protected]
   S:    Maintained
- -F:    Documentation/devicetree/bindings/i2c/i2c-imx-lpi2c.txt
+ +F:    Documentation/devicetree/bindings/i2c/i2c-imx-lpi2c.yaml
   F:    drivers/i2c/busses/i2c-imx-lpi2c.c
   
   FREESCALE QORIQ DPAA ETHERNET DRIVER
@@@ -7231,7 -7171,7 +7230,7 @@@ FUSE: FILESYSTEM IN USERSPAC
   M:    Miklos Szeredi <[email protected]>
   L:    [email protected]
   S:    Maintained
- -W:    http://fuse.sourceforge.net/
+ +W:    https://github.com/libfuse/
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git
   F:    Documentation/filesystems/fuse.rst
   F:    fs/fuse/
@@@ -7275,7 -7215,7 +7274,7 @@@ F:      drivers/staging/gasket
   GCC PLUGINS
   M:    Kees Cook <[email protected]>
   R:    Emese Revfy <[email protected]>
- -L:    [email protected]
+ +L:    [email protected]
   S:    Maintained
   F:    Documentation/kbuild/gcc-plugins.rst
   F:    scripts/Makefile.gcc-plugins
@@@ -7775,8 -7715,8 +7774,8 @@@ F:      Documentation/watchdog/hpwdt.rs
   F:    drivers/watchdog/hpwdt.c
   
   HEWLETT-PACKARD SMART ARRAY RAID DRIVER (hpsa)
- -M:    Don Brace <don.brace@microsemi.com>
- -L:    esc.storagedev@microsemi.com
+ +M:    Don Brace <don.brace@microchip.com>
+ +L:    storagedev@microchip.com
   L:    [email protected]
   S:    Supported
   F:    Documentation/scsi/hpsa.rst
@@@ -7785,8 -7725,8 +7784,8 @@@ F:      include/linux/cciss*.
   F:    include/uapi/linux/cciss*.h
   
   HFI1 DRIVER
- -M:    Mike Marciniszyn <mike.marciniszyn@intel.com>
- -M:    Dennis Dalessandro <dennis.dalessandro@intel.com>
+ +M:    Mike Marciniszyn <mike.marciniszyn@cornelisnetworks.com>
+ +M:    Dennis Dalessandro <dennis.dalessandro@cornelisnetworks.com>
   L:    [email protected]
   S:    Supported
   F:    drivers/infiniband/hw/hfi1
@@@ -7919,13 -7859,6 +7918,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
@@@ -7969,12 -7902,6 +7968,12 @@@ F:    drivers/crypto/hisilicon/sec2/sec_cr
   F:    drivers/crypto/hisilicon/sec2/sec_crypto.h
   F:    drivers/crypto/hisilicon/sec2/sec_main.c
   
+ +HISILICON STAGING DRIVERS FOR HIKEY 960/970
+ +M:    Mauro Carvalho Chehab <[email protected]>
+ +L:    [email protected]
+ +S:    Maintained
+ +F:    drivers/staging/hikey9xx/
+ +
   HISILICON TRUE RANDOM NUMBER GENERATOR V2 SUPPORT
   M:    Zaibo Xu <[email protected]>
   S:    Maintained
@@@ -8327,7 -8254,7 +8326,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/
@@@ -8376,9 -8303,8 +8375,9 @@@ S:      Supporte
   F:    drivers/pci/hotplug/rpaphp*
   
   IBM Power SRIOV Virtual NIC Device Driver
- -M:    Thomas Falcon <[email protected]>
- -M:    John Allen <[email protected]>
+ +M:    Dany Madden <[email protected]>
+ +M:    Lijun Pan <[email protected]>
+ +M:    Sukadev Bhattiprolu <[email protected]>
   L:    [email protected]
   S:    Supported
   F:    drivers/net/ethernet/ibm/ibmvnic.*
@@@ -8392,7 -8318,7 +8391,7 @@@ F:      arch/powerpc/platforms/powernv/copy-
   F:    arch/powerpc/platforms/powernv/vas*
   
   IBM Power Virtual Ethernet Device Driver
- -M:    Thomas Falcon <tlfalcon@linux.ibm.com>
+ +M:    Cristobal Forno <cforno12@linux.ibm.com>
   L:    [email protected]
   S:    Supported
   F:    drivers/net/ethernet/ibm/ibmveth.*
@@@ -8552,6 -8478,7 +8551,6 @@@ F:      drivers/iio/multiplexer/iio-mux.
   
   IIO SUBSYSTEM AND DRIVERS
   M:    Jonathan Cameron <[email protected]>
- -R:    Hartmut Knaack <[email protected]>
   R:    Lars-Peter Clausen <[email protected]>
   R:    Peter Meerwald-Stadler <[email protected]>
   L:    [email protected]
@@@ -8635,7 -8562,7 +8634,7 @@@ F:      drivers/iio/pressure/dps310.
   
   INFINIBAND SUBSYSTEM
   M:    Doug Ledford <[email protected]>
- -M:    Jason Gunthorpe <jgg@mellanox.com>
+ +M:    Jason Gunthorpe <jgg@nvidia.com>
   L:    [email protected]
   S:    Supported
   W:    https://github.com/linux-rdma/rdma-core
@@@ -8667,9 -8594,8 +8666,9 @@@ INGENIC JZ47xx SoC
   M:    Paul Cercueil <[email protected]>
   S:    Maintained
   F:    arch/mips/boot/dts/ingenic/
- -F:    arch/mips/include/asm/mach-jz4740/
- -F:    arch/mips/jz4740/
+ +F:    arch/mips/generic/board-ingenic.c
+ +F:    arch/mips/include/asm/mach-ingenic/
+ +F:    arch/mips/ingenic/Kconfig
   F:    drivers/clk/ingenic/
   F:    drivers/dma/dma-jz4780.c
   F:    drivers/gpu/drm/ingenic/
@@@ -8726,7 -8652,7 +8725,7 @@@ F:      drivers/input/input-mt.
   K:    \b(ABS|SYN)_MT_
   
   INSIDE SECURE CRYPTO DRIVER
- -M:    Antoine Tenart <a[email protected]>
+ +M:    Antoine Tenart <a[email protected]>
   L:    [email protected]
   S:    Maintained
   F:    drivers/crypto/inside-secure/
@@@ -8805,8 -8731,7 +8804,8 @@@ F:      include/drm/i915
   F:    include/uapi/drm/i915_drm.h
   
   INTEL ETHERNET DRIVERS
- -M:    Jeff Kirsher <[email protected]>
+ +M:    Jesse Brandeburg <[email protected]>
+ +M:    Tony Nguyen <[email protected]>
   L:    [email protected] (moderated for non-subscribers)
   S:    Supported
   W:    http://www.intel.com/support/feedback.htm
@@@ -8905,7 -8830,7 +8904,7 @@@ INTEL IPU3 CSI-2 CIO2 DRIVE
   M:    Yong Zhi <[email protected]>
   M:    Sakari Ailus <[email protected]>
   M:    Bingbu Cao <[email protected]>
- -R:    Tian Shu Qiu <[email protected]>
+ +R:    Tianshu Qiu <[email protected]>
   L:    [email protected]
   S:    Maintained
   F:    Documentation/userspace-api/media/v4l/pixfmt-srggb10-ipu3.rst
@@@ -8914,7 -8839,7 +8913,7 @@@ F:      drivers/media/pci/intel/ipu3
   INTEL IPU3 CSI-2 IMGU DRIVER
   M:    Sakari Ailus <[email protected]>
   R:    Bingbu Cao <[email protected]>
- -R:    Tian Shu Qiu <[email protected]>
+ +R:    Tianshu Qiu <[email protected]>
   L:    [email protected]
   S:    Maintained
   F:    Documentation/admin-guide/media/ipu3.rst
@@@ -8979,8 -8904,8 +8978,8 @@@ F:      arch/x86/include/asm/intel_punit_ipc
   F:    drivers/platform/x86/intel_punit_ipc.c
   
   INTEL PMC CORE DRIVER
- -M:    Rajneesh Bhardwaj <rajneesh.bhardwaj@intel.com>
- -M:    Vishwanath Somayaji <vishwanath.somayaji@intel.com>
+ +M:    Rajneesh Bhardwaj <irenic.rajneesh@gmail.com>
+ +M:    David E Box <david.e.box@intel.com>
   L:    [email protected]
   S:    Maintained
   F:    drivers/platform/x86/intel_pmc_core*
@@@ -8993,7 -8918,7 +8992,7 @@@ F:      drivers/gpio/gpio-*cove.
   F:    drivers/gpio/gpio-msic.c
   
   INTEL PMIC MULTIFUNCTION DEVICE DRIVERS
- -R:    Andy Shevchenko <[email protected]>
+ +M:    Andy Shevchenko <[email protected]>
   S:    Maintained
   F:    drivers/mfd/intel_msic.c
   F:    drivers/mfd/intel_soc_pmic*
@@@ -9174,7 -9099,6 +9173,7 @@@ L:      [email protected]
   S:    Maintained
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git
   F:    Documentation/devicetree/bindings/iommu/
+ +F:    Documentation/userspace-api/iommu.rst
   F:    drivers/iommu/
   F:    include/linux/iommu.h
   F:    include/linux/iova.h
@@@ -9301,7 -9225,7 +9300,7 @@@ F:      drivers/firmware/iscsi_ibft
   
   ISCSI EXTENSIONS FOR RDMA (ISER) INITIATOR
   M:    Sagi Grimberg <[email protected]>
- -M:    Max Gurtovoy <maxg@mellanox.com>
+ +M:    Max Gurtovoy <mgurtovoy@nvidia.com>
   L:    [email protected]
   S:    Supported
   W:    http://www.openfabrics.org
@@@ -9708,7 -9632,7 +9707,7 @@@ F:      security/keys/encrypted-keys
   
   KEYS-TRUSTED
   M:    James Bottomley <[email protected]>
- -M:    Jarkko Sakkinen <jarkko[email protected]>
+ +M:    Jarkko Sakkinen <jarkko@kernel.org>
   M:    Mimi Zohar <[email protected]>
   L:    [email protected]
   L:    [email protected]
@@@ -9720,7 -9644,7 +9719,7 @@@ F:      security/keys/trusted-keys
   
   KEYS/KEYRINGS
   M:    David Howells <[email protected]>
- -M:    Jarkko Sakkinen <jarkko[email protected]>
+ +M:    Jarkko Sakkinen <jarkko@kernel.org>
   L:    [email protected]
   S:    Maintained
   F:    Documentation/security/keys/core.rst
@@@ -9767,8 -9691,8 +9766,8 @@@ M:      Catalin Marinas <catalin.marinas@arm
   S:    Maintained
   F:    Documentation/dev-tools/kmemleak.rst
   F:    include/linux/kmemleak.h
- -F:    mm/kmemleak-test.c
   F:    mm/kmemleak.c
+ +F:    samples/kmemleak/kmemleak-test.c
   
   KMOD KERNEL MODULE LOADER - USERMODE HELPER
   M:    Luis Chamberlain <[email protected]>
@@@ -9797,12 -9721,6 +9796,12 @@@ F:    Documentation/admin-guide/auxdisplay
   F:    drivers/auxdisplay/ks0108.c
   F:    include/linux/ks0108.h
   
+ +KTD253 BACKLIGHT DRIVER
+ +M:    Linus Walleij <[email protected]>
+ +S:    Maintained
+ +F:    Documentation/devicetree/bindings/leds/backlight/kinetic,ktd253.yaml
+ +F:    drivers/video/backlight/ktd253-backlight.c
+ +
   L3MDEV
   M:    David Ahern <[email protected]>
   L:    [email protected]
@@@ -9856,8 -9774,8 +9855,8 @@@ F:      drivers/scsi/53c700
   
   LEAKING_ADDRESSES
   M:    Tobin C. Harding <[email protected]>
- -M:    Tycho Andersen <tycho@tycho.ws>
- -L:    [email protected]
+ +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
   F:    scripts/leaking_addresses.pl
@@@ -9928,6 -9846,15 +9927,6 @@@ T:     git git://git.kernel.org/pub/scm/lin
   F:    drivers/ata/pata_arasan_cf.c
   F:    include/linux/pata_arasan_cf_data.h
   
- -LIBATA PATA DRIVERS
- -M:    Bartlomiej Zolnierkiewicz <[email protected]>
- -M:    Jens Axboe <[email protected]>
- -L:    [email protected]
- -S:    Maintained
- -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git
- -F:    drivers/ata/ata_generic.c
- -F:    drivers/ata/pata_*.c
- -
   LIBATA PATA FARADAY FTIDE010 AND GEMINI SATA BRIDGE DRIVERS
   M:    Linus Walleij <[email protected]>
   L:    [email protected]
@@@ -10353,13 -10280,6 +10352,13 @@@ S: Maintaine
   W:    http://linux-test-project.github.io/
   T:    git git://github.com/linux-test-project/ltp.git
   
+ +LYNX PCS MODULE
+ +M:    Ioana Ciornei <[email protected]>
+ +L:    [email protected]
+ +S:    Supported
+ +F:    drivers/net/pcs/pcs-lynx.c
+ +F:    include/linux/pcs-lynx.h
+ +
   M68K ARCHITECTURE
   M:    Geert Uytterhoeven <[email protected]>
   L:    [email protected]
@@@ -10567,7 -10487,7 +10566,7 @@@ M:   Tobias Waldekranz <tobias@waldekranz
   L:    [email protected]
   S:    Maintained
   F:    Documentation/devicetree/bindings/net/marvell,mvusb.yaml
- -F:    drivers/net/phy/mdio-mvusb.c
+ +F:    drivers/net/mdio/mdio-mvusb.c
   
   MARVELL XENON MMC/SD/SDIO HOST CONTROLLER DRIVER
   M:    Hu Ziji <[email protected]>
@@@ -10714,15 -10634,6 +10713,15 @@@ L: [email protected]
   S:    Maintained
   F:    drivers/hid/hid-mcp2221.c
   
+ +MCP251XFD SPI-CAN NETWORK DRIVER
+ +M:    Marc Kleine-Budde <[email protected]>
+ +M:    Manivannan Sadhasivam <[email protected]>
+ +R:    Thomas Kopp <[email protected]>
+ +L:    [email protected]
+ +S:    Maintained
+ +F:    Documentation/devicetree/bindings/net/can/microchip,mcp251xfd.yaml
+ +F:    drivers/net/can/spi/mcp251xfd/
+ +
   MCP4018 AND MCP4531 MICROCHIP DIGITAL POTENTIOMETER DRIVERS
   M:    Peter Rosin <[email protected]>
   L:    [email protected]
@@@ -11105,7 -11016,6 +11104,7 @@@ F:   drivers/char/hw_random/mtk-rng.
   
   MEDIATEK SWITCH DRIVER
   M:    Sean Wang <[email protected]>
+ +M:    Landen Chao <[email protected]>
   L:    [email protected]
   S:    Maintained
   F:    drivers/net/dsa/mt7530.*
@@@ -11113,7 -11023,7 +11112,7 @@@ F:   net/dsa/tag_mtk.
   
   MEDIATEK USB3 DRD IP DRIVER
   M:    Chunfeng Yun <[email protected]>
- -L:    [email protected] (moderated for non-subscribers)
+ +L:    [email protected]
   L:    [email protected] (moderated for non-subscribers)
   L:    [email protected] (moderated for non-subscribers)
   S:    Maintained
@@@ -11161,7 -11071,7 +11160,7 @@@ F:   Documentation/devicetree/bindings/in
   F:    drivers/input/touchscreen/melfas_mip4.c
   
   MELLANOX ETHERNET DRIVER (mlx4_en)
- -M:    Tariq Toukan <tariqt@mellanox.com>
+ +M:    Tariq Toukan <tariqt@nvidia.com>
   L:    [email protected]
   S:    Supported
   W:    http://www.mellanox.com
@@@ -11169,7 -11079,7 +11168,7 @@@ Q:   http://patchwork.ozlabs.org/project/
   F:    drivers/net/ethernet/mellanox/mlx4/en_*
   
   MELLANOX ETHERNET DRIVER (mlx5e)
- -M:    Saeed Mahameed <saeedm@mellanox.com>
+ +M:    Saeed Mahameed <saeedm@nvidia.com>
   L:    [email protected]
   S:    Supported
   W:    http://www.mellanox.com
@@@ -11177,7 -11087,7 +11176,7 @@@ Q:   http://patchwork.ozlabs.org/project/
   F:    drivers/net/ethernet/mellanox/mlx5/core/en_*
   
   MELLANOX ETHERNET INNOVA DRIVERS
- -R:    Boris Pismenny <borisp@mellanox.com>
+ +R:    Boris Pismenny <borisp@nvidia.com>
   L:    [email protected]
   S:    Supported
   W:    http://www.mellanox.com
@@@ -11188,8 -11098,8 +11187,8 @@@ F:   drivers/net/ethernet/mellanox/mlx5/c
   F:    include/linux/mlx5/mlx5_ifc_fpga.h
   
   MELLANOX ETHERNET SWITCH DRIVERS
- -M:    Jiri Pirko <jiri@mellanox.com>
- -M:    Ido Schimmel <idosch@mellanox.com>
+ +M:    Jiri Pirko <jiri@nvidia.com>
+ +M:    Ido Schimmel <idosch@nvidia.com>
   L:    [email protected]
   S:    Supported
   W:    http://www.mellanox.com
@@@ -11198,7 -11108,7 +11197,7 @@@ F:   drivers/net/ethernet/mellanox/mlxsw
   F:    tools/testing/selftests/drivers/net/mlxsw/
   
   MELLANOX FIRMWARE FLASH LIBRARY (mlxfw)
- -M:    mlxsw@mellanox.com
+ +M:    mlxsw@nvidia.com
   L:    [email protected]
   S:    Supported
   W:    http://www.mellanox.com
@@@ -11208,7 -11118,7 +11207,7 @@@ F:   drivers/net/ethernet/mellanox/mlxfw
   MELLANOX HARDWARE PLATFORM SUPPORT
   M:    Andy Shevchenko <[email protected]>
   M:    Darren Hart <[email protected]>
- -M:    Vadim Pasternak <vadimp@mellanox.com>
+ +M:    Vadim Pasternak <vadimp@nvidia.com>
   L:    [email protected]
   S:    Supported
   F:    Documentation/ABI/testing/sysfs-platform-mellanox-bootctl
@@@ -11216,7 -11126,7 +11215,7 @@@ F:   drivers/platform/mellanox
   F:    include/linux/platform_data/mlxreg.h
   
   MELLANOX MLX4 core VPI driver
- -M:    Tariq Toukan <tariqt@mellanox.com>
+ +M:    Tariq Toukan <tariqt@nvidia.com>
   L:    [email protected]
   L:    [email protected]
   S:    Supported
@@@ -11226,7 -11136,7 +11225,7 @@@ F:   drivers/net/ethernet/mellanox/mlx4
   F:    include/linux/mlx4/
   
   MELLANOX MLX4 IB driver
- -M:    Yishai Hadas <yishaih@mellanox.com>
+ +M:    Yishai Hadas <yishaih@nvidia.com>
   L:    [email protected]
   S:    Supported
   W:    http://www.mellanox.com
@@@ -11236,8 -11146,8 +11235,8 @@@ F:   include/linux/mlx4
   F:    include/uapi/rdma/mlx4-abi.h
   
   MELLANOX MLX5 core VPI driver
- -M:    Saeed Mahameed <saeedm@mellanox.com>
- -M:    Leon Romanovsky <leonro@mellanox.com>
+ +M:    Saeed Mahameed <saeedm@nvidia.com>
+ +M:    Leon Romanovsky <leonro@nvidia.com>
   L:    [email protected]
   L:    [email protected]
   S:    Supported
@@@ -11248,7 -11158,7 +11247,7 @@@ F:   drivers/net/ethernet/mellanox/mlx5/c
   F:    include/linux/mlx5/
   
   MELLANOX MLX5 IB driver
- -M:    Leon Romanovsky <leonro@mellanox.com>
+ +M:    Leon Romanovsky <leonro@nvidia.com>
   L:    [email protected]
   S:    Supported
   W:    http://www.mellanox.com
@@@ -11258,8 -11168,8 +11257,8 @@@ F:   include/linux/mlx5
   F:    include/uapi/rdma/mlx5-abi.h
   
   MELLANOX MLXCPLD I2C AND MUX DRIVER
- -M:    Vadim Pasternak <vadimp@mellanox.com>
- -M:    Michael Shych <michaelsh@mellanox.com>
+ +M:    Vadim Pasternak <vadimp@nvidia.com>
+ +M:    Michael Shych <michaelsh@nvidia.com>
   L:    [email protected]
   S:    Supported
   F:    Documentation/i2c/busses/i2c-mlxcpld.rst
@@@ -11267,7 -11177,7 +11266,7 @@@ F:   drivers/i2c/busses/i2c-mlxcpld.
   F:    drivers/i2c/muxes/i2c-mux-mlxcpld.c
   
   MELLANOX MLXCPLD LED DRIVER
- -M:    Vadim Pasternak <vadimp@mellanox.com>
+ +M:    Vadim Pasternak <vadimp@nvidia.com>
   L:    [email protected]
   S:    Supported
   F:    Documentation/leds/leds-mlxcpld.rst
@@@ -11275,7 -11185,7 +11274,7 @@@ F:   drivers/leds/leds-mlxcpld.
   F:    drivers/leds/leds-mlxreg.c
   
   MELLANOX PLATFORM DRIVER
- -M:    Vadim Pasternak <vadimp@mellanox.com>
+ +M:    Vadim Pasternak <vadimp@nvidia.com>
   L:    [email protected]
   S:    Supported
   F:    drivers/platform/x86/mlx-platform.c
@@@ -11381,8 -11291,8 +11380,8 @@@ S:   Supporte
   W:    http://linux-meson.com/
   T:    git git://linuxtv.org/media_tree.git
   F:    Documentation/devicetree/bindings/media/amlogic,meson-gx-ao-cec.yaml
- -F:    drivers/media/platform/meson/ao-cec-g12a.c
- -F:    drivers/media/platform/meson/ao-cec.c
+ +F:    drivers/media/cec/platform/meson/ao-cec-g12a.c
+ +F:    drivers/media/cec/platform/meson/ao-cec.c
   
   MESON NAND CONTROLLER DRIVER FOR AMLOGIC SOCS
   M:    Liang Yang <[email protected]>
@@@ -11392,6 -11302,7 +11391,6 @@@ F:   Documentation/devicetree/bindings/mt
   F:    drivers/mtd/nand/raw/meson_*
   
   MESON VIDEO DECODER DRIVER FOR AMLOGIC SOCS
- -M:    Maxime Jourdan <[email protected]>
   M:    Neil Armstrong <[email protected]>
   L:    [email protected]
   L:    [email protected]
@@@ -11411,7 -11322,6 +11410,7 @@@ M:   Hemant Kumar <[email protected]
   L:    [email protected]
   S:    Maintained
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git
+ +F:    Documentation/ABI/stable/sysfs-bus-mhi
   F:    Documentation/mhi/
   F:    drivers/bus/mhi/
   F:    include/linux/mhi.h
@@@ -11605,13 -11515,14 +11604,14 @@@ M:        Microchip Linux Driver Support <UNGL
   L:    [email protected]
   S:    Supported
   F:    Documentation/devicetree/bindings/mips/mscc.txt
+ F:    Documentation/devicetree/bindings/power/reset/ocelot-reset.txt
   F:    arch/mips/boot/dts/mscc/
   F:    arch/mips/configs/generic/board-ocelot.config
   F:    arch/mips/generic/board-ocelot.c
   
   MICROSEMI SMART ARRAY SMARTPQI DRIVER (smartpqi)
- -M:    Don Brace <don.brace@microsemi.com>
- -L:    esc.storagedev@microsemi.com
+ +M:    Don Brace <don.brace@microchip.com>
+ +L:    storagedev@microchip.com
   L:    [email protected]
   S:    Supported
   F:    Documentation/scsi/smartpqi.rst
@@@ -11669,7 -11580,7 +11669,7 @@@ MIPS GENERIC PLATFOR
   M:    Paul Burton <[email protected]>
   L:    [email protected]
   S:    Supported
- -F:    Documentation/devicetree/bindings/power/mti,mips-cpc.txt
+ +F:    Documentation/devicetree/bindings/power/mti,mips-cpc.yaml
   F:    arch/mips/generic/
   F:    arch/mips/tools/generic-board-config.sh
   
@@@ -11725,7 -11636,7 +11725,7 @@@ S:   Odd Fixe
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lkundrak/linux-mmp.git
   F:    arch/arm/boot/dts/mmp*
   F:    arch/arm/mach-mmp/
- -F:    linux/soc/mmp/
+ +F:    include/linux/soc/mmp/
   
   MMP USB PHY DRIVERS
   R:    Lubomir Rintel <[email protected]>
@@@ -11843,13 -11754,6 +11843,13 @@@ Q: http://patchwork.linuxtv.org/project
   T:    git git://linuxtv.org/anttip/media_tree.git
   F:    drivers/media/usb/msi2500/
   
+ +MSTAR INTERRUPT CONTROLLER DRIVER
+ +M:    Mark-PK Tsai <[email protected]>
+ +M:    Daniel Palmer <[email protected]>
+ +S:    Maintained
+ +F:    Documentation/devicetree/bindings/interrupt-controller/mstar,mst-intc.yaml
+ +F:    drivers/irqchip/irq-mst-intc.c
+ +
   MSYSTEMS DISKONCHIP G3 MTD DRIVER
   M:    Robert Jarzmik <[email protected]>
   L:    [email protected]
@@@ -12112,6 -12016,7 +12112,6 @@@ M:   Neil Horman <[email protected]
   L:    [email protected]
   S:    Maintained
   W:    https://fedorahosted.org/dropwatch/
- -F:    include/net/drop_monitor.h
   F:    include/uapi/linux/net_dropmon.h
   F:    net/core/drop_monitor.c
   
@@@ -12125,7 -12030,6 +12125,7 @@@ Q:   http://patchwork.ozlabs.org/project/
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git
   F:    Documentation/devicetree/bindings/net/
+ +F:    drivers/connector/
   F:    drivers/net/
   F:    include/linux/etherdevice.h
   F:    include/linux/fcdevice.h
@@@ -12151,7 -12055,6 +12151,7 @@@ NETWORKING [DSA
   M:    Andrew Lunn <[email protected]>
   M:    Vivien Didelot <[email protected]>
   M:    Florian Fainelli <[email protected]>
+ +M:    Vladimir Oltean <[email protected]>
   S:    Maintained
   F:    Documentation/devicetree/bindings/net/dsa/
   F:    drivers/net/dsa/
@@@ -12206,7 -12109,6 +12206,7 @@@ F:   net/ipv6/ipcomp6.
   F:    net/ipv6/xfrm*
   F:    net/key/
   F:    net/xfrm/
+ +F:    tools/testing/selftests/net/ipsec.c
   
   NETWORKING [IPv4/IPv6]
   M:    "David S. Miller" <[email protected]>
@@@ -12265,8 -12167,8 +12265,8 @@@ F:   net/ipv6/syncookies.
   F:    net/ipv6/tcp*.c
   
   NETWORKING [TLS]
- -M:    Boris Pismenny <borisp@mellanox.com>
- -M:    Aviad Yehezkel <aviadye@mellanox.com>
+ +M:    Boris Pismenny <borisp@nvidia.com>
+ +M:    Aviad Yehezkel <aviadye@nvidia.com>
   M:    John Fastabend <[email protected]>
   M:    Daniel Borkmann <[email protected]>
   M:    Jakub Kicinski <[email protected]>
@@@ -12366,19 -12268,6 +12366,19 @@@ S: Maintaine
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git
   F:    arch/nios2/
   
+ +NITRO ENCLAVES (NE)
+ +M:    Andra Paraschiv <[email protected]>
+ +M:    Alexandru Vasile <[email protected]>
+ +M:    Alexandru Ciobotaru <[email protected]>
+ +L:    [email protected]
+ +S:    Supported
+ +W:    https://aws.amazon.com/ec2/nitro/nitro-enclaves/
+ +F:    Documentation/virt/ne_overview.rst
+ +F:    drivers/virt/nitro_enclaves/
+ +F:    include/linux/nitro_enclaves.h
+ +F:    include/uapi/linux/nitro_enclaves.h
+ +F:    samples/nitro_enclaves/
+ +
   NOHZ, DYNTICKS SUPPORT
   M:    Frederic Weisbecker <[email protected]>
   M:    Thomas Gleixner <[email protected]>
@@@ -12541,26 -12430,11 +12541,26 @@@ F:        drivers/iio/gyro/fxas21002c_core.
   F:    drivers/iio/gyro/fxas21002c_i2c.c
   F:    drivers/iio/gyro/fxas21002c_spi.c
   
+ +NXP i.MX 8MQ DCSS DRIVER
+ +M:    Laurentiu Palcu <[email protected]>
+ +R:    Lucas Stach <[email protected]>
+ +L:    [email protected]
+ +S:    Maintained
+ +F:    Documentation/devicetree/bindings/display/imx/nxp,imx8mq-dcss.yaml
+ +F:    drivers/gpu/drm/imx/dcss/
+ +
+ +NXP PTN5150A CC LOGIC AND EXTCON DRIVER
+ +M:    Krzysztof Kozlowski <[email protected]>
+ +L:    [email protected]
+ +S:    Maintained
+ +F:    Documentation/devicetree/bindings/extcon/extcon-ptn5150.yaml
+ +F:    drivers/extcon/extcon-ptn5150.c
+ +
   NXP SGTL5000 DRIVER
   M:    Fabio Estevam <[email protected]>
   L:    [email protected] (moderated for non-subscribers)
   S:    Maintained
- -F:    Documentation/devicetree/bindings/sound/sgtl5000.txt
+ +F:    Documentation/devicetree/bindings/sound/sgtl5000.yaml
   F:    sound/soc/codecs/sgtl5000*
   
   NXP SJA1105 ETHERNET SWITCH DRIVER
@@@ -12594,7 -12468,7 +12594,7 @@@ S:   Supporte
   F:    drivers/nfc/nxp-nci
   
   OBJAGG
- -M:    Jiri Pirko <jiri@mellanox.com>
+ +M:    Jiri Pirko <jiri@nvidia.com>
   L:    [email protected]
   S:    Supported
   F:    include/linux/objagg.h
@@@ -12606,7 -12480,6 +12606,7 @@@ M:   Josh Poimboeuf <[email protected]
   M:    Peter Zijlstra <[email protected]>
   S:    Supported
   F:    tools/objtool/
+ +F:    include/linux/objtool.h
   
   OCELOT ETHERNET SWITCH DRIVER
   M:    Microchip Linux Driver Support <[email protected]>
@@@ -12619,7 -12492,6 +12619,7 @@@ F:   drivers/net/dsa/ocelot/
   F:    drivers/net/ethernet/mscc/
   F:    include/soc/mscc/ocelot*
   F:    net/dsa/tag_ocelot.c
+ +F:    tools/testing/selftests/drivers/net/ocelot/*
   
   OCXL (Open Coherent Accelerator Processor Interface OpenCAPI) DRIVER
   M:    Frederic Barrat <[email protected]>
@@@ -12869,7 -12741,7 +12869,7 @@@ T:   git git://linuxtv.org/media_tree.gi
   F:    drivers/media/i2c/ov2685.c
   
   OMNIVISION OV2740 SENSOR DRIVER
- -M:    Tianshu Qiu <tian.shu.qiua@intel.com>
+ +M:    Tianshu Qiu <[email protected]>
   R:    Shawn Tu <[email protected]>
   R:    Bingbu Cao <[email protected]>
   L:    [email protected]
@@@ -12885,12 -12757,10 +12885,12 @@@ T:        git git://linuxtv.org/media_tree.gi
   F:    drivers/media/i2c/ov5640.c
   
   OMNIVISION OV5647 SENSOR DRIVER
- -M:    Luis Oliveira <[email protected]>
+ +M:    Dave Stevenson <[email protected]>
+ +M:    Jacopo Mondi <[email protected]>
   L:    [email protected]
   S:    Maintained
   T:    git git://linuxtv.org/media_tree.git
+ +F:    Documentation/devicetree/bindings/media/i2c/ov5647.yaml
   F:    drivers/media/i2c/ov5647.c
   
   OMNIVISION OV5670 SENSOR DRIVER
@@@ -12991,8 -12861,8 +12991,8 @@@ S:   Maintaine
   F:    drivers/char/hw_random/optee-rng.c
   
   OPA-VNIC DRIVER
- -M:    Dennis Dalessandro <dennis.dalessandro@intel.com>
- -M:    Niranjana Vishwanathapura <niranjana.vishwanathapura@intel.com>
+ +M:    Dennis Dalessandro <dennis.dalessandro@cornelisnetworks.com>
+ +M:    Mike Marciniszyn <mike.marciniszyn@cornelisnetworks.com>
   L:    [email protected]
   S:    Supported
   F:    drivers/infiniband/ulp/opa_vnic
@@@ -13153,9 -13023,7 +13153,9 @@@ F:   lib/packing.
   
   PADATA PARALLEL EXECUTION MECHANISM
   M:    Steffen Klassert <[email protected]>
+ +M:    Daniel Jordan <[email protected]>
   L:    [email protected]
+ +L:    [email protected]
   S:    Maintained
   F:    Documentation/core-api/padata.rst
   F:    include/linux/padata.h
@@@ -13242,7 -13110,7 +13242,7 @@@ F:   drivers/video/logo/logo_parisc
   F:    include/linux/hp_sdc.h
   
   PARMAN
- -M:    Jiri Pirko <jiri@mellanox.com>
+ +M:    Jiri Pirko <jiri@nvidia.com>
   L:    [email protected]
   S:    Supported
   F:    include/linux/parman.h
@@@ -13292,7 -13160,6 +13292,7 @@@ F:   drivers/firmware/pcdp.
   
   PCI DRIVER FOR AARDVARK (Marvell Armada 3700)
   M:    Thomas Petazzoni <[email protected]>
+ +M:    Pali Rohár <[email protected]>
   L:    [email protected]
   L:    [email protected] (moderated for non-subscribers)
   S:    Maintained
@@@ -13562,10 -13429,10 +13562,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
@@@ -13702,18 -13569,12 +13702,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]>
@@@ -13827,9 -13688,10 +13827,9 @@@ PIN CONTROLLER - RENESA
   M:    Geert Uytterhoeven <[email protected]>
   L:    [email protected]
   S:    Supported
- -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git sh-pfc
+ +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git renesas-pinctrl
   F:    Documentation/devicetree/bindings/pinctrl/renesas,*
- -F:    drivers/pinctrl/pinctrl-rz*
- -F:    drivers/pinctrl/sh-pfc/
+ +F:    drivers/pinctrl/renesas/
   
   PIN CONTROLLER - SAMSUNG
   M:    Tomasz Figa <[email protected]>
@@@ -14062,7 -13924,6 +14062,7 @@@ PRINT
   M:    Petr Mladek <[email protected]>
   M:    Sergey Senozhatsky <[email protected]>
   R:    Steven Rostedt <[email protected]>
+ +R:    John Ogness <[email protected]>
   S:    Maintained
   F:    include/linux/printk.h
   F:    kernel/printk/
@@@ -14293,24 -14154,20 +14293,24 @@@ F:        drivers/firmware/qemu_fw_cfg.
   F:    include/uapi/linux/qemu_fw_cfg.h
   
   QIB DRIVER
- -M:    Dennis Dalessandro <dennis.dalessandro@intel.com>
- -M:    Mike Marciniszyn <mike.marciniszyn@intel.com>
+ +M:    Dennis Dalessandro <dennis.dalessandro@cornelisnetworks.com>
+ +M:    Mike Marciniszyn <mike.marciniszyn@cornelisnetworks.com>
   L:    [email protected]
   S:    Supported
   F:    drivers/infiniband/hw/qib/
   
   QLOGIC QL41xxx FCOE DRIVER
- -M:    [email protected]
+ +M:    Saurav Kashyap <[email protected]>
+ +M:    Javed Hasan <[email protected]>
+ +M:    [email protected]
   L:    [email protected]
   S:    Supported
   F:    drivers/scsi/qedf/
   
   QLOGIC QL41xxx ISCSI DRIVER
- -M:    [email protected]
+ +M:    Nilesh Javali <[email protected]>
+ +M:    Manish Rangankar <[email protected]>
+ +M:    [email protected]
   L:    [email protected]
   S:    Supported
   F:    drivers/scsi/qedi/
@@@ -14343,20 -14200,21 +14343,20 @@@ M:        Nilesh Javali <[email protected]
   M:    [email protected]
   L:    [email protected]
   S:    Supported
- -F:    Documentation/scsi/LICENSE.qla2xxx
   F:    drivers/scsi/qla2xxx/
   
   QLOGIC QLA3XXX NETWORK DRIVER
   M:    [email protected]
   L:    [email protected]
   S:    Supported
- -F:    Documentation/networking/device_drivers/ethernet/qlogic/LICENSE.qla3xxx
   F:    drivers/net/ethernet/qlogic/qla3xxx.*
   
   QLOGIC QLA4XXX iSCSI DRIVER
- -M:    [email protected]
+ +M:    Nilesh Javali <[email protected]>
+ +M:    Manish Rangankar <[email protected]>
+ +M:    [email protected]
   L:    [email protected]
   S:    Supported
- -F:    Documentation/scsi/LICENSE.qla4xxx
   F:    drivers/scsi/qla4xxx/
   
   QLOGIC QLCNIC (1/10)Gb ETHERNET DRIVER
@@@ -14507,7 -14365,7 +14507,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]>
@@@ -14704,9 -14562,9 +14704,9 @@@ M:   Niklas Söderlund <niklas.soderlund+
   L:    [email protected]
   S:    Maintained
   F:    Documentation/devicetree/bindings/media/i2c/imi,rdacm2x-gmsl.yaml
- -F:    drivers/media/i2c/rdacm20.c
   F:    drivers/media/i2c/max9271.c
   F:    drivers/media/i2c/max9271.h
+ +F:    drivers/media/i2c/rdacm20.c
   
   RDC R-321X SoC
   M:    Florian Fainelli <[email protected]>
@@@ -14719,8 -14577,8 +14719,8 @@@ S:   Maintaine
   F:    drivers/net/ethernet/rdc/r6040.c
   
   RDMAVT - RDMA verbs software
- -M:    Dennis Dalessandro <dennis.dalessandro@intel.com>
- -M:    Mike Marciniszyn <mike.marciniszyn@intel.com>
+ +M:    Dennis Dalessandro <dennis.dalessandro@cornelisnetworks.com>
+ +M:    Mike Marciniszyn <mike.marciniszyn@cornelisnetworks.com>
   L:    [email protected]
   S:    Supported
   F:    drivers/infiniband/sw/rdmavt
@@@ -15000,11 -14858,8 +15000,11 @@@ F: include/linux/hid-roccat
   
   ROCKCHIP ISP V1 DRIVER
   M:    Helen Koike <[email protected]>
+ +M:    Dafna Hirschfeld <[email protected]>
   L:    [email protected]
   S:    Maintained
+ +F:    Documentation/admin-guide/media/rkisp1.rst
+ +F:    Documentation/userspace-api/media/v4l/pixfmt-meta-rkisp1.rst
   F:    drivers/staging/media/rkisp1/
   
   ROCKCHIP RASTER 2D GRAPHIC ACCELERATION UNIT DRIVER
@@@ -15395,11 -15250,10 +15395,11 @@@ F:        drivers/media/platform/s3c-camif
   F:    include/media/drv-intf/s3c_camif.h
   
   SAMSUNG S3FWRN5 NFC DRIVER
- -M:    Robert Baldyga <[email protected]>
+ +M:    Krzysztof Kozlowski <[email protected]>
   M:    Krzysztof Opasiak <[email protected]>
   L:    [email protected] (moderated for non-subscribers)
- -S:    Supported
+ +S:    Maintained
+ +F:    Documentation/devicetree/bindings/net/nfc/samsung,s3fwrn5.yaml
   F:    drivers/nfc/s3fwrn5
   
   SAMSUNG S5C73M3 CAMERA DRIVER
@@@ -15501,7 -15355,6 +15501,7 @@@ R:   Dietmar Eggemann <dietmar.eggemann@a
   R:    Steven Rostedt <[email protected]> (SCHED_FIFO/SCHED_RR)
   R:    Ben Segall <[email protected]> (CONFIG_CFS_BANDWIDTH)
   R:    Mel Gorman <[email protected]> (CONFIG_NUMA_BALANCING)
+ +R:    Daniel Bristot de Oliveira <[email protected]> (SCHED_DEADLINE)
   L:    [email protected]
   S:    Maintained
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git sched/core
@@@ -15623,8 -15476,8 +15623,8 @@@ F:   drivers/mmc/host/sdricoh_cs.
   SECO BOARDS CEC DRIVER
   M:    Ettore Chimenti <[email protected]>
   S:    Maintained
- -F:    drivers/media/platform/seco-cec/seco-cec.c
- -F:    drivers/media/platform/seco-cec/seco-cec.h
+ +F:    drivers/media/cec/platform/seco/seco-cec.c
+ +F:    drivers/media/cec/platform/seco/seco-cec.h
   
   SECURE COMPUTING
   M:    Kees Cook <[email protected]>
@@@ -15693,7 -15546,6 +15693,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]>
@@@ -15717,7 -15569,6 +15717,7 @@@ T:   git git://git.kernel.org/pub/scm/lin
   F:    Documentation/ABI/obsolete/sysfs-selinux-checkreqprot
   F:    Documentation/ABI/obsolete/sysfs-selinux-disable
   F:    Documentation/admin-guide/LSM/SELinux.rst
+ +F:    include/trace/events/avc.h
   F:    include/uapi/linux/selinux_netlink.h
   F:    scripts/selinux/
   F:    security/selinux/
@@@ -15786,7 -15637,6 +15786,7 @@@ L:   [email protected]
   S:    Maintained
   F:    drivers/net/phy/phylink.c
   F:    drivers/net/phy/sfp*
+ +F:    include/linux/mdio/mdio-i2c.h
   F:    include/linux/phylink.h
   F:    include/linux/sfp.h
   K:    phylink\.h|struct\s+phylink|\.phylink|>phylink_|phylink_(autoneg|clear|connect|create|destroy|disconnect|ethtool|helper|mac|mii|of|set|start|stop|test|validate)
@@@ -16184,7 -16034,7 +16184,7 @@@ F:   drivers/infiniband/sw/siw
   F:    include/uapi/rdma/siw-abi.h
   
   SOFT-ROCE DRIVER (rxe)
- -M:    Zhu Yanjun <yanjunz@mellanox.com>
+ +M:    Zhu Yanjun <yanjunz@nvidia.com>
   L:    [email protected]
   S:    Supported
   F:    drivers/infiniband/sw/rxe/
@@@ -16193,6 -16043,7 +16193,6 @@@ F:   include/uapi/rdma/rdma_user_rxe.
   SOFTLOGIC 6x10 MPEG CODEC
   M:    Bluecherry Maintainers <[email protected]>
   M:    Anton Sviridenko <[email protected]>
- -M:    Andrey Utkin <[email protected]>
   M:    Andrey Utkin <[email protected]>
   M:    Ismael Luceno <[email protected]>
   L:    [email protected]
@@@ -16274,7 -16125,7 +16274,7 @@@ M:   Leon Luo <[email protected]
   L:    [email protected]
   S:    Maintained
   T:    git git://linuxtv.org/media_tree.git
- -F:    Documentation/devicetree/bindings/media/i2c/imx274.txt
+ +F:    Documentation/devicetree/bindings/media/i2c/sony,imx274.yaml
   F:    drivers/media/i2c/imx274.c
   
   SONY IMX290 SENSOR DRIVER
@@@ -16612,6 -16463,7 +16612,6 @@@ F:   drivers/staging/rtl8712
   
   STAGING - SEPS525 LCD CONTROLLER DRIVERS
   M:    Michael Hennerich <[email protected]>
- -M:    Beniamin Bia <[email protected]>
   L:    [email protected]
   S:    Supported
   F:    Documentation/devicetree/bindings/iio/adc/adi,ad7606.yaml
@@@ -16659,7 -16511,7 +16659,7 @@@ STI CEC DRIVE
   M:    Benjamin Gaignard <[email protected]>
   S:    Maintained
   F:    Documentation/devicetree/bindings/media/stih-cec.txt
- -F:    drivers/media/platform/sti/cec/
+ +F:    drivers/media/cec/platform/sti/
   
   STK1160 USB VIDEO CAPTURE DRIVER
   M:    Ezequiel Garcia <[email protected]>
@@@ -16843,13 -16695,6 +16843,13 @@@ S: Maintaine
   F:    Documentation/devicetree/bindings/gpio/snps,dw-apb-gpio.yaml
   F:    drivers/gpio/gpio-dwapb.c
   
+ +SYNOPSYS DESIGNWARE APB SSI DRIVER
+ +M:    Serge Semin <[email protected]>
+ +L:    [email protected]
+ +S:    Supported
+ +F:    Documentation/devicetree/bindings/spi/snps,dw-apb-ssi.yaml
+ +F:    drivers/spi/spi-dw*
+ +
   SYNOPSYS DESIGNWARE AXI DMAC DRIVER
   M:    Eugeniy Paltsev <[email protected]>
   S:    Maintained
@@@ -16860,7 -16705,7 +16860,7 @@@ SYNOPSYS DESIGNWARE DMAC DRIVE
   M:    Viresh Kumar <[email protected]>
   R:    Andy Shevchenko <[email protected]>
   S:    Maintained
- -F:    Documentation/devicetree/bindings/dma/snps-dma.txt
+ +F:    Documentation/devicetree/bindings/dma/snps,dma-spear1340.yaml
   F:    drivers/dma/dw/
   F:    include/dt-bindings/dma/dw-dmac.h
   F:    include/linux/dma/dw.h
@@@ -16876,8 -16721,8 +16876,8 @@@ SYNOPSYS DESIGNWARE ETHERNET XPCS DRIVE
   M:    Jose Abreu <[email protected]>
   L:    [email protected]
   S:    Supported
- -F:    drivers/net/phy/mdio-xpcs.c
- -F:    include/linux/mdio-xpcs.h
+ +F:    drivers/net/pcs/pcs-xpcs.c
+ +F:    include/linux/pcs/pcs-xpcs.h
   
   SYNOPSYS DESIGNWARE I2C DRIVER
   M:    Jarkko Nikula <[email protected]>
@@@ -17271,8 -17116,8 +17271,8 @@@ S:   Maintaine
   F:    Documentation/devicetree/bindings/arm/keystone/ti,k3-sci-common.yaml
   F:    Documentation/devicetree/bindings/arm/keystone/ti,sci.txt
   F:    Documentation/devicetree/bindings/clock/ti,sci-clk.txt
- -F:    Documentation/devicetree/bindings/interrupt-controller/ti,sci-inta.txt
- -F:    Documentation/devicetree/bindings/interrupt-controller/ti,sci-intr.txt
+ +F:    Documentation/devicetree/bindings/interrupt-controller/ti,sci-inta.yaml
+ +F:    Documentation/devicetree/bindings/interrupt-controller/ti,sci-intr.yaml
   F:    Documentation/devicetree/bindings/reset/ti,sci-reset.txt
   F:    Documentation/devicetree/bindings/soc/ti/sci-pm-domain.txt
   F:    drivers/clk/keystone/sci-clk.c
@@@ -17369,8 -17214,8 +17369,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
@@@ -17391,7 -17236,7 +17391,7 @@@ S:   Maintaine
   F:    drivers/thermal/ti-soc-thermal/
   
   TI BQ27XXX POWER SUPPLY DRIVER
- R:    Andrew F. Davis <afd@ti.com>
+ R:    Dan Murphy <dmurphy@ti.com>
   F:    drivers/power/supply/bq27xxx_battery.c
   F:    drivers/power/supply/bq27xxx_battery_i2c.c
   F:    include/linux/power/bq27xxx_battery.h
@@@ -17665,9 -17510,8 +17665,9 @@@ S:   Supporte
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git dev
   F:    Documentation/RCU/torture.rst
   F:    kernel/locking/locktorture.c
- -F:    kernel/rcu/rcuperf.c
+ +F:    kernel/rcu/rcuscale.c
   F:    kernel/rcu/rcutorture.c
+ +F:    kernel/rcu/refscale.c
   F:    kernel/torture.c
   
   TOSHIBA ACPI EXTRAS DRIVER
@@@ -17711,13 -17555,13 +17711,13 @@@ F:        drivers/platform/x86/toshiba-wmi.
   
   TPM DEVICE DRIVER
   M:    Peter Huewe <[email protected]>
- -M:    Jarkko Sakkinen <jarkko[email protected]>
+ +M:    Jarkko Sakkinen <jarkko@kernel.org>
   R:    Jason Gunthorpe <[email protected]>
   L:    [email protected]
   S:    Maintained
   W:    https://kernsec.org/wiki/index.php/Linux_Kernel_Integrity
   Q:    https://patchwork.kernel.org/project/linux-integrity/list/
- -T:    git git://git.infradead.org/users/jjs/linux-tpmdd.git
+ +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git
   F:    drivers/char/tpm/
   
   TRACING
@@@ -17854,7 -17698,6 +17854,7 @@@ S:   Supporte
   W:    http://www.linux-mtd.infradead.org/doc/ubifs.html
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git next
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git fixes
+ +F:    Documentation/filesystems/ubifs-authentication.rst
   F:    Documentation/filesystems/ubifs.rst
   F:    fs/ubifs/
   
@@@ -18248,6 -18091,14 +18248,6 @@@ T:  git git://linuxtv.org/media_tree.gi
   F:    drivers/media/usb/uvc/
   F:    include/uapi/linux/uvcvideo.h
   
- -USB VISION DRIVER
- -M:    Hans Verkuil <[email protected]>
- -L:    [email protected]
- -S:    Odd Fixes
- -W:    https://linuxtv.org
- -T:    git git://linuxtv.org/media_tree.git
- -F:    drivers/staging/media/usbvision/
- -
   USB WEBCAM GADGET
   M:    Laurent Pinchart <[email protected]>
   L:    [email protected]
@@@ -18401,8 -18252,7 +18401,8 @@@ F:   drivers/gpu/vga/vga_switcheroo.
   F:    include/linux/vga_switcheroo.h
   
   VIA RHINE NETWORK DRIVER
- -S:    Orphan
+ +S:    Maintained
+ +M:    Kevin Brace <[email protected]>
   F:    drivers/net/ethernet/via/via-rhine.c
   
   VIA SD/MMC CARD CONTROLLER DRIVER
@@@ -18447,8 -18297,10 +18447,8 @@@ S:  Maintaine
   F:    drivers/media/platform/video-mux.c
   
   VIDEOBUF2 FRAMEWORK
- -M:    Pawel Osciak <[email protected]>
+ +M:    Tomasz Figa <[email protected]>
   M:    Marek Szyprowski <[email protected]>
- -M:    Kyungmin Park <[email protected]>
- -R:    Tomasz Figa <[email protected]>
   L:    [email protected]
   S:    Maintained
   F:    drivers/media/common/videobuf2/*
@@@ -18638,14 -18490,6 +18638,14 @@@ W: https://linuxtv.or
   T:    git git://linuxtv.org/media_tree.git
   F:    drivers/media/test-drivers/vivid/*
   
+ +VIDTV VIRTUAL DIGITAL TV DRIVER
+ +M:    Daniel W. S. Almeida <[email protected]>
+ +L:    [email protected]
+ +S:    Maintained
+ +W:    https://linuxtv.org
+ +T:    git git://linuxtv.org/media_tree.git
+ +F:    drivers/media/test-drivers/vidtv/*
+ +
   VLYNQ BUS
   M:    Florian Fainelli <[email protected]>
   L:    [email protected] (subscribers-only)
@@@ -19013,11 -18857,11 +19013,11 @@@ T:        git git://git.kernel.org/pub/scm/lin
   F:    arch/x86/mm/
   
   X86 PLATFORM DRIVERS
- -M:    Darren Hart <[email protected]>
- -M:    Andy Shevchenko <[email protected]>
+ +M:    Hans de Goede <[email protected]>
+ +M:    Mark Gross <[email protected]>
   L:    [email protected]
- -S:    Odd Fixes
- -T:    git git://git.infradead.org/linux-platform-drivers-x86.git
+ +S:    Maintained
+ +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git
   F:    drivers/platform/olpc/
   F:    drivers/platform/x86/
   
@@@ -19030,15 -18874,6 +19030,15 @@@ S: Maintaine
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/core
   F:    arch/x86/platform
   
+ +X86 PLATFORM UV HPE SUPERDOME FLEX
+ +M:    Steve Wahl <[email protected]>
+ +R:    Dimitri Sivanich <[email protected]>
+ +R:    Russ Anderson <[email protected]>
+ +S:    Supported
+ +F:    arch/x86/include/asm/uv/
+ +F:    arch/x86/kernel/apic/x2apic_uv_x.c
+ +F:    arch/x86/platform/uv/
+ +
   X86 VDSO
   M:    Andy Lutomirski <[email protected]>
   L:    [email protected]
@@@ -19366,16 -19201,6 +19366,16 @@@ T: git git://git.kernel.org/pub/scm/lin
   F:    Documentation/filesystems/zonefs.rst
   F:    fs/zonefs/
   
+ +ZR36067 VIDEO FOR LINUX DRIVER
+ +M:    Corentin Labbe <[email protected]>
+ +L:    [email protected]
+ +L:    [email protected]
+ +S:    Maintained
+ +W:    http://mjpeg.sourceforge.net/driver-zoran/
+ +Q:    https://patchwork.linuxtv.org/project/linux-media/list/
+ +F:    Documentation/driver-api/media/drivers/zoran.rst
+ +F:    drivers/staging/media/zoran/
+ +
   ZPOOL COMPRESSED PAGE STORAGE API
   M:    Dan Streetman <[email protected]>
   L:    [email protected]
diff --combined drivers/power/supply/ab8500_fg.c

index 7eec415c82a3525b9dcbe83cc01aa8fe8e457e30,3abd2cd1ee92326a905c85c2711f4ed0fe1ec43f..592a73d4dde68ec6dade734542da471b6902aa6a
--- 1/drivers/power/supply/ab8500_fg.c
--- 2/drivers/power/supply/ab8500_fg.c
+++ b/drivers/power/supply/ab8500_fg.c
@@@ -653,7 -653,7 +653,7 @@@ int ab8500_fg_inst_curr_finalize(struc
   
         /*
          * negative value for Discharging
-        * convert 2's compliment into decimal
+        * convert 2's complement into decimal
          */
         if (high & 0x10)
                 val = (low | (high << 8) | 0xFFFFE000);
@@@ -781,7 -781,7 +781,7 @@@ static void ab8500_fg_acc_cur_work(stru
         if (ret < 0)
                 goto exit;
   
-       /* Check for sign bit in case of negative value, 2's compliment */
+       /* Check for sign bit in case of negative value, 2's complement */
         if (high & 0x10)
                 val = (low | (med << 8) | (high << 16) | 0xFFE00000);
         else
@@@ -1542,7 -1542,7 +1542,7 @@@ static void ab8500_fg_algorithm_dischar
                 ab8500_fg_discharge_state_to(di,
                         AB8500_FG_DISCHARGE_INITMEASURING);
   
- -              /* Intentional fallthrough */
+ +              fallthrough;
         case AB8500_FG_DISCHARGE_INITMEASURING:
                 /*
                  * Discard a number of samples during startup.
@@@ -1572,7 -1572,7 +1572,7 @@@
                 ab8500_fg_discharge_state_to(di,
                         AB8500_FG_DISCHARGE_RECOVERY);
   
- -              /* Intentional fallthrough */
+ +              fallthrough;
   
         case AB8500_FG_DISCHARGE_RECOVERY:
                 sleep_time = di->bm->fg_params->recovery_sleep_timer;
diff --combined drivers/power/supply/bq27xxx_battery_hdq.c

index d56b3e19e996fdf42c4e451030b63a77ed5c957c,12b10dad77d3988f549bc05e6e24ebf117be7e74..922759ab2e045472920d158025b340c8d822f824
--- 1/drivers/power/supply/bq27xxx_battery_hdq.c
--- 2/drivers/power/supply/bq27xxx_battery_hdq.c
+++ b/drivers/power/supply/bq27xxx_battery_hdq.c
@@@ -1,16 -1,9 +1,9 @@@
+ // SPDX-License-Identifier: GPL-2.0
   /*
    * BQ27xxx battery monitor HDQ/1-wire driver
    *
    * Copyright (C) 2007-2017 Texas Instruments Incorporated - https://www.ti.com/
    *
-  * This program is free software; you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License version 2 as
-  * published by the Free Software Foundation.
-  *
-  * This program is distributed "as is" WITHOUT ANY WARRANTY of any
-  * kind, whether express or implied; without even the implied warranty
-  * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  * GNU General Public License for more details.
    */
   
   #include <linux/kernel.h>
@@@ -104,7 -97,7 +97,7 @@@ static void bq27xxx_battery_hdq_remove_
         bq27xxx_battery_teardown(di);
   }
   
- -static struct w1_family_ops bq27xxx_battery_hdq_fops = {
+ +static const struct w1_family_ops bq27xxx_battery_hdq_fops = {
         .add_slave      = bq27xxx_battery_hdq_add_slave,
         .remove_slave   = bq27xxx_battery_hdq_remove_slave,
   };
diff --combined drivers/power/supply/sbs-battery.c

index 7439753fac87838fa09cad5f987c37e1eeba2256,13192cbcce71625db14babc87f05394bbb64e128..b6a538ebb378fcde62a42b9d76ac78555af8450f
--- 1/drivers/power/supply/sbs-battery.c
--- 2/drivers/power/supply/sbs-battery.c
+++ b/drivers/power/supply/sbs-battery.c
@@@ -193,7 -193,6 +193,6 @@@ struct sbs_info 
         struct power_supply             *power_supply;
         bool                            is_present;
         struct gpio_desc                *gpio_detect;
-       bool                            enable_detection;
         bool                            charger_broadcasts;
         int                             last_state;
         int                             poll_time;
@@@ -280,12 -279,6 +279,12 @@@ static int sbs_update_presence(struct s
         else
                 client->flags &= ~I2C_CLIENT_PEC;
   
+ +      if (of_device_is_compatible(client->dev.parent->of_node, "google,cros-ec-i2c-tunnel")
+ +          && client->flags & I2C_CLIENT_PEC) {
+ +              dev_info(&client->dev, "Disabling PEC because of broken Cros-EC implementation\n");
+ +              client->flags &= ~I2C_CLIENT_PEC;
+ +      }
+ +
         dev_dbg(&client->dev, "PEC: %s\n", (client->flags & I2C_CLIENT_PEC) ?
                 "enabled" : "disabled");
   
@@@ -480,37 -473,6 +479,6 @@@ static bool sbs_bat_needs_calibration(s
         return !!(ret & BIT(7));
   }
   
- static int sbs_get_battery_presence_and_health(
-       struct i2c_client *client, enum power_supply_property psp,
-       union power_supply_propval *val)
- {
-       int ret;
- 
-       /* Dummy command; if it succeeds, battery is present. */
-       ret = sbs_read_word_data(client, sbs_data[REG_STATUS].addr);
- 
-       if (ret < 0) { /* battery not present*/
-               if (psp == POWER_SUPPLY_PROP_PRESENT) {
-                       val->intval = 0;
-                       return 0;
-               }
-               return ret;
-       }
- 
-       if (psp == POWER_SUPPLY_PROP_PRESENT)
-               val->intval = 1; /* battery present */
-       else { /* POWER_SUPPLY_PROP_HEALTH */
-               if (sbs_bat_needs_calibration(client)) {
-                       val->intval = POWER_SUPPLY_HEALTH_CALIBRATION_REQUIRED;
-               } else {
-                       /* SBS spec doesn't have a general health command. */
-                       val->intval = POWER_SUPPLY_HEALTH_UNKNOWN;
-               }
-       }
- 
-       return 0;
- }
- 
   static int sbs_get_ti_battery_presence_and_health(
         struct i2c_client *client, enum power_supply_property psp,
         union power_supply_propval *val)
@@@ -569,6 -531,41 +537,41 @@@
         return 0;
   }
   
+ static int sbs_get_battery_presence_and_health(
+       struct i2c_client *client, enum power_supply_property psp,
+       union power_supply_propval *val)
+ {
+       struct sbs_info *chip = i2c_get_clientdata(client);
+       int ret;
+ 
+       if (chip->flags & SBS_FLAGS_TI_BQ20ZX5)
+               return sbs_get_ti_battery_presence_and_health(client, psp, val);
+ 
+       /* Dummy command; if it succeeds, battery is present. */
+       ret = sbs_read_word_data(client, sbs_data[REG_STATUS].addr);
+ 
+       if (ret < 0) { /* battery not present*/
+               if (psp == POWER_SUPPLY_PROP_PRESENT) {
+                       val->intval = 0;
+                       return 0;
+               }
+               return ret;
+       }
+ 
+       if (psp == POWER_SUPPLY_PROP_PRESENT)
+               val->intval = 1; /* battery present */
+       else { /* POWER_SUPPLY_PROP_HEALTH */
+               if (sbs_bat_needs_calibration(client)) {
+                       val->intval = POWER_SUPPLY_HEALTH_CALIBRATION_REQUIRED;
+               } else {
+                       /* SBS spec doesn't have a general health command. */
+                       val->intval = POWER_SUPPLY_HEALTH_UNKNOWN;
+               }
+       }
+ 
+       return 0;
+ }
+ 
   static int sbs_get_battery_property(struct i2c_client *client,
         int reg_offset, enum power_supply_property psp,
         union power_supply_propval *val)
@@@ -871,12 -868,7 +874,7 @@@ static int sbs_get_property(struct powe
         switch (psp) {
         case POWER_SUPPLY_PROP_PRESENT:
         case POWER_SUPPLY_PROP_HEALTH:
-               if (chip->flags & SBS_FLAGS_TI_BQ20ZX5)
-                       ret = sbs_get_ti_battery_presence_and_health(client,
-                                                                    psp, val);
-               else
-                       ret = sbs_get_battery_presence_and_health(client, psp,
-                                                                 val);
+               ret = sbs_get_battery_presence_and_health(client, psp, val);
   
                 /* this can only be true if no gpio is used */
                 if (psp == POWER_SUPPLY_PROP_PRESENT)
@@@ -967,32 -959,30 +965,30 @@@
                 return -EINVAL;
         }
   
-       if (!chip->enable_detection)
-               goto done;
+       if (!chip->gpio_detect && chip->is_present != (ret >= 0)) {
+               bool old_present = chip->is_present;
+               union power_supply_propval val;
+               int err = sbs_get_battery_presence_and_health(
+                               client, POWER_SUPPLY_PROP_PRESENT, &val);
   
-       if (!chip->gpio_detect &&
-               chip->is_present != (ret >= 0)) {
-               sbs_update_presence(chip, (ret >= 0));
-               power_supply_changed(chip->power_supply);
+               sbs_update_presence(chip, !err && val.intval);
+ 
+               if (old_present != chip->is_present)
+                       power_supply_changed(chip->power_supply);
         }
   
   done:
         if (!ret) {
                 /* Convert units to match requirements for power supply class */
                 sbs_unit_adjustment(client, psp, val);
+               dev_dbg(&client->dev,
+                       "%s: property = %d, value = %x\n", __func__,
+                       psp, val->intval);
+       } else if (!chip->is_present)  {
+               /* battery not present, so return NODATA for properties */
+               ret = -ENODATA;
         }
- 
-       dev_dbg(&client->dev,
-               "%s: property = %d, value = %x\n", __func__, psp, val->intval);
- 
-       if (ret && chip->is_present)
-               return ret;
- 
-       /* battery not present, so return NODATA for properties */
-       if (ret)
-               return -ENODATA;
- 
-       return 0;
+       return ret;
   }
   
   static void sbs_supply_changed(struct sbs_info *chip)
@@@ -1098,7 -1088,6 +1094,6 @@@ static int sbs_probe(struct i2c_client 
   
         chip->flags = (u32)(uintptr_t)device_get_match_data(&client->dev);
         chip->client = client;
-       chip->enable_detection = false;
         psy_cfg.of_node = client->dev.of_node;
         psy_cfg.drv_data = chip;
         chip->last_state = POWER_SUPPLY_STATUS_UNKNOWN;
@@@ -1159,15 -1148,19 +1154,19 @@@ skip_gpio
          * to the battery.
          */
         if (!(force_load || chip->gpio_detect)) {
-               rc = sbs_read_word_data(client, sbs_data[REG_STATUS].addr);
+               union power_supply_propval val;
   
-               if (rc < 0) {
-                       dev_err(&client->dev, "%s: Failed to get device status\n",
-                               __func__);
+               rc = sbs_get_battery_presence_and_health(
+                               client, POWER_SUPPLY_PROP_PRESENT, &val);
+               if (rc < 0 || !val.intval) {
+                       dev_err(&client->dev, "Failed to get present status\n");
+                       rc = -ENODEV;
                         goto exit_psupply;
                 }
         }
   
+       INIT_DELAYED_WORK(&chip->work, sbs_delayed_work);
+ 
         chip->power_supply = devm_power_supply_register(&client->dev, sbs_desc,
                                                    &psy_cfg);
         if (IS_ERR(chip->power_supply)) {
@@@ -1180,10 -1173,6 +1179,6 @@@
         dev_info(&client->dev,
                 "%s: battery gas gauge device registered\n", client->name);
   
-       INIT_DELAYED_WORK(&chip->work, sbs_delayed_work);
- 
-       chip->enable_detection = true;
- 
         return 0;
   
   exit_psupply:
author	Linus Torvalds <[email protected]>
	Tue, 20 Oct 2020 17:56:34 +0000 (10:56 -0700)
committer	Linus Torvalds <[email protected]>
	Tue, 20 Oct 2020 17:56:34 +0000 (10:56 -0700)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/power/supply/ab8500_fg.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/power/supply/bq27xxx_battery_hdq.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/power/supply/sbs-battery.c	patch \|	diff1 \|	diff2 \|	blob \| history