Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid...

Pull HID fixes from Jiri Kosina:

 - linked list race condition fix in hid-steam driver from Rodrigo Rivas
   Costa

 - assorted deviceID-specific quirks and other small cosmetic cleanups

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid:
  HID: logitech-hidpp: avoid repeated "multiplier = " log messages
  HID: logitech: Use HIDPP_RECEIVER_INDEX instead of 0xff
  HID: quirks: Ignore Simply Automated UPB PIM
  HID: apple: Disable Fn-key key-re-mapping on clone keyboards
  MAINTAINERS: update uhid and hid-wiimote entry
  HID: steam: fixes race in handling device list.
  HID: magicmouse: do not set up autorepeat
  HID: alps: support devices with report id 2
  HID: quirks: Always poll Obins Anne Pro 2 keyboard
  HID: i2c-hid: add Mediacom FlexBook edge13 to descriptor override

diff --combined MAINTAINERS
index 5d62356f11ee36851144f4455c8dec0ca955b0d5,e1d82d8de7dc83b2488fe3f0bf922834e01c066a..b7e5d360091fec3c7449c453c102ca46bba2f6d4
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -294,7 -294,6 +294,7 @@@ F: drivers/gpio/gpio-104-idio-16.
  
  ACCES 104-QUAD-8 DRIVER
  M:    William Breathitt Gray <[email protected]>
 +M:    Syed Nayyar Waris <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/ABI/testing/sysfs-bus-counter-104-quad-8
@@@ -884,7 -883,7 +884,7 @@@ M: Joerg Roedel <[email protected]
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git
 -F:    drivers/iommu/amd_iommu*.[ch]
 +F:    drivers/iommu/amd/
  F:    include/linux/amd-iommu.h
  
  AMD KFD
@@@ -1043,14 -1042,6 +1043,14 @@@ W:    http://ez.analog.com/community/linux
  F:    Documentation/devicetree/bindings/iio/imu/adi,adis16460.yaml
  F:    drivers/iio/imu/adis16460.c
  
 +ANALOG DEVICES INC ADIS16475 DRIVER
 +M:    Nuno Sa <[email protected]>
 +L:    [email protected]
 +W:    http://ez.analog.com/community/linux-device-drivers
 +S:    Supported
 +F:    drivers/iio/imu/adis16475.c
 +F:    Documentation/devicetree/bindings/iio/imu/adi,adis16475.yaml
 +
  ANALOG DEVICES INC ADM1177 DRIVER
  M:    Beniamin Bia <[email protected]>
  M:    Michael Hennerich <[email protected]>
@@@ -1305,13 -1296,6 +1305,13 @@@ S:    Supporte
  W:    http://www.aquantia.com
  F:    drivers/net/ethernet/aquantia/atlantic/aq_ptp*
  
 +ARASAN NAND CONTROLLER DRIVER
 +M:    Naga Sureshkumar Relli <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/mtd/arasan,nand-controller.yaml
 +F:    drivers/mtd/nand/raw/arasan-nand-controller.c
 +
  ARC FRAMEBUFFER DRIVER
  M:    Jaya Kumar <[email protected]>
  S:    Maintained
@@@ -1366,11 -1350,10 +1366,11 @@@ F:   arch/arm/mach-integrator
  F:    arch/arm/mach-realview/
  F:    arch/arm/mach-versatile/
  F:    arch/arm/plat-versatile/
 +F:    drivers/bus/arm-integrator-lm.c
  F:    drivers/clk/versatile/
  F:    drivers/i2c/busses/i2c-versatile.c
  F:    drivers/irqchip/irq-versatile-fpga.c
 -F:    drivers/mtd/maps/physmap_of_versatile.c
 +F:    drivers/mtd/maps/physmap-versatile.*
  F:    drivers/power/reset/arm-versatile-reboot.c
  F:    drivers/soc/versatile/
  
@@@ -1720,6 -1703,11 +1720,6 @@@ S:     Maintaine
  T:    git git://git.armlinux.org.uk/~rmk/linux-arm.git clkdev
  F:    drivers/clk/clkdev.c
  
 -ARM/COMPULAB CM-X270/EM-X270 and CM-X300 MACHINE SUPPORT
 -M:    Mike Rapoport <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -S:    Maintained
 -
  ARM/CONEXANT DIGICOLOR MACHINE SUPPORT
  M:    Baruch Siach <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -2028,7 -2016,6 +2028,7 @@@ F:      arch/arm/mach-dove
  F:    arch/arm/mach-mv78xx0/
  F:    arch/arm/mach-orion5x/
  F:    arch/arm/plat-orion/
 +F:    drivers/soc/dove/
  
  ARM/Marvell Kirkwood and Armada 370, 375, 38x, 39x, XP, 3700, 7K/8K, CN9130 SOC support
  M:    Jason Cooper <[email protected]>
@@@ -2174,7 -2161,6 +2174,7 @@@ F:      Documentation/devicetree/bindings/*/
  F:    arch/arm/boot/dts/nuvoton-npcm*
  F:    arch/arm/mach-npcm/
  F:    drivers/*/*npcm*
 +F:    drivers/*/*/*npcm*
  F:    include/dt-bindings/clock/nuvoton,npcm7xx-clock.h
  
  ARM/OPENMOKO NEO FREERUNNER (GTA02) MACHINE SUPPORT
@@@ -2198,7 -2184,6 +2198,7 @@@ L:      [email protected] (moderated fo
  S:    Maintained
  F:    arch/arm/boot/dts/ox8*.dts*
  F:    arch/arm/mach-oxnas/
 +F:    drivers/power/reset/oxnas-restart.c
  N:    oxnas
  
  ARM/PALM TREO SUPPORT
@@@ -2307,8 -2292,6 +2307,8 @@@ L:      [email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    Documentation/devicetree/bindings/arm/realtek.yaml
 +F:    arch/arm/boot/dts/rtd*
 +F:    arch/arm/mach-realtek/
  F:    arch/arm64/boot/dts/realtek/
  
  ARM/RENESAS ARM64 ARCHITECTURE
@@@ -2731,8 -2714,8 +2731,8 @@@ L:      [email protected]
  S:    Supported
  W:    http://wiki.xilinx.com
  T:    git https://github.com/Xilinx/linux-xlnx.git
 -F:    Documentation/devicetree/bindings/i2c/i2c-cadence.txt
 -F:    Documentation/devicetree/bindings/i2c/i2c-xiic.txt
 +F:    Documentation/devicetree/bindings/i2c/cdns,i2c-r1p10.yaml
 +F:    Documentation/devicetree/bindings/i2c/xlnx,xps-iic-2.00.a.yaml
  F:    arch/arm/mach-zynq/
  F:    drivers/block/xsysace.c
  F:    drivers/clocksource/timer-cadence-ttc.c
@@@ -2929,7 -2912,6 +2929,7 @@@ F:      include/uapi/linux/atm
  
  ATMEL MACB ETHERNET DRIVER
  M:    Nicolas Ferre <[email protected]>
 +M:    Claudiu Beznea <[email protected]>
  S:    Supported
  F:    drivers/net/ethernet/cadence/
  
@@@ -3307,7 -3289,7 +3307,7 @@@ X:      arch/riscv/net/bpf_jit_comp32.
  
  BPF JIT for S390
  M:    Ilya Leoshkevich <[email protected]>
 -M:    Heiko Carstens <heiko.carstens@de.ibm.com>
 +M:    Heiko Carstens <hca@linux.ibm.com>
  M:    Vasily Gorbik <[email protected]>
  L:    [email protected]
  L:    [email protected]
@@@ -3358,7 -3340,7 +3358,7 @@@ L:      [email protected]
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
 -T:    git git://github.com/anholt/linux
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/nsaenz/linux-rpi.git
  F:    Documentation/devicetree/bindings/pci/brcm,stb-pcie.yaml
  F:    drivers/pci/controller/pcie-brcmstb.c
  F:    drivers/staging/vc04_services
@@@ -3519,14 -3501,6 +3519,14 @@@ S:    Supporte
  F:    Documentation/devicetree/bindings/i2c/brcm,brcmstb-i2c.yaml
  F:    drivers/i2c/busses/i2c-brcmstb.c
  
 +BROADCOM BRCMSTB USB EHCI DRIVER
 +M:    Al Cooper <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/usb/brcm,bcm7445-ehci.yaml
 +F:    drivers/usb/host/ehci-brcm.*
 +
  BROADCOM BRCMSTB USB2 and USB3 PHY DRIVER
  M:    Al Cooper <[email protected]>
  L:    [email protected]
@@@ -3787,8 -3761,9 +3787,8 @@@ F:      Documentation/devicetree/bindings/me
  F:    drivers/media/platform/cadence/cdns-csi2*
  
  CADENCE NAND DRIVER
 -M:    Piotr Sroka <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  F:    Documentation/devicetree/bindings/mtd/cadence-nand-controller.txt
  F:    drivers/mtd/nand/raw/cadence-nand-controller.c
  
@@@ -3947,7 -3922,7 +3947,7 @@@ L:      [email protected]
  S:    Supported
  F:    drivers/char/hw_random/cctrng.c
  F:    drivers/char/hw_random/cctrng.h
 -F:    Documentation/devicetree/bindings/rng/arm-cctrng.txt
 +F:    Documentation/devicetree/bindings/rng/arm-cctrng.yaml
  W:    https://developer.arm.com/products/system-ip/trustzone-cryptocell/cryptocell-700-family
  
  CEC FRAMEWORK
@@@ -3987,12 -3962,6 +3987,12 @@@ F:    arch/powerpc/include/uapi/asm/spu*.
  F:    arch/powerpc/oprofile/*cell*
  F:    arch/powerpc/platforms/cell/
  
 +CELLWISE CW2015 BATTERY DRIVER
 +M:    Tobias Schrammm <[email protected]>
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/power/supply/cw2015_battery.yaml
 +F:    drivers/power/supply/cw2015_battery.c
 +
  CEPH COMMON CODE (LIBCEPH)
  M:    Ilya Dryomov <[email protected]>
  M:    Jeff Layton <[email protected]>
@@@ -4120,11 -4089,12 +4120,11 @@@ M:   Charles Keepax <[email protected]
  M:    Richard Fitzgerald <[email protected]>
  L:    [email protected]
  S:    Supported
 -F:    Documentation/devicetree/bindings/clock/cirrus,lochnagar.txt
 -F:    Documentation/devicetree/bindings/hwmon/cirrus,lochnagar.txt
 -F:    Documentation/devicetree/bindings/mfd/cirrus,lochnagar.txt
 -F:    Documentation/devicetree/bindings/pinctrl/cirrus,lochnagar.txt
 -F:    Documentation/devicetree/bindings/regulator/cirrus,lochnagar.txt
 -F:    Documentation/devicetree/bindings/sound/cirrus,lochnagar.txt
 +F:    Documentation/devicetree/bindings/clock/cirrus,lochnagar.yaml
 +F:    Documentation/devicetree/bindings/hwmon/cirrus,lochnagar.yaml
 +F:    Documentation/devicetree/bindings/mfd/cirrus,lochnagar.yaml
 +F:    Documentation/devicetree/bindings/pinctrl/cirrus,lochnagar.yaml
 +F:    Documentation/devicetree/bindings/sound/cirrus,lochnagar.yaml
  F:    Documentation/hwmon/lochnagar.rst
  F:    drivers/clk/clk-lochnagar.c
  F:    drivers/hwmon/lochnagar-hwmon.c
@@@ -4144,9 -4114,9 +4144,9 @@@ L:      [email protected]
  S:    Supported
  W:    https://github.com/CirrusLogic/linux-drivers/wiki
  T:    git https://github.com/CirrusLogic/linux-drivers.git
 -F:    Documentation/devicetree/bindings/mfd/madera.txt
 -F:    Documentation/devicetree/bindings/pinctrl/cirrus,madera-pinctrl.txt
 -F:    Documentation/devicetree/bindings/sound/madera.txt
 +F:    Documentation/devicetree/bindings/mfd/cirrus,madera.yaml
 +F:    Documentation/devicetree/bindings/pinctrl/cirrus,madera.yaml
 +F:    Documentation/devicetree/bindings/sound/cirrus,madera.yaml
  F:    drivers/gpio/gpio-madera*
  F:    drivers/irqchip/irq-madera*
  F:    drivers/mfd/cs47l*
@@@ -4712,12 -4682,6 +4712,12 @@@ Q:    http://patchwork.linuxtv.org/project
  T:    git git://linuxtv.org/anttip/media_tree.git
  F:    drivers/media/common/cypress_firmware*
  
 +CYPRESS CY8CTMA140 TOUCHSCREEN DRIVER
 +M:    Linus Walleij <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/input/touchscreen/cy8ctma140.c
 +
  CYTTSP TOUCHSCREEN DRIVER
  M:    Ferruh Yigit <[email protected]>
  L:    [email protected]
@@@ -5112,7 -5076,7 +5112,7 @@@ M:      Vinod Koul <[email protected]
  L:    [email protected]
  S:    Maintained
  Q:    https://patchwork.kernel.org/project/linux-dmaengine/list/
 -T:    git git://git.infradead.org/users/vkoul/slave-dma.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git
  F:    Documentation/devicetree/bindings/dma/
  F:    Documentation/driver-api/dmaengine/
  F:    drivers/dma/
@@@ -5491,7 -5455,7 +5491,7 @@@ F:      include/uapi/drm/r128_drm.
  DRM DRIVER FOR RAYDIUM RM67191 PANELS
  M:    Robert Chiras <[email protected]>
  S:    Maintained
 -F:    Documentation/devicetree/bindings/display/panel/raydium,rm67191.txt
 +F:    Documentation/devicetree/bindings/display/panel/raydium,rm67191.yaml
  F:    drivers/gpu/drm/panel/panel-raydium-rm67191.c
  
  DRM DRIVER FOR ROCKTECH JH057N00900 PANELS
@@@ -7124,7 -7088,6 +7124,7 @@@ GASKET DRIVER FRAMEWOR
  M:    Rob Springer <[email protected]>
  M:    Todd Poynor <[email protected]>
  M:    Ben Chan <[email protected]>
 +M:    Richard Yeh <[email protected]>
  S:    Maintained
  F:    drivers/staging/gasket/
  
@@@ -7272,7 -7235,7 +7272,7 @@@ L:      [email protected]
  S:    Supported
  W:    http://sources.redhat.com/cluster/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git
 -F:    Documentation/filesystems/gfs2*.txt
 +F:    Documentation/filesystems/gfs2*
  F:    fs/gfs2/
  F:    include/uapi/linux/gfs2_ondisk.h
  
@@@ -7322,13 -7285,6 +7322,13 @@@ F:    Documentation/firmware-guide/acpi/gp
  F:    drivers/gpio/gpiolib-acpi.c
  F:    drivers/gpio/gpiolib-acpi.h
  
 +GPIO AGGREGATOR
 +M:    Geert Uytterhoeven <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    Documentation/admin-guide/gpio/gpio-aggregator.rst
 +F:    drivers/gpio/gpio-aggregator.c
 +
  GPIO IR Transmitter
  M:    Sean Young <[email protected]>
  L:    [email protected]
@@@ -7342,12 -7298,6 +7342,12 @@@ S:    Maintaine
  F:    drivers/gpio/gpio-mockup.c
  F:    tools/testing/selftests/gpio/
  
 +GPIO REGMAP
 +R:    Michael Walle <[email protected]>
 +S:    Maintained
 +F:    drivers/gpio/gpio-regmap.c
 +F:    include/linux/gpio/regmap.h
 +
  GPIO SUBSYSTEM
  M:    Linus Walleij <[email protected]>
  M:    Bartosz Golaszewski <[email protected]>
@@@ -8334,7 -8284,7 +8334,7 @@@ M:      Alexander Aring <[email protected]
  M:    Stefan Schmidt <[email protected]>
  L:    [email protected]
  S:    Maintained
 -W:    http://wpan.cakelab.org/
 +W:    https://linux-wpan.org/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/sschmidt/wpan.git
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/sschmidt/wpan-next.git
  F:    Documentation/networking/ieee802154.rst
@@@ -8523,7 -8473,6 +8523,7 @@@ F:      drivers/mtd/nand/raw/ingenic
  F:    drivers/pinctrl/pinctrl-ingenic.c
  F:    drivers/power/supply/ingenic-battery.c
  F:    drivers/pwm/pwm-jz4740.c
 +F:    drivers/remoteproc/ingenic_rproc.c
  F:    drivers/rtc/rtc-jz4740.c
  F:    drivers/tty/serial/8250/8250_ingenic.c
  F:    drivers/usb/musb/jz4740.c
@@@ -8737,7 -8686,8 +8737,7 @@@ M:      Lu Baolu <[email protected]
  L:    [email protected]
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git
 -F:    drivers/iommu/dmar.c
 -F:    drivers/iommu/intel*.[ch]
 +F:    drivers/iommu/intel/
  F:    include/linux/intel-iommu.h
  F:    include/linux/intel-svm.h
  
@@@ -9306,17 -9256,6 +9306,17 @@@ F:    Documentation/kbuild/kconfig
  F:    scripts/Kconfig.include
  F:    scripts/kconfig/
  
 +KCSAN
 +M:    Marco Elver <[email protected]>
 +R:    Dmitry Vyukov <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/dev-tools/kcsan.rst
 +F:    include/linux/kcsan*.h
 +F:    kernel/kcsan/
 +F:    lib/Kconfig.kcsan
 +F:    scripts/Makefile.kcsan
 +
  KDUMP
  M:    Dave Young <[email protected]>
  M:    Baoquan He <[email protected]>
@@@ -9937,7 -9876,7 +9937,7 @@@ F:      arch/powerpc/platforms/83xx
  F:    arch/powerpc/platforms/85xx/
  
  LINUX FOR POWERPC EMBEDDED PPC8XX
 -M:    Christophe Leroy <christophe.leroy@c-s.fr>
 +M:    Christophe Leroy <christophe.leroy@csgroup.eu>
  L:    [email protected]
  S:    Maintained
  F:    arch/powerpc/platforms/8xx/
@@@ -9997,12 -9936,10 +9997,12 @@@ S:   Maintaine
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching.git
  F:    Documentation/ABI/testing/sysfs-kernel-livepatch
  F:    Documentation/livepatch/
 +F:    arch/powerpc/include/asm/livepatch.h
 +F:    arch/s390/include/asm/livepatch.h
  F:    arch/x86/include/asm/livepatch.h
 -F:    arch/x86/kernel/livepatch.c
  F:    include/linux/livepatch.h
  F:    kernel/livepatch/
 +F:    lib/livepatch/
  F:    samples/livepatch/
  F:    tools/testing/selftests/livepatch/
  
@@@ -10101,7 -10038,7 +10101,7 @@@ F:   drivers/hid/hid-lg-g15.
  
  LSILOGIC MPT FUSION DRIVERS (FC/SAS/SPI)
  M:    Sathya Prakash <[email protected]>
 -M:    Chaitra P B <chaitra.basappa@broadcom.com>
 +M:    Sreekanth Reddy <sreekanth.reddy@broadcom.com>
  M:    Suganath Prabu Subramani <[email protected]>
  L:    [email protected]
  L:    [email protected]
@@@ -10809,7 -10746,7 +10809,7 @@@ F:   Documentation/devicetree/bindings/dm
  F:    drivers/dma/mediatek/
  
  MEDIATEK ETHERNET DRIVER
 -M:    Felix Fietkau <nbd@openwrt.org>
 +M:    Felix Fietkau <nbd@nbd.name>
  M:    John Crispin <[email protected]>
  M:    Sean Wang <[email protected]>
  M:    Mark Lee <[email protected]>
@@@ -10877,8 -10814,9 +10877,8 @@@ F:   Documentation/devicetree/bindings/i2
  F:    drivers/i2c/busses/i2c-mt7621.c
  
  MEDIATEK NAND CONTROLLER DRIVER
 -M:    Xiaolei Li <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  F:    Documentation/devicetree/bindings/mtd/mtk-nand.txt
  F:    drivers/mtd/nand/raw/mtk_*
  
@@@ -11370,6 -11308,14 +11370,6 @@@ L:  [email protected]
  S:    Supported
  F:    drivers/dma/at_xdmac.c
  
 -MICROSEMI ETHERNET SWITCH DRIVER
 -M:    Alexandre Belloni <[email protected]>
 -M:    Microchip Linux Driver Support <[email protected]>
 -L:    [email protected]
 -S:    Supported
 -F:    drivers/net/ethernet/mscc/
 -F:    include/soc/mscc/ocelot*
 -
  MICROSEMI MIPS SOCS
  M:    Alexandre Belloni <[email protected]>
  M:    Microchip Linux Driver Support <[email protected]>
@@@ -12328,18 -12274,6 +12328,18 @@@ M: Peter Zijlstra <[email protected]
  S:    Supported
  F:    tools/objtool/
  
 +OCELOT ETHERNET SWITCH DRIVER
 +M:    Microchip Linux Driver Support <[email protected]>
 +M:    Vladimir Oltean <[email protected]>
 +M:    Claudiu Manoil <[email protected]>
 +M:    Alexandre Belloni <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/net/dsa/ocelot/*
 +F:    drivers/net/ethernet/mscc/
 +F:    include/soc/mscc/ocelot*
 +F:    net/dsa/tag_ocelot.c
 +
  OCXL (Open Coherent Accelerator Processor Interface OpenCAPI) DRIVER
  M:    Frederic Barrat <[email protected]>
  M:    Andrew Donnellan <[email protected]>
@@@ -12696,13 -12630,13 +12696,13 @@@ F:        arch/mips/boot/dts/ralink/omega2p.dt
  
  OP-TEE DRIVER
  M:    Jens Wiklander <[email protected]>
 -L:    [email protected].org
 +L:    [email protected].org
  S:    Maintained
  F:    drivers/tee/optee/
  
  OP-TEE RANDOM NUMBER GENERATOR (RNG) DRIVER
  M:    Sumit Garg <[email protected]>
 -L:    [email protected].org
 +L:    [email protected].org
  S:    Maintained
  F:    drivers/char/hw_random/optee-rng.c
  
@@@ -12718,8 -12652,8 +12718,8 @@@ M:   Pantelis Antoniou <pantelis.antoniou
  M:    Frank Rowand <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/devicetree/dynamic-resolution-notes.txt
 -F:    Documentation/devicetree/overlay-notes.txt
 +F:    Documentation/devicetree/dynamic-resolution-notes.rst
 +F:    Documentation/devicetree/overlay-notes.rst
  F:    drivers/of/overlay.c
  F:    drivers/of/resolver.c
  K:    of_overlay_notifier_
@@@ -12916,7 -12850,7 +12916,7 @@@ F:   include/uapi/linux/ppdev.
  
  PARAVIRT_OPS INTERFACE
  M:    Juergen Gross <[email protected]>
 -M:    Thomas Hellstrom <thellstrom@vmware.com>
 +M:    Deep Shah <sdeep@vmware.com>
  M:    "VMware, Inc." <[email protected]>
  L:    [email protected]
  S:    Supported
@@@ -13127,7 -13061,7 +13127,7 @@@ L:   [email protected]
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/pci/layerscape-pcie-gen4.txt
 -F:    drivers/pci/controller/mobibeil/pcie-layerscape-gen4.c
 +F:    drivers/pci/controller/mobiveil/pcie-layerscape-gen4.c
  
  PCI DRIVER FOR RENESAS R-CAR
  M:    Marek Vasut <[email protected]>
@@@ -13135,7 -13069,6 +13135,7 @@@ M:   Yoshihiro Shimoda <yoshihiro.shimoda
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
 +F:    Documentation/devicetree/bindings/pci/*rcar*
  F:    drivers/pci/controller/*rcar*
  
  PCI DRIVER FOR SAMSUNG EXYNOS
@@@ -13329,8 -13262,8 +13329,8 @@@ PCIE DRIVER FOR SOCIONEXT UNIPHIE
  M:    Kunihiko Hayashi <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/devicetree/bindings/pci/uniphier-pcie.txt
 -F:    drivers/pci/controller/dwc/pcie-uniphier.c
 +F:    Documentation/devicetree/bindings/pci/uniphier-pcie*
 +F:    drivers/pci/controller/dwc/pcie-uniphier*
  
  PCIE DRIVER FOR ST SPEAR13XX
  M:    Pratyush Anand <[email protected]>
@@@ -13531,9 -13464,8 +13531,9 @@@ F:   drivers/pinctrl/qcom
  PIN CONTROLLER - RENESAS
  M:    Geert Uytterhoeven <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git sh-pfc
 +F:    Documentation/devicetree/bindings/pinctrl/renesas,*
  F:    drivers/pinctrl/pinctrl-rz*
  F:    drivers/pinctrl/sh-pfc/
  
@@@ -13925,7 -13857,6 +13925,7 @@@ F:   drivers/media/rc/pwm-ir-tx.
  PWM SUBSYSTEM
  M:    Thierry Reding <[email protected]>
  R:    Uwe Kleine-König <[email protected]>
 +M:    Lee Jones <[email protected]>
  L:    [email protected]
  S:    Maintained
  Q:    https://patchwork.ozlabs.org/project/linux-pwm/list/
@@@ -14197,15 -14128,6 +14197,15 @@@ L: [email protected]
  S:    Supported
  F:    drivers/dma/qcom/hidma*
  
 +QUALCOMM I2C CCI DRIVER
 +M:    Loic Poulain <[email protected]>
 +M:    Robert Foss <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/i2c/i2c-qcom-cci.txt
 +F:    drivers/i2c/busses/i2c-qcom-cci.c
 +
  QUALCOMM IOMMU
  M:    Rob Clark <[email protected]>
  L:    [email protected]
@@@ -14213,14 -14135,6 +14213,14 @@@ L: [email protected]
  S:    Maintained
  F:    drivers/iommu/qcom_iommu.c
  
 +QUALCOMM IPCC MAILBOX DRIVER
 +M:    Manivannan Sadhasivam <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    Documentation/devicetree/bindings/mailbox/qcom-ipcc.yaml
 +F:    drivers/mailbox/qcom-ipcc.c
 +F:    include/dt-bindings/mailbox/qcom-ipcc.h
 +
  QUALCOMM RMNET DRIVER
  M:    Subash Abhinov Kasiviswanathan <[email protected]>
  M:    Sean Tranchetti <[email protected]>
@@@ -14538,7 -14452,6 +14538,7 @@@ M:   Geert Uytterhoeven <geert+renesas@gl
  L:    [email protected]
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git clk-renesas
 +F:    Documentation/devicetree/bindings/clock/renesas,*
  F:    drivers/clk/renesas/
  
  RENESAS EMEV2 I2C DRIVER
@@@ -14548,7 -14461,7 +14548,7 @@@ F:   Documentation/devicetree/bindings/i2
  F:    drivers/i2c/busses/i2c-emev2.c
  
  RENESAS ETHERNET DRIVERS
 -R:    Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
 +R:    Sergei Shtylyov <sergei.shtylyov@gmail.com>
  L:    [email protected]
  L:    [email protected]
  F:    Documentation/devicetree/bindings/net/renesas,*.txt
@@@ -14571,15 -14484,6 +14571,15 @@@ F: Documentation/devicetree/bindings/i2
  F:    drivers/i2c/busses/i2c-rcar.c
  F:    drivers/i2c/busses/i2c-sh_mobile.c
  
 +RENESAS R-CAR THERMAL DRIVERS
 +M:    Niklas Söderlund <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    Documentation/devicetree/bindings/thermal/rcar-gen3-thermal.yaml
 +F:    Documentation/devicetree/bindings/thermal/rcar-thermal.yaml
 +F:    drivers/thermal/rcar_gen3_thermal.c
 +F:    drivers/thermal/rcar_thermal.c
 +
  RENESAS RIIC DRIVER
  M:    Chris Brandt <[email protected]>
  S:    Supported
@@@ -14662,13 -14566,6 +14662,13 @@@ F: arch/riscv
  N:    riscv
  K:    riscv
  
 +RNBD BLOCK DRIVERS
 +M:    Danil Kipnis <[email protected]>
 +M:    Jack Wang <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/block/rnbd/
 +
  ROCCAT DRIVERS
  M:    Stefan Achatz <[email protected]>
  S:    Maintained
@@@ -14806,13 -14703,6 +14806,13 @@@ S: Maintaine
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jes/linux.git rtl8xxxu-devel
  F:    drivers/net/wireless/realtek/rtl8xxxu/
  
 +RTRS TRANSPORT DRIVERS
 +M:    Danil Kipnis <[email protected]>
 +M:    Jack Wang <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/infiniband/ulp/rtrs/
 +
  RXRPC SOCKETS (AF_RXRPC)
  M:    David Howells <[email protected]>
  L:    [email protected]
@@@ -14832,7 -14722,7 +14832,7 @@@ S:   Maintaine
  F:    drivers/video/fbdev/savage/
  
  S390
 -M:    Heiko Carstens <heiko.carstens@de.ibm.com>
 +M:    Heiko Carstens <hca@linux.ibm.com>
  M:    Vasily Gorbik <[email protected]>
  M:    Christian Borntraeger <[email protected]>
  L:    [email protected]
@@@ -14863,7 -14753,7 +14863,7 @@@ F:   drivers/s390/block/dasd
  F:    include/linux/dasd_mod.h
  
  S390 IOMMU (PCI)
 -M:    Gerald Schaefer <gerald.schaefer@de.ibm.com>
 +M:    Gerald Schaefer <gerald.schaefer@linux.ibm.com>
  L:    [email protected]
  S:    Supported
  W:    http://www.ibm.com/developerworks/linux/linux390/
@@@ -14891,13 -14781,12 +14891,13 @@@ F:        drivers/s390/net
  
  S390 PCI SUBSYSTEM
  M:    Niklas Schnelle <[email protected]>
 -M:    Gerald Schaefer <gerald.schaefer@de.ibm.com>
 +M:    Gerald Schaefer <gerald.schaefer@linux.ibm.com>
  L:    [email protected]
  S:    Supported
  W:    http://www.ibm.com/developerworks/linux/linux390/
  F:    arch/s390/pci/
  F:    drivers/pci/hotplug/s390_pci_hpc.c
 +F:    Documentation/s390/pci.rst
  
  S390 VFIO AP DRIVER
  M:    Tony Krowiak <[email protected]>
@@@ -16059,10 -15948,8 +16059,10 @@@ SPARSE CHECKE
  M:    "Luc Van Oostenryck" <[email protected]>
  L:    [email protected]
  S:    Maintained
 -W:    https://sparse.wiki.kernel.org/
 +W:    https://sparse.docs.kernel.org/
  T:    git git://git.kernel.org/pub/scm/devel/sparse/sparse.git
 +Q:    https://patchwork.kernel.org/project/linux-sparse/list/
 +B:    https://bugzilla.kernel.org/enter_bug.cgi?component=Sparse&product=Tools
  F:    include/linux/compiler.h
  
  SPEAR CLOCK FRAMEWORK SUPPORT
@@@ -16481,10 -16368,9 +16481,10 @@@ F: drivers/tty/serial/8250/8250_lpss.
  
  SYNOPSYS DESIGNWARE APB GPIO DRIVER
  M:    Hoan Tran <[email protected]>
 +M:    Serge Semin <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/devicetree/bindings/gpio/snps-dwapb-gpio.txt
 +F:    Documentation/devicetree/bindings/gpio/snps,dw-apb-gpio.yaml
  F:    drivers/gpio/gpio-dwapb.c
  
  SYNOPSYS DESIGNWARE AXI DMAC DRIVER
@@@ -16775,7 -16661,7 +16775,7 @@@ F:   include/media/i2c/tw9910.
  
  TEE SUBSYSTEM
  M:    Jens Wiklander <[email protected]>
 -L:    [email protected].org
 +L:    [email protected].org
  S:    Maintained
  F:    Documentation/tee.txt
  F:    drivers/tee/
@@@ -16842,16 -16728,6 +16842,16 @@@ M: Laxman Dewangan <[email protected]
  S:    Supported
  F:    drivers/spi/spi-tegra*
  
 +TEGRA VIDEO DRIVER
 +M:    Thierry Reding <[email protected]>
 +M:    Jonathan Hunter <[email protected]>
 +M:    Sowjanya Komatineni <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/display/tegra/nvidia,tegra20-host1x.txt
 +F:    drivers/staging/media/tegra-video/
 +
  TEGRA XUSB PADCTL DRIVER
  M:    JC Kuo <[email protected]>
  S:    Supported
@@@ -17514,7 -17390,7 +17514,7 @@@ F:   Documentation/admin-guide/ufs.rs
  F:    fs/ufs/
  
  UHID USERSPACE HID IO DRIVER
- M:    David Herrmann <dh.herrmann@googlemail.com>
+ M:    David Rheinsberg <david.rheinsberg@gmail.com>
  L:    [email protected]
  S:    Maintained
  F:    drivers/hid/uhid.c
@@@ -17844,13 -17720,6 +17844,13 @@@ F: Documentation/driver-api/usb/typec.r
  F:    drivers/usb/typec/
  F:    include/linux/usb/typec.h
  
 +USB TYPEC INTEL PMC MUX DRIVER
 +M:    Heikki Krogerus <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/firmware-guide/acpi/intel-pmc-mux.rst
 +F:    drivers/usb/typec/mux/intel_pmc_mux.c
 +
  USB TYPEC PI3USB30532 MUX DRIVER
  M:    Hans de Goede <[email protected]>
  L:    [email protected]
@@@ -18165,18 -18034,9 +18165,18 @@@ F: drivers/virtio
  F:    include/linux/vdpa.h
  F:    include/linux/virtio*.h
  F:    include/uapi/linux/virtio_*.h
 -F:    mm/balloon_compaction.c
  F:    tools/virtio/
  
 +VIRTIO BALLOON
 +M:    "Michael S. Tsirkin" <[email protected]>
 +M:    David Hildenbrand <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/virtio/virtio_balloon.c
 +F:    include/uapi/linux/virtio_balloon.h
 +F:    include/linux/balloon_compaction.h
 +F:    mm/balloon_compaction.c
 +
  VIRTIO CRYPTO DRIVER
  M:    Gonglei <[email protected]>
  L:    [email protected]
@@@ -18242,13 -18102,6 +18242,13 @@@ S: Maintaine
  F:    drivers/iommu/virtio-iommu.c
  F:    include/uapi/linux/virtio_iommu.h
  
 +VIRTIO MEM DRIVER
 +M:    David Hildenbrand <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/virtio/virtio_mem.c
 +F:    include/uapi/linux/virtio_mem.h
 +
  VIRTUAL BOX GUEST DEVICE DRIVER
  M:    Hans de Goede <[email protected]>
  M:    Arnd Bergmann <[email protected]>
@@@ -18270,6 -18123,14 +18270,6 @@@ S:  Maintaine
  F:    drivers/input/serio/userio.c
  F:    include/uapi/linux/userio.h
  
 -VITESSE FELIX ETHERNET SWITCH DRIVER
 -M:    Vladimir Oltean <[email protected]>
 -M:    Claudiu Manoil <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/net/dsa/ocelot/*
 -F:    net/dsa/tag_ocelot.c
 -
  VIVID VIRTUAL VIDEO DRIVER
  M:    Hans Verkuil <[email protected]>
  L:    [email protected]
@@@ -18305,7 -18166,7 +18305,7 @@@ S:   Maintaine
  F:    drivers/misc/vmw_balloon.c
  
  VMWARE HYPERVISOR INTERFACE
 -M:    Thomas Hellstrom <thellstrom@vmware.com>
 +M:    Deep Shah <sdeep@vmware.com>
  M:    "VMware, Inc." <[email protected]>
  L:    [email protected]
  S:    Supported
@@@ -18473,7 -18334,7 +18473,7 @@@ S:   Maintaine
  F:    drivers/rtc/rtc-sd3078.c
  
  WIIMOTE HID DRIVER
- M:    David Herrmann <dh.herrmann@googlemail.com>
+ M:    David Rheinsberg <david.rheinsberg@gmail.com>
  L:    [email protected]
  S:    Maintained
  F:    drivers/hid/hid-wiimote*
@@@ -18538,11 -18399,11 +18538,11 @@@ L:        [email protected]
  S:    Supported
  W:    https://github.com/CirrusLogic/linux-drivers/wiki
  T:    git https://github.com/CirrusLogic/linux-drivers.git
 -F:    Documentation/devicetree/bindings/extcon/extcon-arizona.txt
 -F:    Documentation/devicetree/bindings/mfd/arizona.txt
 +F:    Documentation/devicetree/bindings/extcon/wlf,arizona.yaml
 +F:    Documentation/devicetree/bindings/mfd/wlf,arizona.yaml
  F:    Documentation/devicetree/bindings/mfd/wm831x.txt
 -F:    Documentation/devicetree/bindings/regulator/arizona-regulator.txt
 -F:    Documentation/devicetree/bindings/sound/wlf,arizona.txt
 +F:    Documentation/devicetree/bindings/regulator/wlf,arizona.yaml
 +F:    Documentation/devicetree/bindings/sound/wlf,arizona.yaml
  F:    Documentation/hwmon/wm83??.rst
  F:    arch/arm/mach-s3c64xx/mach-crag6410*
  F:    drivers/clk/clk-wm83*.c

diff --combined drivers/hid/hid-alps.c
index 6f1fe7248d81c7404e8ea864f09ca65967ebfc52,d33f5abc8f64d271bbd998801273e3aa1cb691f3..a9c2de95c5e279514388a8fecd9e48683c74d5e2
--- 1/drivers/hid/hid-alps.c
--- 2/drivers/hid/hid-alps.c
+++ b/drivers/hid/hid-alps.c
@@@ -25,6 -25,7 +25,7 @@@
  
  #define U1_MOUSE_REPORT_ID                    0x01 /* Mouse data ReportID */
  #define U1_ABSOLUTE_REPORT_ID         0x03 /* Absolute data ReportID */
+ #define U1_ABSOLUTE_REPORT_ID_SECD  0x02 /* FW-PTP Absolute data ReportID */
  #define U1_FEATURE_REPORT_ID          0x05 /* Feature ReportID */
  #define U1_SP_ABSOLUTE_REPORT_ID      0x06 /* Feature ReportID */
  
@@@ -368,6 -369,7 +369,7 @@@ static int u1_raw_event(struct alps_de
        case U1_FEATURE_REPORT_ID:
                break;
        case U1_ABSOLUTE_REPORT_ID:
+       case U1_ABSOLUTE_REPORT_ID_SECD:
                for (i = 0; i < hdata->max_fingers; i++) {
                        u8 *contact = &data[i * 5];
  
@@@ -387,7 -389,8 +389,7 @@@
                                input_report_abs(hdata->input,
                                        ABS_MT_PRESSURE, z);
                        } else {
 -                              input_mt_report_slot_state(hdata->input,
 -                                      MT_TOOL_FINGER, 0);
 +                              input_mt_report_slot_inactive(hdata->input);
                        }
                }