Merge tag 'for-linus-2022052401' of git://git.kernel.org/pub/scm/linux/kernel/git...

Pull HID updates from Jiri Kosina:

 - support for pens with 3 buttons with Wacom driver (Joshua Dickens)

 - support for HID_DG_SCANTIME to report the timestamp for pen and touch
   events in Wacom driver (Joshua Dickens)

 - support for sensor discovery in amd-sfh driver (Basavaraj Natikar)

 - support for wider variety of Huion tablets ported from DIGImend
   project (José Expósito, Nikolai Kondrashov)

 - new device IDs and other assorted small code cleanups

* tag 'for-linus-2022052401' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid: (44 commits)
  HID: apple: Properly handle function keys on Keychron keyboards
  HID: uclogic: Switch to Digitizer usage for styluses
  HID: uclogic: Add pen support for XP-PEN Star 06
  HID: uclogic: Differentiate touch ring and touch strip
  HID: uclogic: Always shift touch reports to zero
  HID: uclogic: Do not focus on touch ring only
  HID: uclogic: Return raw parameters from v2 pen init
  HID: uclogic: Move param printing to a function
  HID: core: Display "SENSOR HUB" for sensor hub bus string in hid_info
  HID: amd_sfh: Move bus declaration outside of amd-sfh
  HID: amd_sfh: Add physical location to HID device
  HID: amd_sfh: Modify the hid name
  HID: amd_sfh: Modify the bus name
  HID: amd_sfh: Add sensor name by index for debug info
  HID: amd_sfh: Add support for sensor discovery
  HID: bigben: fix slab-out-of-bounds Write in bigben_probe
  Hid: wacom: Fix kernel test robot warning
  HID: uclogic: Disable pen usage for Huion keyboard interfaces
  HID: uclogic: Support disabling pen usage
  HID: uclogic: Pass keyboard reports as is
  ...

diff --combined MAINTAINERS
index 4ec3ddf5251fa8fb641eb1444acb58812134b293,d59c8a34f5842823d86a80df7d751b5f838ad8a5..e7b0bfcf0f434c2875710e7bb49ea43ab04cb225
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -201,7 -201,6 +201,7 @@@ F: include/net/ieee80211_radiotap.
  F:    include/net/iw_handler.h
  F:    include/net/wext.h
  F:    include/uapi/linux/nl80211.h
 +F:    include/uapi/linux/wireless.h
  F:    net/wireless/
  
  8169 10/100/1000 GIGABIT ETHERNET DRIVER
@@@ -462,35 -461,35 +462,35 @@@ AD525X ANALOG DEVICES DIGITAL POTENTIOM
  M:    Michael Hennerich <[email protected]>
  S:    Supported
  W:    http://wiki.analog.com/AD5254
 -W:    http://ez.analog.com/community/linux-device-drivers
 +W:    https://ez.analog.com/linux-software-drivers
  F:    drivers/misc/ad525x_dpot.c
  
  AD5398 CURRENT REGULATOR DRIVER (AD5398/AD5821)
  M:    Michael Hennerich <[email protected]>
  S:    Supported
  W:    http://wiki.analog.com/AD5398
 -W:    http://ez.analog.com/community/linux-device-drivers
 +W:    https://ez.analog.com/linux-software-drivers
  F:    drivers/regulator/ad5398.c
  
  AD714X CAPACITANCE TOUCH SENSOR DRIVER (AD7142/3/7/8/7A)
  M:    Michael Hennerich <[email protected]>
  S:    Supported
  W:    http://wiki.analog.com/AD7142
 -W:    http://ez.analog.com/community/linux-device-drivers
 +W:    https://ez.analog.com/linux-software-drivers
  F:    drivers/input/misc/ad714x.c
  
  AD7877 TOUCHSCREEN DRIVER
  M:    Michael Hennerich <[email protected]>
  S:    Supported
  W:    http://wiki.analog.com/AD7877
 -W:    http://ez.analog.com/community/linux-device-drivers
 +W:    https://ez.analog.com/linux-software-drivers
  F:    drivers/input/touchscreen/ad7877.c
  
  AD7879 TOUCHSCREEN DRIVER (AD7879/AD7889)
  M:    Michael Hennerich <[email protected]>
  S:    Supported
  W:    http://wiki.analog.com/AD7879
 -W:    http://ez.analog.com/community/linux-device-drivers
 +W:    https://ez.analog.com/linux-software-drivers
  F:    drivers/input/touchscreen/ad7879.c
  
  ADDRESS SPACE LAYOUT RANDOMIZATION (ASLR)
@@@ -502,7 -501,7 +502,7 @@@ M: Michael Hennerich <michael.hennerich
  L:    [email protected]
  S:    Supported
  W:    https://wiki.analog.com/ADF7242
 -W:    http://ez.analog.com/community/linux-device-drivers
 +W:    https://ez.analog.com/linux-software-drivers
  F:    Documentation/devicetree/bindings/net/ieee802154/adf7242.txt
  F:    drivers/net/ieee802154/adf7242.c
  
@@@ -536,7 -535,7 +536,7 @@@ ADP5520 BACKLIGHT DRIVER WITH IO EXPAND
  M:    Michael Hennerich <[email protected]>
  S:    Supported
  W:    http://wiki.analog.com/ADP5520
 -W:    http://ez.analog.com/community/linux-device-drivers
 +W:    https://ez.analog.com/linux-software-drivers
  F:    drivers/gpio/gpio-adp5520.c
  F:    drivers/input/keyboard/adp5520-keys.c
  F:    drivers/leds/leds-adp5520.c
@@@ -547,7 -546,7 +547,7 @@@ ADP5588 QWERTY KEYPAD AND IO EXPANDER D
  M:    Michael Hennerich <[email protected]>
  S:    Supported
  W:    http://wiki.analog.com/ADP5588
 -W:    http://ez.analog.com/community/linux-device-drivers
 +W:    https://ez.analog.com/linux-software-drivers
  F:    drivers/gpio/gpio-adp5588.c
  F:    drivers/input/keyboard/adp5588-keys.c
  
@@@ -555,7 -554,7 +555,7 @@@ ADP8860 BACKLIGHT DRIVER (ADP8860/ADP88
  M:    Michael Hennerich <[email protected]>
  S:    Supported
  W:    http://wiki.analog.com/ADP8860
 -W:    http://ez.analog.com/community/linux-device-drivers
 +W:    https://ez.analog.com/linux-software-drivers
  F:    drivers/video/backlight/adp8860_bl.c
  
  ADT746X FAN DRIVER
@@@ -594,7 -593,7 +594,7 @@@ ADXL34X THREE-AXIS DIGITAL ACCELEROMETE
  M:    Michael Hennerich <[email protected]>
  S:    Supported
  W:    http://wiki.analog.com/ADXL345
 -W:    http://ez.analog.com/community/linux-device-drivers
 +W:    https://ez.analog.com/linux-software-drivers
  F:    Documentation/devicetree/bindings/iio/accel/adi,adxl345.yaml
  F:    drivers/input/misc/adxl34x.c
  
@@@ -608,18 -607,10 +608,18 @@@ F:      drivers/iio/accel/adxl355_core.
  F:    drivers/iio/accel/adxl355_i2c.c
  F:    drivers/iio/accel/adxl355_spi.c
  
 +ADXL367 THREE-AXIS DIGITAL ACCELEROMETER DRIVER
 +M:    Cosmin Tanislav <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +W:    http://ez.analog.com/community/linux-device-drivers
 +F:    Documentation/devicetree/bindings/iio/accel/adi,adxl367.yaml
 +F:    drivers/iio/accel/adxl367*
 +
  ADXL372 THREE-AXIS DIGITAL ACCELEROMETER DRIVER
  M:    Michael Hennerich <[email protected]>
  S:    Supported
 -W:    http://ez.analog.com/community/linux-device-drivers
 +W:    https://ez.analog.com/linux-software-drivers
  F:    Documentation/devicetree/bindings/iio/accel/adi,adxl372.yaml
  F:    drivers/iio/accel/adxl372.c
  F:    drivers/iio/accel/adxl372_i2c.c
@@@ -1044,7 -1035,6 +1044,6 @@@ F:      arch/arm64/boot/dts/amd/amd-seattle-
  F:    drivers/net/ethernet/amd/xgbe/
  
  AMD SENSOR FUSION HUB DRIVER
- M:    Nehal Shah <[email protected]>
  M:    Basavaraj Natikar <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -1079,7 -1069,7 +1078,7 @@@ ANALOG DEVICES INC AD7192 DRIVE
  M:    Alexandru Tachici <[email protected]>
  L:    [email protected]
  S:    Supported
 -W:    http://ez.analog.com/community/linux-device-drivers
 +W:    https://ez.analog.com/linux-software-drivers
  F:    Documentation/devicetree/bindings/iio/adc/adi,ad7192.yaml
  F:    drivers/iio/adc/ad7192.c
  
@@@ -1087,23 -1077,15 +1086,23 @@@ ANALOG DEVICES INC AD7292 DRIVE
  M:    Marcelo Schmitt <[email protected]>
  L:    [email protected]
  S:    Supported
 -W:    http://ez.analog.com/community/linux-device-drivers
 +W:    https://ez.analog.com/linux-software-drivers
  F:    Documentation/devicetree/bindings/iio/adc/adi,ad7292.yaml
  F:    drivers/iio/adc/ad7292.c
  
 +ANALOG DEVICES INC AD7293 DRIVER
 +M:    Antoniu Miclaus <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +W:    https://ez.analog.com/linux-software-drivers
 +F:    Documentation/devicetree/bindings/iio/dac/adi,ad7293.yaml
 +F:    drivers/iio/dac/ad7293.c
 +
  ANALOG DEVICES INC AD7768-1 DRIVER
  M:    Michael Hennerich <[email protected]>
  L:    [email protected]
  S:    Supported
 -W:    http://ez.analog.com/community/linux-device-drivers
 +W:    https://ez.analog.com/linux-software-drivers
  F:    Documentation/devicetree/bindings/iio/adc/adi,ad7768-1.yaml
  F:    drivers/iio/adc/ad7768-1.c
  
@@@ -1112,7 -1094,7 +1111,7 @@@ M:      Michael Hennerich <Michael.Hennerich
  M:    Renato Lui Geh <[email protected]>
  L:    [email protected]
  S:    Supported
 -W:    http://ez.analog.com/community/linux-device-drivers
 +W:    https://ez.analog.com/linux-software-drivers
  F:    Documentation/devicetree/bindings/iio/adc/adi,ad7780.yaml
  F:    drivers/iio/adc/ad7780.c
  
@@@ -1131,14 -1113,6 +1130,14 @@@ L:    [email protected]
  S:    Maintained
  F:    drivers/media/i2c/ad9389b*
  
 +ANALOG DEVICES INC ADA4250 DRIVER
 +M:    Antoniu Miclaus <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +W:    https://ez.analog.com/linux-software-drivers
 +F:    Documentation/devicetree/bindings/iio/amplifiers/adi,ada4250.yaml
 +F:    drivers/iio/amplifiers/ada4250.c
 +
  ANALOG DEVICES INC ADGS1408 DRIVER
  M:    Mircea Caprioru <[email protected]>
  S:    Supported
@@@ -1149,7 -1123,7 +1148,7 @@@ ANALOG DEVICES INC ADIN DRIVE
  M:    Michael Hennerich <[email protected]>
  L:    [email protected]
  S:    Supported
 -W:    http://ez.analog.com/community/linux-device-drivers
 +W:    https://ez.analog.com/linux-software-drivers
  F:    Documentation/devicetree/bindings/net/adi,adin.yaml
  F:    drivers/net/phy/adin.c
  
@@@ -1158,22 -1132,20 +1157,22 @@@ M:   Nuno Sa <[email protected]
  L:    [email protected]
  S:    Supported
  F:    drivers/iio/imu/adis.c
 +F:    drivers/iio/imu/adis_buffer.c
 +F:    drivers/iio/imu/adis_trigger.c
  F:    include/linux/iio/imu/adis.h
  
  ANALOG DEVICES INC ADIS16460 DRIVER
  M:    Dragos Bogdan <[email protected]>
  L:    [email protected]
  S:    Supported
 -W:    http://ez.analog.com/community/linux-device-drivers
 +W:    https://ez.analog.com/linux-software-drivers
  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
 +W:    https://ez.analog.com/linux-software-drivers
  S:    Supported
  F:    drivers/iio/imu/adis16475.c
  F:    Documentation/devicetree/bindings/iio/imu/adi,adis16475.yaml
@@@ -1182,54 -1154,22 +1181,54 @@@ ANALOG DEVICES INC ADM1177 DRIVE
  M:    Michael Hennerich <[email protected]>
  L:    [email protected]
  S:    Supported
 -W:    http://ez.analog.com/community/linux-device-drivers
 +W:    https://ez.analog.com/linux-software-drivers
  F:    Documentation/devicetree/bindings/hwmon/adi,adm1177.yaml
  F:    drivers/hwmon/adm1177.c
  
 +ANALOG DEVICES INC ADMV1013 DRIVER
 +M:    Antoniu Miclaus <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +W:    https://ez.analog.com/linux-software-drivers
 +F:    Documentation/devicetree/bindings/iio/frequency/adi,admv1013.yaml
 +F:    drivers/iio/frequency/admv1013.c
 +
 +ANALOG DEVICES INC ADMV8818 DRIVER
 +M:    Antoniu Miclaus <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +W:    https://ez.analog.com/linux-software-drivers
 +F:    Documentation/devicetree/bindings/iio/filter/adi,admv8818.yaml
 +F:    drivers/iio/filter/admv8818.c
 +
 +ANALOG DEVICES INC ADMV1014 DRIVER
 +M:    Antoniu Miclaus <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +W:    https://ez.analog.com/linux-software-drivers
 +F:    Documentation/devicetree/bindings/iio/frequency/adi,admv1014.yaml
 +F:    drivers/iio/frequency/admv1014.c
 +
  ANALOG DEVICES INC ADP5061 DRIVER
  M:    Michael Hennerich <[email protected]>
  L:    [email protected]
  S:    Supported
 -W:    http://ez.analog.com/community/linux-device-drivers
 +W:    https://ez.analog.com/linux-software-drivers
  F:    drivers/power/supply/adp5061.c
  
 +ANALOG DEVICES INC ADRF6780 DRIVER
 +M:    Antoniu Miclaus <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +W:    https://ez.analog.com/linux-software-drivers
 +F:    Documentation/devicetree/bindings/iio/frequency/adi,adrf6780.yaml
 +F:    drivers/iio/frequency/adrf6780.c
 +
  ANALOG DEVICES INC ADV7180 DRIVER
  M:    Lars-Peter Clausen <[email protected]>
  L:    [email protected]
  S:    Supported
 -W:    http://ez.analog.com/community/linux-device-drivers
 +W:    https://ez.analog.com/linux-software-drivers
  F:    drivers/media/i2c/adv7180.c
  F:    Documentation/devicetree/bindings/media/i2c/adv7180.yaml
  
@@@ -1272,7 -1212,7 +1271,7 @@@ M:      Nuno Sá <[email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
  W:    http://wiki.analog.com/
 -W:    http://ez.analog.com/community/linux-device-drivers
 +W:    https://ez.analog.com/linux-software-drivers
  F:    sound/soc/codecs/ad1*
  F:    sound/soc/codecs/ad7*
  F:    sound/soc/codecs/adau*
@@@ -1283,7 -1223,7 +1282,7 @@@ F:      sound/soc/codecs/ssm
  ANALOG DEVICES INC DMA DRIVERS
  M:    Lars-Peter Clausen <[email protected]>
  S:    Supported
 -W:    http://ez.analog.com/community/linux-device-drivers
 +W:    https://ez.analog.com/linux-software-drivers
  F:    drivers/dma/dma-axi-dmac.c
  
  ANALOG DEVICES INC IIO DRIVERS
@@@ -1291,7 -1231,7 +1290,7 @@@ M:      Lars-Peter Clausen <[email protected]
  M:    Michael Hennerich <[email protected]>
  S:    Supported
  W:    http://wiki.analog.com/
 -W:    http://ez.analog.com/community/linux-device-drivers
 +W:    https://ez.analog.com/linux-software-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,*
@@@ -1326,6 -1266,7 +1325,6 @@@ L:      [email protected]
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
  F:    drivers/android/
 -F:    drivers/staging/android/
  
  ANDROID GOLDFISH PIC DRIVER
  M:    Miodrag Dinic <[email protected]>
@@@ -1447,7 -1388,6 +1446,7 @@@ F:      drivers/media/i2c/aptina-pll.
  
  AQUACOMPUTER D5 NEXT PUMP SENSOR DRIVER
  M:    Aleksa Savic <[email protected]>
 +M:    Jack Doan <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/hwmon/aquacomputer_d5next.rst
@@@ -1835,7 -1775,6 +1834,7 @@@ C:      irc://irc.oftc.net/asahi-de
  T:    git https://github.com/AsahiLinux/linux.git
  F:    Documentation/devicetree/bindings/arm/apple.yaml
  F:    Documentation/devicetree/bindings/arm/apple/*
 +F:    Documentation/devicetree/bindings/clock/apple,nco.yaml
  F:    Documentation/devicetree/bindings/i2c/apple,i2c.yaml
  F:    Documentation/devicetree/bindings/interrupt-controller/apple,*
  F:    Documentation/devicetree/bindings/mailbox/apple,mailbox.yaml
@@@ -1844,7 -1783,6 +1843,7 @@@ F:      Documentation/devicetree/bindings/pi
  F:    Documentation/devicetree/bindings/power/apple*
  F:    Documentation/devicetree/bindings/watchdog/apple,wdt.yaml
  F:    arch/arm64/boot/dts/apple/
 +F:    drivers/clk/clk-apple-nco.c
  F:    drivers/i2c/busses/i2c-pasemi-core.c
  F:    drivers/i2c/busses/i2c-pasemi-platform.c
  F:    drivers/irqchip/irq-apple-aic.c
@@@ -2444,7 -2382,6 +2443,7 @@@ W:      https://github.com/neuschaefer/wpcm4
  F:    Documentation/devicetree/bindings/*/*wpcm*
  F:    arch/arm/boot/dts/nuvoton-wpcm450*
  F:    arch/arm/mach-npcm/wpcm450.c
 +F:    drivers/*/*/*wpcm*
  F:    drivers/*/*wpcm*
  
  ARM/NXP S32G ARCHITECTURE
@@@ -2572,7 -2509,7 +2571,7 @@@ S:      Maintaine
  F:    Documentation/devicetree/bindings/arm/rda.yaml
  F:    Documentation/devicetree/bindings/gpio/gpio-rda.yaml
  F:    Documentation/devicetree/bindings/interrupt-controller/rda,8810pl-intc.txt
 -F:    Documentation/devicetree/bindings/serial/rda,8810pl-uart.txt
 +F:    Documentation/devicetree/bindings/serial/rda,8810pl-uart.yaml
  F:    Documentation/devicetree/bindings/timer/rda,8810pl-timer.txt
  F:    arch/arm/boot/dts/rda8810pl-*
  F:    drivers/clocksource/timer-rda.c
@@@ -2638,14 -2575,13 +2637,14 @@@ F:   sound/soc/rockchip
  N:    rockchip
  
  ARM/SAMSUNG S3C, S5P AND EXYNOS ARM ARCHITECTURES
 -M:    Krzysztof Kozlowski <krzk@kernel.org>
 +M:    Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
  R:    Alim Akhtar <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected]
  S:    Maintained
  C:    irc://irc.libera.chat/linux-exynos
  Q:    https://patchwork.kernel.org/project/linux-samsung-soc/list/
 +B:    mailto:[email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git
  F:    Documentation/arm/samsung/
  F:    Documentation/devicetree/bindings/arm/samsung/
@@@ -3068,14 -3004,6 +3067,14 @@@ S:    Maintaine
  F:    Documentation/devicetree/bindings/net/asix,ax88796c.yaml
  F:    drivers/net/ethernet/asix/ax88796c_*
  
 +ASPEED PECI CONTROLLER
 +M:    Iwona Winiarska <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Supported
 +F:    Documentation/devicetree/bindings/peci/peci-aspeed.yaml
 +F:    drivers/peci/controller/peci-aspeed.c
 +
  ASPEED PINCTRL DRIVERS
  M:    Andrew Jeffery <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -3102,16 -3030,6 +3101,16 @@@ S:    Maintaine
  F:    Documentation/devicetree/bindings/mmc/aspeed,sdhci.yaml
  F:    drivers/mmc/host/sdhci-of-aspeed*
  
 +ASPEED SMC SPI DRIVER
 +M:    Chin-Ting Kuo <[email protected]>
 +M:    Cédric Le Goater <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/spi/aspeed,ast2600-fmc.yaml
 +F:    drivers/spi/spi-aspeed-smc.c
 +
  ASPEED VIDEO ENGINE DRIVER
  M:    Eddie James <[email protected]>
  L:    [email protected]
@@@ -3379,7 -3297,7 +3378,7 @@@ AXI-FAN-CONTROL HARDWARE MONITOR DRIVE
  M:    Nuno Sá <[email protected]>
  L:    [email protected]
  S:    Supported
 -W:    http://ez.analog.com/community/linux-device-drivers
 +W:    https://ez.analog.com/linux-software-drivers
  F:    Documentation/devicetree/bindings/hwmon/adi,axi-fan-control.yaml
  F:    drivers/hwmon/axi-fan-control.c
  
@@@ -3582,9 -3500,8 +3581,9 @@@ M:      Andy Gospodarek <[email protected]
  L:    [email protected]
  S:    Supported
  W:    http://sourceforge.net/projects/bonding/
 +F:    Documentation/networking/bonding.rst
  F:    drivers/net/bonding/
 -F:    include/net/bonding.h
 +F:    include/net/bond*
  F:    include/uapi/linux/if_bonding.h
  
  BOSCH SENSORTEC BMA400 ACCELEROMETER IIO DRIVER
@@@ -3756,7 -3673,7 +3755,7 @@@ F:      include/linux/platform_data/b53.
  
  BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE
  M:    Nicolas Saenz Julienne <[email protected]>
 -L:    [email protected]
 +R:    Broadcom Kernel Team <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
@@@ -3771,7 -3688,7 +3770,7 @@@ BROADCOM BCM281XX/BCM11XXX/BCM216XX AR
  M:    Florian Fainelli <[email protected]>
  M:    Ray Jui <[email protected]>
  M:    Scott Branden <[email protected]>
 -M:    [email protected]
 +R:    Broadcom Kernel Team <[email protected]>
  S:    Maintained
  T:    git git://github.com/broadcom/mach-bcm
  F:    arch/arm/mach-bcm/
@@@ -3791,26 -3708,18 +3790,26 @@@ F:   arch/mips/include/asm/mach-bcm47xx/
  
  BROADCOM BCM4908 ETHERNET DRIVER
  M:    Rafał Miłecki <[email protected]>
 -M:    [email protected]
 +R:    Broadcom Kernel Team <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/net/brcm,bcm4908-enet.yaml
  F:    drivers/net/ethernet/broadcom/bcm4908_enet.*
  F:    drivers/net/ethernet/broadcom/unimac.h
  
 +BROADCOM BCM4908 PINMUX DRIVER
 +M:    Rafał Miłecki <[email protected]>
 +R:    Broadcom Kernel Team <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/pinctrl/brcm,bcm4908-pinctrl.yaml
 +F:    drivers/pinctrl/bcm/pinctrl-bcm4908.c
 +
  BROADCOM BCM5301X ARM ARCHITECTURE
  M:    Florian Fainelli <[email protected]>
  M:    Hauke Mehrtens <[email protected]>
  M:    Rafał Miłecki <[email protected]>
 -M:    [email protected]
 +R:    Broadcom Kernel Team <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/boot/dts/bcm470*
@@@ -3821,7 -3730,7 +3820,7 @@@ F:      arch/arm/mach-bcm/bcm_5301x.
  BROADCOM BCM53573 ARM ARCHITECTURE
  M:    Florian Fainelli <[email protected]>
  M:    Rafał Miłecki <[email protected]>
 -L:    [email protected]
 +R:    Broadcom Kernel Team <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/boot/dts/bcm47189*
@@@ -3829,7 -3738,7 +3828,7 @@@ F:      arch/arm/boot/dts/bcm53573
  
  BROADCOM BCM63XX ARM ARCHITECTURE
  M:    Florian Fainelli <[email protected]>
 -M:    [email protected]
 +R:    Broadcom Kernel Team <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  T:    git git://github.com/broadcom/stblinux.git
@@@ -3843,7 -3752,7 +3842,7 @@@ F:      drivers/usb/gadget/udc/bcm63xx_udc.
  
  BROADCOM BCM7XXX ARM ARCHITECTURE
  M:    Florian Fainelli <[email protected]>
 -M:    [email protected]
 +R:    Broadcom Kernel Team <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  T:    git git://github.com/broadcom/stblinux.git
@@@ -3861,21 -3770,21 +3860,21 @@@ N:   bcm712
  BROADCOM BDC DRIVER
  M:    Al Cooper <[email protected]>
  L:    [email protected]
 -L:    [email protected]
 +R:    Broadcom Kernel Team <[email protected]>
  S:    Maintained
  F:    Documentation/devicetree/bindings/usb/brcm,bdc.yaml
  F:    drivers/usb/gadget/udc/bdc/
  
  BROADCOM BMIPS CPUFREQ DRIVER
  M:    Markus Mayer <[email protected]>
 -M:    [email protected]
 +R:    Broadcom Kernel Team <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/cpufreq/bmips-cpufreq.c
  
  BROADCOM BMIPS MIPS ARCHITECTURE
  M:    Florian Fainelli <[email protected]>
 -L:    [email protected]
 +R:    Broadcom Kernel Team <[email protected]>
  L:    [email protected]
  S:    Maintained
  T:    git git://github.com/broadcom/stblinux.git
@@@ -3926,9 -3835,7 +3925,9 @@@ BROADCOM BNXT_EN 50 GIGABIT ETHERNET DR
  M:    Michael Chan <[email protected]>
  L:    [email protected]
  S:    Supported
 +F:    drivers/firmware/broadcom/tee_bnxt_fw.c
  F:    drivers/net/ethernet/broadcom/bnxt/
 +F:    include/linux/firmware/broadcom/tee_bnxt_fw.h
  
  BROADCOM BRCM80211 IEEE802.11n WIRELESS DRIVER
  M:    Arend van Spriel <[email protected]>
@@@ -3943,53 -3850,53 +3942,53 @@@ F:   drivers/net/wireless/broadcom/brcm80
  BROADCOM BRCMSTB GPIO DRIVER
  M:    Doug Berger <[email protected]>
  M:    Florian Fainelli <[email protected]>
 -L:    [email protected]
 +R:    Broadcom Kernel Team <[email protected]>
  S:    Supported
  F:    Documentation/devicetree/bindings/gpio/brcm,brcmstb-gpio.yaml
  F:    drivers/gpio/gpio-brcmstb.c
  
  BROADCOM BRCMSTB I2C DRIVER
  M:    Kamal Dasu <[email protected]>
 +R:    Broadcom Kernel Team <[email protected]>
  L:    [email protected]
 -L:    [email protected]
  S:    Supported
  F:    Documentation/devicetree/bindings/i2c/brcm,brcmstb-i2c.yaml
  F:    drivers/i2c/busses/i2c-brcmstb.c
  
  BROADCOM BRCMSTB UART DRIVER
  M:    Al Cooper <[email protected]>
 +R:    Broadcom Kernel Team <[email protected]>
  L:    [email protected]
 -L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/serial/brcm,bcm7271-uart.yaml
  F:    drivers/tty/serial/8250/8250_bcm7271.c
  
  BROADCOM BRCMSTB USB EHCI DRIVER
  M:    Al Cooper <[email protected]>
 +R:    Broadcom Kernel Team <[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 USB PIN MAP DRIVER
  M:    Al Cooper <[email protected]>
 +R:    Broadcom Kernel Team <[email protected]>
  L:    [email protected]
 -L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/usb/brcm,usb-pinmap.yaml
  F:    drivers/usb/misc/brcmstb-usb-pinmap.c
  
  BROADCOM BRCMSTB USB2 and USB3 PHY DRIVER
  M:    Al Cooper <[email protected]>
 +R:    Broadcom Kernel Team <[email protected]>
  L:    [email protected]
 -L:    [email protected]
  S:    Maintained
  F:    drivers/phy/broadcom/phy-brcm-usb*
  
  BROADCOM ETHERNET PHY DRIVERS
  M:    Florian Fainelli <[email protected]>
 -L:    [email protected]
 +R:    Broadcom Kernel Team <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    Documentation/devicetree/bindings/net/broadcom-bcm87xx.txt
@@@ -4000,7 -3907,7 +3999,7 @@@ F:      include/linux/brcmphy.
  BROADCOM GENET ETHERNET DRIVER
  M:    Doug Berger <[email protected]>
  M:    Florian Fainelli <[email protected]>
 -L:    [email protected]
 +R:    Broadcom Kernel Team <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    Documentation/devicetree/bindings/net/brcm,bcmgenet.yaml
@@@ -4014,7 -3921,7 +4013,7 @@@ F:      include/linux/platform_data/mdio-bcm
  BROADCOM IPROC ARM ARCHITECTURE
  M:    Ray Jui <[email protected]>
  M:    Scott Branden <[email protected]>
 -M:    [email protected]
 +R:    Broadcom Kernel Team <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  T:    git git://github.com/broadcom/stblinux.git
@@@ -4042,7 -3949,7 +4041,7 @@@ N:      stingra
  
  BROADCOM IPROC GBIT ETHERNET DRIVER
  M:    Rafał Miłecki <[email protected]>
 -M:    [email protected]
 +R:    Broadcom Kernel Team <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/net/brcm,amac.yaml
@@@ -4051,7 -3958,7 +4050,7 @@@ F:      drivers/net/ethernet/broadcom/unimac
  
  BROADCOM KONA GPIO DRIVER
  M:    Ray Jui <[email protected]>
 -L:    [email protected]
 +R:    Broadcom Kernel Team <[email protected]>
  S:    Supported
  F:    Documentation/devicetree/bindings/gpio/brcm,kona-gpio.txt
  F:    drivers/gpio/gpio-bcm-kona.c
@@@ -4084,7 -3991,7 +4083,7 @@@ F:      drivers/firmware/broadcom/
  BROADCOM PMB (POWER MANAGEMENT BUS) DRIVER
  M:    Rafał Miłecki <[email protected]>
  M:    Florian Fainelli <[email protected]>
 -M:    [email protected]
 +R:    Broadcom Kernel Team <[email protected]>
  L:    [email protected]
  S:    Maintained
  T:    git git://github.com/broadcom/stblinux.git
@@@ -4100,7 -4007,7 +4099,7 @@@ F:      include/linux/bcma
  
  BROADCOM SPI DRIVER
  M:    Kamal Dasu <[email protected]>
 -M:    [email protected]
 +R:    Broadcom Kernel Team <[email protected]>
  S:    Maintained
  F:    Documentation/devicetree/bindings/spi/brcm,spi-bcm-qspi.yaml
  F:    drivers/spi/spi-bcm-qspi.*
@@@ -4109,7 -4016,7 +4108,7 @@@ F:      drivers/spi/spi-iproc-qspi.
  
  BROADCOM STB AVS CPUFREQ DRIVER
  M:    Markus Mayer <[email protected]>
 -M:    [email protected]
 +R:    Broadcom Kernel Team <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/cpufreq/brcm,stb-avs-cpu-freq.txt
@@@ -4117,7 -4024,7 +4116,7 @@@ F:      drivers/cpufreq/brcmstb
  
  BROADCOM STB AVS TMON DRIVER
  M:    Markus Mayer <[email protected]>
 -M:    [email protected]
 +R:    Broadcom Kernel Team <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/thermal/brcm,avs-tmon.yaml
@@@ -4125,7 -4032,7 +4124,7 @@@ F:      drivers/thermal/broadcom/brcmstb
  
  BROADCOM STB DPFE DRIVER
  M:    Markus Mayer <[email protected]>
 -M:    [email protected]
 +R:    Broadcom Kernel Team <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    Documentation/devicetree/bindings/memory-controllers/brcm,dpfe-cpu.yaml
@@@ -4134,17 -4041,16 +4133,17 @@@ F:   drivers/memory/brcmstb_dpfe.
  BROADCOM STB NAND FLASH DRIVER
  M:    Brian Norris <[email protected]>
  M:    Kamal Dasu <[email protected]>
 +R:    Broadcom Kernel Team <[email protected]>
  L:    [email protected]
 -L:    [email protected]
  S:    Maintained
  F:    drivers/mtd/nand/raw/brcmnand/
 +F:    include/linux/platform_data/brcmnand.h
  
  BROADCOM STB PCIE DRIVER
  M:    Jim Quinlan <[email protected]>
  M:    Nicolas Saenz Julienne <[email protected]>
  M:    Florian Fainelli <[email protected]>
 -M:    [email protected]
 +R:    Broadcom Kernel Team <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/pci/brcm,stb-pcie.yaml
@@@ -4152,7 -4058,7 +4151,7 @@@ F:      drivers/pci/controller/pcie-brcmstb.
  
  BROADCOM SYSTEMPORT ETHERNET DRIVER
  M:    Florian Fainelli <[email protected]>
 -L:    [email protected]
 +R:    Broadcom Kernel Team <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    drivers/net/ethernet/broadcom/bcmsysport.*
@@@ -4169,7 -4075,7 +4168,7 @@@ F:      drivers/net/ethernet/broadcom/tg3.
  
  BROADCOM VK DRIVER
  M:    Scott Branden <[email protected]>
 -L:    [email protected]
 +R:    Broadcom Kernel Team <[email protected]>
  S:    Supported
  F:    drivers/misc/bcm-vk/
  F:    include/uapi/linux/misc/bcm_vk.h
@@@ -4586,9 -4492,7 +4585,9 @@@ L:      [email protected]
  S:    Maintained
  F:    Documentation/admin-guide/module-signing.rst
  F:    certs/
 +F:    scripts/check-blacklist-hashes.awk
  F:    scripts/sign-file.c
 +F:    tools/certs/
  
  CFAG12864B LCD DRIVER
  M:    Miguel Ojeda <[email protected]>
@@@ -4658,7 -4562,6 +4657,7 @@@ F:      drivers/input/touchscreen/chipone_ic
  
  CHROME HARDWARE PLATFORM SUPPORT
  M:    Benson Leung <[email protected]>
 +L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git
  F:    drivers/platform/chrome/
@@@ -4667,7 -4570,6 +4666,7 @@@ CHROMEOS EC CODEC DRIVE
  M:    Cheng-Yi Chiang <[email protected]>
  M:    Tzung-Bi Shih <[email protected]>
  R:    Guenter Roeck <[email protected]>
 +L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/sound/google,cros-ec-codec.yaml
  F:    sound/soc/codecs/cros_ec_codec.*
@@@ -4675,7 -4577,6 +4674,7 @@@
  CHROMEOS EC SUBDRIVERS
  M:    Benson Leung <[email protected]>
  R:    Guenter Roeck <[email protected]>
 +L:    [email protected]
  S:    Maintained
  F:    drivers/power/supply/cros_usbpd-charger.c
  N:    cros_ec
@@@ -4683,13 -4584,11 +4682,13 @@@ N:   cros-e
  
  CHROMEOS EC USB TYPE-C DRIVER
  M:    Prashant Malani <[email protected]>
 +L:    [email protected]
  S:    Maintained
  F:    drivers/platform/chrome/cros_ec_typec.c
  
  CHROMEOS EC USB PD NOTIFY DRIVER
  M:    Prashant Malani <[email protected]>
 +L:    [email protected]
  S:    Maintained
  F:    drivers/platform/chrome/cros_usbpd_notify.c
  F:    include/linux/platform_data/cros_usbpd_notify.h
@@@ -4809,7 -4708,6 +4808,7 @@@ F:      .clang-forma
  CLANG/LLVM BUILD SUPPORT
  M:    Nathan Chancellor <[email protected]>
  M:    Nick Desaulniers <[email protected]>
 +R:    Tom Rix <[email protected]>
  L:    [email protected]
  S:    Supported
  W:    https://clangbuiltlinux.github.io/
@@@ -5074,7 -4972,6 +5073,7 @@@ COUNTER SUBSYSTE
  M:    William Breathitt Gray <[email protected]>
  L:    [email protected]
  S:    Maintained
 +T:    git [email protected]:vilhelmgray/counter.git
  F:    Documentation/ABI/testing/sysfs-bus-counter
  F:    Documentation/driver-api/generic-counter.rst
  F:    drivers/counter/
@@@ -5181,20 -5078,6 +5180,20 @@@ S:    Supporte
  F:    drivers/cpuidle/cpuidle-psci.h
  F:    drivers/cpuidle/cpuidle-psci-domain.c
  
 +CPUIDLE DRIVER - DT IDLE PM DOMAIN
 +M:    Ulf Hansson <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/cpuidle/dt_idle_genpd.c
 +F:    drivers/cpuidle/dt_idle_genpd.h
 +
 +CPUIDLE DRIVER - RISC-V SBI
 +M:    Anup Patel <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/cpuidle/cpuidle-riscv-sbi.c
 +
  CRAMFS FILESYSTEM
  M:    Nicolas Pitre <[email protected]>
  S:    Maintained
@@@ -5453,7 -5336,6 +5452,7 @@@ F:      net/ax25/sysctl_net_ax25.
  
  DATA ACCESS MONITOR
  M:    SeongJae Park <[email protected]>
 +L:    [email protected]
  L:    [email protected]
  S:    Maintained
  F:    Documentation/ABI/testing/sysfs-kernel-mm-damon
@@@ -5635,15 -5517,6 +5634,15 @@@ S:    Maintaine
  F:    Documentation/hwmon/dps920ab.rst
  F:    drivers/hwmon/pmbus/dps920ab.c
  
 +DELTA NETWORKS TN48M CPLD DRIVERS
 +M:    Robert Marko <[email protected]>
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/gpio/delta,tn48m-gpio.yaml
 +F:    Documentation/devicetree/bindings/mfd/delta,tn48m-cpld.yaml
 +F:    Documentation/devicetree/bindings/reset/delta,tn48m-reset.yaml
 +F:    drivers/gpio/gpio-tn48m.c
 +F:    include/dt-bindings/reset/delta,tn48m-reset.h
 +
  DENALI NAND DRIVER
  L:    [email protected]
  S:    Orphan
@@@ -5735,7 -5608,7 +5734,7 @@@ W:      http://lanana.org/docs/device-list/i
  
  DEVICE RESOURCE MANAGEMENT HELPERS
  M:    Hans de Goede <[email protected]>
 -R:    Matti Vaittinen <ma[email protected].com>
 +R:    Matti Vaittinen <mazziesaccount@gmail.com>
  S:    Maintained
  F:    include/linux/devm-helpers.h
  
@@@ -5921,7 -5794,7 +5920,7 @@@ F:      include/linux/dma-map-ops.
  F:    kernel/dma/
  
  DMA MAPPING BENCHMARK
 -M:    Barry Song <song.bao.hua@hisilicon.com>
 +M:    Xiang Chen <chenxiang66@hisilicon.com>
  L:    [email protected]
  F:    kernel/dma/map_benchmark.c
  F:    tools/testing/selftests/dma/
@@@ -5932,7 -5805,7 +5931,7 @@@ R:      Benjamin Gaignard <benjamin.gaignard
  R:    Liam Mark <[email protected]>
  R:    Laura Abbott <[email protected]>
  R:    Brian Starkey <[email protected]>
 -R:    John Stultz <j[email protected]>
 +R:    John Stultz <j[email protected]>
  L:    [email protected]
  L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
@@@ -6077,7 -5950,6 +6076,7 @@@ F:      drivers/scsi/dpt
  DRBD DRIVER
  M:    Philipp Reisner <[email protected]>
  M:    Lars Ellenberg <[email protected]>
 +M:    Christoph Böhmwalder <[email protected]>
  L:    [email protected]
  S:    Supported
  W:    http://www.drbd.org
@@@ -6570,7 -6442,6 +6569,7 @@@ L:      [email protected]
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos.git
  F:    Documentation/devicetree/bindings/display/exynos/
 +F:    Documentation/devicetree/bindings/display/samsung/
  F:    drivers/gpu/drm/exynos/
  F:    include/uapi/drm/exynos_drm.h
  
@@@ -6602,7 -6473,7 +6601,7 @@@ F:      drivers/gpu/drm/gma500
  DRM DRIVERS FOR HISILICON
  M:    Xinliang Liu <[email protected]>
  M:    Tian Tao  <[email protected]>
 -R:    John Stultz <j[email protected]>
 +R:    John Stultz <j[email protected]>
  R:    Xinwei Kong <[email protected]>
  R:    Chen Feng <[email protected]>
  L:    [email protected]
@@@ -7398,6 -7269,7 +7397,6 @@@ L:      [email protected]
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git for-next/execve
  F:    arch/alpha/kernel/binfmt_loader.c
 -F:    arch/x86/ia32/ia32_aout.c
  F:    fs/*binfmt_*.c
  F:    fs/exec.c
  F:    include/linux/binfmts.h
@@@ -7513,7 -7385,7 +7512,7 @@@ F:      Documentation/hwmon/f71805f.rs
  F:    drivers/hwmon/f71805f.c
  
  FADDR2LINE
 -M:    Josh Poimboeuf <jpoimboe@redhat.com>
 +M:    Josh Poimboeuf <jpoimboe@kernel.org>
  S:    Maintained
  F:    scripts/faddr2line
  
@@@ -8126,7 -7998,7 +8125,7 @@@ M:      Ingo Molnar <[email protected]
  R:    Peter Zijlstra <[email protected]>
  R:    Darren Hart <[email protected]>
  R:    Davidlohr Bueso <[email protected]>
 -R:    André Almeida <andrealmeid@collabora.com>
 +R:    André Almeida <andrealmeid@igalia.com>
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git locking/core
@@@ -8399,7 -8271,7 +8398,7 @@@ M:      Linus Walleij <linus.walleij@linaro.
  M:    Bartosz Golaszewski <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git
  F:    Documentation/ABI/obsolete/sysfs-gpio
  F:    Documentation/ABI/testing/gpio-cdev
  F:    Documentation/admin-guide/gpio/
@@@ -8694,6 -8566,7 +8693,6 @@@ F:      include/linux/cciss*.
  F:    include/uapi/linux/cciss*.h
  
  HFI1 DRIVER
 -M:    Mike Marciniszyn <[email protected]>
  M:    Dennis Dalessandro <[email protected]>
  L:    [email protected]
  S:    Supported
@@@ -8766,6 -8639,14 +8765,14 @@@ F:    drivers/hid/hid-sensor-
  F:    drivers/iio/*/hid-*
  F:    include/linux/hid-sensor-*
  
+ HID WACOM DRIVER
+ M:    Ping Cheng <[email protected]>
+ M:    Jason Gerecke  <[email protected]>
+ L:    [email protected]
+ S:    Maintained
+ F:    drivers/hid/wacom.h
+ F:    drivers/hid/wacom_*
+ 
  HIGH-RESOLUTION TIMERS, CLOCKEVENTS
  M:    Thomas Gleixner <[email protected]>
  L:    [email protected]
@@@ -8862,7 -8743,7 +8869,7 @@@ F:      Documentation/devicetree/bindings/ne
  F:    drivers/net/ethernet/hisilicon/
  
  HIKEY960 ONBOARD USB GPIO HUB DRIVER
 -M:    John Stultz <j[email protected]>
 +M:    John Stultz <j[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/misc/hisi_hikey_usb.c
@@@ -9354,12 -9235,14 +9361,12 @@@ F:   drivers/pci/hotplug/rpaphp
  
  IBM Power SRIOV Virtual NIC Device Driver
  M:    Dany Madden <[email protected]>
 -M:    Sukadev Bhattiprolu <[email protected]>
  R:    Thomas Falcon <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    drivers/net/ethernet/ibm/ibmvnic.*
  
  IBM Power Virtual Accelerator Switchboard
 -M:    Sukadev Bhattiprolu <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    arch/powerpc/include/asm/vas.h
@@@ -9553,12 -9436,6 +9560,12 @@@ M:    Stanislaw Gruszka <[email protected]
  S:    Maintained
  F:    drivers/usb/atm/ueagle-atm.c
  
 +IMAGIS TOUCHSCREEN DRIVER
 +M:    Markuss Broks <[email protected]>
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/input/touchscreen/imagis,ist3038c.yaml
 +F:    drivers/input/touchscreen/imagis.c
 +
  IMGTEC ASCII LCD DRIVER
  M:    Paul Burton <[email protected]>
  S:    Maintained
@@@ -9614,7 -9491,6 +9621,7 @@@ F:      drivers/iio/pressure/dps310.
  
  INFINIBAND SUBSYSTEM
  M:    Jason Gunthorpe <[email protected]>
 +M:    Leon Romanovsky <[email protected]>
  L:    [email protected]
  S:    Supported
  W:    https://github.com/linux-rdma/rdma-core
@@@ -9668,11 -9544,6 +9675,11 @@@ F:    include/linux/mfd/ingenic-tcu.
  F:    sound/soc/codecs/jz47*
  F:    sound/soc/jz4740/
  
 +INJOINIC IP5xxx POWER BANK IC DRIVER
 +M:    Samuel Holland <[email protected]>
 +S:    Maintained
 +F:    drivers/power/supply/ip5xxx_power.c
 +
  INOTIFY
  M:    Jan Kara <[email protected]>
  R:    Amir Goldstein <[email protected]>
@@@ -9876,14 -9747,6 +9883,14 @@@ B:    https://bugzilla.kernel.or
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git
  F:    drivers/idle/intel_idle.c
  
 +INTEL IN FIELD SCAN (IFS) DEVICE
 +M:    Jithu Joseph <[email protected]>
 +R:    Ashok Raj <[email protected]>
 +R:    Tony Luck <[email protected]>
 +S:    Maintained
 +F:    drivers/platform/x86/intel/ifs
 +F:    include/trace/events/intel_ifs.h
 +
  INTEL INTEGRATED SENSOR HUB DRIVER
  M:    Srinivas Pandruvada <[email protected]>
  M:    Jiri Kosina <[email protected]>
@@@ -10118,7 -9981,6 +10125,7 @@@ F:    drivers/firmware/stratix10-rsu.
  F:    drivers/firmware/stratix10-svc.c
  F:    include/linux/firmware/intel/stratix10-smc.h
  F:    include/linux/firmware/intel/stratix10-svc-client.h
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux.git
  
  INTEL TELEMETRY DRIVER
  M:    Rajneesh Bhardwaj <[email protected]>
@@@ -10132,7 -9994,6 +10139,7 @@@ INTEL UNCORE FREQUENCY CONTRO
  M:    Srinivas Pandruvada <[email protected]>
  L:    [email protected]
  S:    Maintained
 +F:    Documentation/admin-guide/pm/intel_uncore_frequency_scaling.rst
  F:    drivers/platform/x86/intel/uncore-frequency/
  
  INTEL VENDOR SPECIFIC EXTENDED CAPABILITIES DRIVER
@@@ -10153,7 -10014,7 +10160,7 @@@ S:   Supporte
  F:    drivers/net/wireless/intel/iwlegacy/
  
  INTEL WIRELESS WIFI LINK (iwlwifi)
 -M:    Luca Coelho <luciano.coelho@intel.com>
 +M:    Gregory Greenman <gregory.greenman@intel.com>
  L:    [email protected]
  S:    Supported
  W:    https://wireless.wiki.kernel.org/en/users/drivers/iwlwifi
@@@ -10262,6 -10123,8 +10269,6 @@@ F:   drivers/net/ethernet/sgi/ioc3-eth.
  IOMAP FILESYSTEM LIBRARY
  M:    Christoph Hellwig <[email protected]>
  M:    Darrick J. Wong <[email protected]>
 -M:    [email protected]
 -M:    [email protected]
  L:    [email protected]
  L:    [email protected]
  S:    Supported
@@@ -10309,7 -10172,6 +10316,7 @@@ M:   Corey Minyard <[email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
  W:    http://openipmi.sourceforge.net/
 +T:    git https://github.com/cminyard/linux-ipmi.git for-next
  F:    Documentation/driver-api/ipmi.rst
  F:    Documentation/devicetree/bindings/ipmi/
  F:    drivers/char/ipmi/
@@@ -10392,7 -10254,6 +10399,7 @@@ F:   include/linux/isapnp.
  ISCSI
  M:    Lee Duncan <[email protected]>
  M:    Chris Leech <[email protected]>
 +M:    Mike Christie <[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
@@@ -10570,7 -10431,6 +10577,7 @@@ M:   Andrey Ryabinin <ryabinin.a.a@gmail.
  R:    Alexander Potapenko <[email protected]>
  R:    Andrey Konovalov <[email protected]>
  R:    Dmitry Vyukov <[email protected]>
 +R:    Vincenzo Frascino <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/dev-tools/kasan.rst
@@@ -10699,9 -10559,9 +10706,9 @@@ F:   tools/testing/selftests
  
  KERNEL SMB3 SERVER (KSMBD)
  M:    Namjae Jeon <[email protected]>
 -M:    Sergey Senozhatsky <[email protected]>
  M:    Steve French <[email protected]>
  M:    Hyunchul Lee <[email protected]>
 +R:    Sergey Senozhatsky <[email protected]>
  L:    [email protected]
  S:    Maintained
  T:    git git://git.samba.org/ksmbd.git
@@@ -10878,15 -10738,6 +10885,15 @@@ S: Supporte
  F:    include/keys/trusted_tee.h
  F:    security/keys/trusted-keys/trusted_tee.c
  
 +KEYS-TRUSTED-CAAM
 +M:    Ahmad Fatoum <[email protected]>
 +R:    Pengutronix Kernel Team <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    include/keys/trusted_caam.h
 +F:    security/keys/trusted-keys/trusted_caam.c
 +
  KEYS/KEYRINGS
  M:    David Howells <[email protected]>
  M:    Jarkko Sakkinen <[email protected]>
@@@ -11183,6 -11034,17 +11190,6 @@@ F:  drivers/ata
  F:    include/linux/ata.h
  F:    include/linux/libata.h
  
 -LIBNVDIMM BLK: MMIO-APERTURE DRIVER
 -M:    Dan Williams <[email protected]>
 -M:    Vishal Verma <[email protected]>
 -M:    Dave Jiang <[email protected]>
 -L:    [email protected]
 -S:    Supported
 -Q:    https://patchwork.kernel.org/project/linux-nvdimm/list/
 -P:    Documentation/nvdimm/maintainer-entry-profile.rst
 -F:    drivers/nvdimm/blk.c
 -F:    drivers/nvdimm/region_devs.c
 -
  LIBNVDIMM BTT: BLOCK TRANSLATION TABLE
  M:    Vishal Verma <[email protected]>
  M:    Dan Williams <[email protected]>
@@@ -11242,7 -11104,7 +11249,7 @@@ F:   scripts/spdxcheck.p
  
  LINEAR RANGES HELPERS
  M:    Mark Brown <[email protected]>
 -R:    Matti Vaittinen <ma[email protected].com>
 +R:    Matti Vaittinen <mazziesaccount@gmail.com>
  F:    lib/linear_ranges.c
  F:    lib/test_linear_ranges.c
  F:    include/linux/linear_range.h
@@@ -11379,7 -11241,7 +11386,7 @@@ F:   drivers/mmc/host/litex_mmc.
  N:    litex
  
  LIVE PATCHING
 -M:    Josh Poimboeuf <jpoimboe@redhat.com>
 +M:    Josh Poimboeuf <jpoimboe@kernel.org>
  M:    Jiri Kosina <[email protected]>
  M:    Miroslav Benes <[email protected]>
  M:    Petr Mladek <[email protected]>
@@@ -11523,20 -11385,11 +11530,20 @@@ S:        Maintaine
  F:    Documentation/devicetree/bindings/iio/dac/lltc,ltc1660.yaml
  F:    drivers/iio/dac/ltc1660.c
  
 +LTC2688 IIO DAC DRIVER
 +M:    Nuno Sá <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +W:    http://ez.analog.com/community/linux-device-drivers
 +F:    Documentation/ABI/testing/sysfs-bus-iio-dac-ltc2688
 +F:    Documentation/devicetree/bindings/iio/dac/adi,ltc2688.yaml
 +F:    drivers/iio/dac/ltc2688.c
 +
  LTC2947 HARDWARE MONITOR DRIVER
  M:    Nuno Sá <[email protected]>
  L:    [email protected]
  S:    Supported
 -W:    http://ez.analog.com/community/linux-device-drivers
 +W:    https://ez.analog.com/linux-software-drivers
  F:    Documentation/devicetree/bindings/hwmon/adi,ltc2947.yaml
  F:    drivers/hwmon/ltc2947-core.c
  F:    drivers/hwmon/ltc2947-i2c.c
@@@ -11547,7 -11400,7 +11554,7 @@@ LTC2983 IIO TEMPERATURE DRIVE
  M:    Nuno Sá <[email protected]>
  L:    [email protected]
  S:    Supported
 -W:    http://ez.analog.com/community/linux-device-drivers
 +W:    https://ez.analog.com/linux-software-drivers
  F:    Documentation/devicetree/bindings/iio/temperature/adi,ltc2983.yaml
  F:    drivers/iio/temperature/ltc2983.c
  
@@@ -11562,7 -11415,7 +11569,7 @@@ LTC4306 I2C MULTIPLEXER DRIVE
  M:    Michael Hennerich <[email protected]>
  L:    [email protected]
  S:    Supported
 -W:    http://ez.analog.com/community/linux-device-drivers
 +W:    https://ez.analog.com/linux-software-drivers
  F:    Documentation/devicetree/bindings/i2c/i2c-mux-ltc4306.txt
  F:    drivers/i2c/muxes/i2c-mux-ltc4306.c
  
@@@ -11717,13 -11570,6 +11724,13 @@@ F: Documentation/devicetree/bindings/ph
  F:    drivers/phy/marvell/phy-mvebu-a3700-comphy.c
  F:    drivers/phy/marvell/phy-mvebu-a3700-utmi.c
  
 +MARVELL ARMADA 3700 SERIAL DRIVER
 +M:    Pali Rohár <[email protected]>
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/clock/marvell,armada-3700-uart-clock.yaml
 +F:    Documentation/devicetree/bindings/serial/mvebu-uart.txt
 +F:    drivers/tty/serial/mvebu-uart.c
 +
  MARVELL ARMADA DRM SUPPORT
  M:    Russell King <[email protected]>
  S:    Maintained
@@@ -11859,7 -11705,7 +11866,7 @@@ MARVELL XENON MMC/SD/SDIO HOST CONTROLL
  M:    Hu Ziji <[email protected]>
  L:    [email protected]
  S:    Supported
 -F:    Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.txt
 +F:    Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml
  F:    drivers/mmc/host/sdhci-xenon*
  
  MATROX FRAMEBUFFER DRIVER
@@@ -11939,7 -11785,7 +11946,7 @@@ F:   drivers/iio/proximity/mb1232.
  
  MAXIM MAX17040 FAMILY FUEL GAUGE DRIVERS
  R:    Iskren Chernev <[email protected]>
 -R:    Krzysztof Kozlowski <krzk@kernel.org>
 +R:    Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
  R:    Marek Szyprowski <[email protected]>
  R:    Matheus Castello <[email protected]>
  L:    [email protected]
@@@ -11949,7 -11795,7 +11956,7 @@@ F:   drivers/power/supply/max17040_batter
  
  MAXIM MAX17042 FAMILY FUEL GAUGE DRIVERS
  R:    Hans de Goede <[email protected]>
 -R:    Krzysztof Kozlowski <krzk@kernel.org>
 +R:    Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
  R:    Marek Szyprowski <[email protected]>
  R:    Sebastian Krzyszkowiak <[email protected]>
  R:    Purism Kernel Team <[email protected]>
@@@ -11979,13 -11825,6 +11986,13 @@@ F: drivers/power/supply/max77650-charge
  F:    drivers/regulator/max77650-regulator.c
  F:    include/linux/mfd/max77650.h
  
 +MAXIM MAX77714 PMIC MFD DRIVER
 +M:    Luca Ceresoli <[email protected]>
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/mfd/maxim,max77714.yaml
 +F:    drivers/mfd/max77714.c
 +F:    include/linux/mfd/max77714.h
 +
  MAXIM MAX77802 PMIC REGULATOR DEVICE DRIVER
  M:    Javier Martinez Canillas <[email protected]>
  L:    [email protected]
@@@ -12001,26 -11840,22 +12008,26 @@@ F:        Documentation/devicetree/bindings/po
  F:    drivers/power/supply/max77976_charger.c
  
  MAXIM MUIC CHARGER DRIVERS FOR EXYNOS BASED BOARDS
 -M:    Krzysztof Kozlowski <krzk@kernel.org>
 +M:    Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
  M:    Bartlomiej Zolnierkiewicz <[email protected]>
  L:    [email protected]
  S:    Supported
 +B:    mailto:[email protected]
  F:    Documentation/devicetree/bindings/power/supply/maxim,max14577.yaml
 +F:    Documentation/devicetree/bindings/power/supply/maxim,max77693.yaml
  F:    drivers/power/supply/max14577_charger.c
  F:    drivers/power/supply/max77693_charger.c
  
  MAXIM PMIC AND MUIC DRIVERS FOR EXYNOS BASED BOARDS
  M:    Chanwoo Choi <[email protected]>
 -M:    Krzysztof Kozlowski <krzk@kernel.org>
 +M:    Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
  M:    Bartlomiej Zolnierkiewicz <[email protected]>
  L:    [email protected]
  S:    Supported
 +B:    mailto:[email protected]
  F:    Documentation/devicetree/bindings/*/maxim,max14577.yaml
  F:    Documentation/devicetree/bindings/*/maxim,max77686.yaml
 +F:    Documentation/devicetree/bindings/*/maxim,max77693.yaml
  F:    Documentation/devicetree/bindings/*/maxim,max77843.yaml
  F:    Documentation/devicetree/bindings/clock/maxim,max77686.txt
  F:    Documentation/devicetree/bindings/mfd/max77693.txt
@@@ -12437,7 -12272,7 +12444,7 @@@ F:   drivers/mmc/host/mtk-sd.
  
  MEDIATEK MT76 WIRELESS LAN DRIVER
  M:    Felix Fietkau <[email protected]>
 -M:    Lorenzo Bianconi <lorenzo[email protected]>
 +M:    Lorenzo Bianconi <lorenzo@kernel.org>
  M:    Ryder Lee <[email protected]>
  R:    Shayne Chen <[email protected]>
  R:    Sean Wang <[email protected]>
@@@ -12705,13 -12540,11 +12712,13 @@@ S:        Maintaine
  F:    Documentation/core-api/boot-time-mm.rst
  F:    include/linux/memblock.h
  F:    mm/memblock.c
 +F:    tools/testing/memblock/
  
  MEMORY CONTROLLER DRIVERS
 -M:    Krzysztof Kozlowski <krzk@kernel.org>
 +M:    Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
  L:    [email protected]
  S:    Maintained
 +B:    mailto:[email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git
  F:    Documentation/devicetree/bindings/memory-controllers/
  F:    drivers/memory/
@@@ -13565,21 -13398,12 +13572,21 @@@ M:        Samuel Mendoza-Jonas <sam@mendozajon
  S:    Maintained
  F:    net/ncsi/
  
 -NCT6775 HARDWARE MONITOR DRIVER
 +NCT6775 HARDWARE MONITOR DRIVER - CORE & PLATFORM DRIVER
  M:    Guenter Roeck <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/hwmon/nct6775.rst
 -F:    drivers/hwmon/nct6775.c
 +F:    drivers/hwmon/nct6775-core.c
 +F:    drivers/hwmon/nct6775-platform.c
 +F:    drivers/hwmon/nct6775.h
 +
 +NCT6775 HARDWARE MONITOR DRIVER - I2C DRIVER
 +M:    Zev Weiss <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/hwmon/nuvoton,nct6775.yaml
 +F:    drivers/hwmon/nct6775-i2c.c
  
  NETDEVSIM
  M:    Jakub Kicinski <[email protected]>
@@@ -13669,7 -13493,6 +13676,7 @@@ F:   net/core/drop_monitor.
  
  NETWORKING DRIVERS
  M:    "David S. Miller" <[email protected]>
 +M:    Eric Dumazet <[email protected]>
  M:    Jakub Kicinski <[email protected]>
  M:    Paolo Abeni <[email protected]>
  L:    [email protected]
@@@ -13717,7 -13540,6 +13724,7 @@@ F:   tools/testing/selftests/drivers/net/
  
  NETWORKING [GENERAL]
  M:    "David S. Miller" <[email protected]>
 +M:    Eric Dumazet <[email protected]>
  M:    Jakub Kicinski <[email protected]>
  M:    Paolo Abeni <[email protected]>
  L:    [email protected]
@@@ -13727,7 -13549,6 +13734,7 @@@ B:   mailto:[email protected]
  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/networking/
 +F:    Documentation/process/maintainer-netdev.rst
  F:    include/linux/in.h
  F:    include/linux/net.h
  F:    include/linux/netdevice.h
@@@ -13864,11 -13685,10 +13871,11 @@@ F:        include/uapi/linux/nexthop.
  F:    net/ipv4/nexthop.c
  
  NFC SUBSYSTEM
 -M:    Krzysztof Kozlowski <krzk@kernel.org>
 +M:    Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
  L:    [email protected] (subscribers-only)
  L:    [email protected]
  S:    Maintained
 +B:    mailto:[email protected]
  F:    Documentation/devicetree/bindings/net/nfc/
  F:    drivers/nfc/
  F:    include/linux/platform_data/nfcmrvl.h
@@@ -14143,10 -13963,7 +14150,10 @@@ M: Abel Vesa <[email protected]
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git clk/imx
 +F:    Documentation/devicetree/bindings/clock/imx*
  F:    drivers/clk/imx/
 +F:    include/dt-bindings/clock/imx*
  
  NXP i.MX 8MQ DCSS DRIVER
  M:    Laurentiu Palcu <[email protected]>
@@@ -14182,7 -13999,7 +14189,7 @@@ F:   Documentation/devicetree/bindings/re
  F:    drivers/regulator/pf8x00-regulator.c
  
  NXP PTN5150A CC LOGIC AND EXTCON DRIVER
 -M:    Krzysztof Kozlowski <krzk@kernel.org>
 +M:    Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/extcon/extcon-ptn5150.yaml
@@@ -14264,7 -14081,7 +14271,7 @@@ F:   lib/objagg.
  F:    lib/test_objagg.c
  
  OBJTOOL
 -M:    Josh Poimboeuf <jpoimboe@redhat.com>
 +M:    Josh Poimboeuf <jpoimboe@kernel.org>
  M:    Peter Zijlstra <[email protected]>
  S:    Supported
  F:    tools/objtool/
@@@ -14412,6 -14229,7 +14419,6 @@@ F:   arch/arm/*omap*/*pm
  F:    drivers/cpufreq/omap-cpufreq.c
  
  OMAP POWERDOMAIN SOC ADAPTATION LAYER SUPPORT
 -M:    Rajendra Nayak <[email protected]>
  M:    Paul Walmsley <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -14696,14 -14514,9 +14703,14 @@@ L: [email protected]
  S:    Maintained
  F:    drivers/char/hw_random/optee-rng.c
  
 +OP-TEE RTC DRIVER
 +M:    Clément Léger <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/rtc/rtc-optee.c
 +
  OPA-VNIC DRIVER
  M:    Dennis Dalessandro <[email protected]>
 -M:    Mike Marciniszyn <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    drivers/infiniband/ulp/opa_vnic
@@@ -14734,7 -14547,6 +14741,7 @@@ F:   scripts/dtc
  
  OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS
  M:    Rob Herring <[email protected]>
 +M:    Krzysztof Kozlowski <[email protected]>
  L:    [email protected]
  S:    Maintained
  C:    irc://irc.libera.chat/devicetree
@@@ -15133,7 -14945,6 +15140,7 @@@ F:   drivers/pci/controller/mobiveil/pcie
  
  PCI DRIVER FOR MVEBU (Marvell Armada 370 and Armada XP SOC support)
  M:    Thomas Petazzoni <[email protected]>
 +M:    Pali Rohár <[email protected]>
  L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
@@@ -15441,24 -15252,6 +15448,24 @@@ L: [email protected]
  S:    Maintained
  F:    drivers/platform/x86/peaq-wmi.c
  
 +PECI HARDWARE MONITORING DRIVERS
 +M:    Iwona Winiarska <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    Documentation/hwmon/peci-cputemp.rst
 +F:    Documentation/hwmon/peci-dimmtemp.rst
 +F:    drivers/hwmon/peci/
 +
 +PECI SUBSYSTEM
 +M:    Iwona Winiarska <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Supported
 +F:    Documentation/devicetree/bindings/peci/
 +F:    Documentation/peci/
 +F:    drivers/peci/
 +F:    include/linux/peci-cpu.h
 +F:    include/linux/peci.h
 +
  PENSANDO ETHERNET DRIVERS
  M:    Shannon Nelson <[email protected]>
  M:    [email protected]
@@@ -15514,8 -15307,7 +15521,8 @@@ F:   tools/perf
  PERFORMANCE EVENTS TOOLING ARM64
  R:    John Garry <[email protected]>
  R:    Will Deacon <[email protected]>
 -R:    Mathieu Poirier <[email protected]>
 +R:    James Clark <[email protected]>
 +R:    Mike Leach <[email protected]>
  R:    Leo Yan <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
@@@ -15647,7 -15439,7 +15654,7 @@@ F:   drivers/pinctrl/renesas
  
  PIN CONTROLLER - SAMSUNG
  M:    Tomasz Figa <[email protected]>
 -M:    Krzysztof Kozlowski <krzk@kernel.org>
 +M:    Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
  M:    Sylwester Nawrocki <[email protected]>
  R:    Alim Akhtar <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -15655,7 -15447,6 +15662,7 @@@ L:   [email protected]
  S:    Maintained
  C:    irc://irc.libera.chat/linux-exynos
  Q:    https://patchwork.kernel.org/project/linux-samsung-soc/list/
 +B:    mailto:[email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git
  F:    Documentation/devicetree/bindings/pinctrl/samsung,pinctrl*yaml
  F:    drivers/pinctrl/samsung/
@@@ -15674,16 -15465,6 +15681,16 @@@ M: Lakshmi Sowjanya D <lakshmi.sowjanya
  S:    Supported
  F:    drivers/pinctrl/pinctrl-thunderbay.c
  
 +PIN CONTROLLER - SUNPLUS / TIBBO
 +M:    Dvorkin Dmitry <[email protected]>
 +M:    Wells Lu <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +W:    https://sunplus.atlassian.net/wiki/spaces/doc/overview
 +F:    Documentation/devicetree/bindings/pinctrl/sunplus,*
 +F:    drivers/pinctrl/sunplus/
 +F:    include/dt-bindings/pinctrl/sppctl*.h
 +
  PKTCDVD DRIVER
  M:    [email protected]
  S:    Orphan
@@@ -16007,6 -15788,7 +16014,6 @@@ F:   arch/*/ptrace*.
  F:    include/asm-generic/syscall.h
  F:    include/linux/ptrace.h
  F:    include/linux/regset.h
 -F:    include/linux/tracehook.h
  F:    include/uapi/linux/ptrace.h
  F:    include/uapi/linux/ptrace.h
  F:    kernel/ptrace.c
@@@ -16123,14 -15905,6 +16130,14 @@@ F: sound/soc/codecs/wcd-clsh-v2.
  F:    sound/soc/codecs/wsa881x.c
  F:    sound/soc/qcom/
  
 +QCOM EMBEDDED USB DEBUGGER (EUD)
 +M:    Souradeep Chowdhury <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/ABI/testing/sysfs-driver-eud
 +F:    Documentation/devicetree/bindings/soc/qcom/qcom,eud.yaml
 +F:    drivers/usb/misc/qcom_eud.c
 +
  QCOM IPA DRIVER
  M:    Alex Elder <[email protected]>
  L:    [email protected]
@@@ -16147,6 -15921,7 +16154,6 @@@ F:   include/uapi/linux/qemu_fw_cfg.
  
  QIB DRIVER
  M:    Dennis Dalessandro <[email protected]>
 -M:    Mike Marciniszyn <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    drivers/infiniband/hw/qib/
@@@ -16325,15 -16100,14 +16332,15 @@@ M:        Niklas Cassel <[email protected]
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/devicetree/bindings/power/avs/qcom,cpr.txt
 +F:    Documentation/devicetree/bindings/power/avs/qcom,cpr.yaml
  F:    drivers/soc/qcom/cpr.c
  
  QUALCOMM CPUFREQ DRIVER MSM8996/APQ8096
  M:    Ilia Lin <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/devicetree/bindings/opp/qcom-nvmem-cpufreq.txt
 +F:    Documentation/devicetree/bindings/cpufreq/qcom-cpufreq-nvmem.yaml
 +F:    Documentation/devicetree/bindings/opp/opp-v2-kryo-cpu.yaml
  F:    drivers/cpufreq/qcom-cpufreq-nvmem.c
  
  QUALCOMM CRYPTO DRIVERS
@@@ -16366,9 -16140,8 +16373,9 @@@ F:   drivers/misc/fastrpc.
  F:    include/uapi/misc/fastrpc.h
  
  QUALCOMM HEXAGON ARCHITECTURE
 -M:    Brian Cain <bcain@codeaurora.org>
 +M:    Brian Cain <bcain@quicinc.com>
  L:    [email protected]
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/bcain/linux.git
  S:    Supported
  F:    arch/hexagon/
  
@@@ -16543,13 -16316,6 +16550,13 @@@ L: [email protected]
  S:    Maintained
  F:    arch/mips/ralink
  
 +RALINK MT7621 MIPS ARCHITECTURE
 +M:    Arınç ÜNAL <[email protected]>
 +M:    Sergio Paracuellos <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    arch/mips/boot/dts/ralink/mt7621*
 +
  RALINK RT2X00 WIRELESS LAN DRIVER
  M:    Stanislaw Gruszka <[email protected]>
  M:    Helmut Schaa <[email protected]>
@@@ -16664,6 -16430,7 +16671,6 @@@ F:   drivers/net/ethernet/rdc/r6040.
  
  RDMAVT - RDMA verbs software
  M:    Dennis Dalessandro <[email protected]>
 -M:    Mike Marciniszyn <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    drivers/infiniband/sw/rdmavt
@@@ -17058,7 -16825,8 +17065,7 @@@ S:   Odd Fixe
  F:    drivers/tty/serial/rp2.*
  
  ROHM BD99954 CHARGER IC
 -R:    Matti Vaittinen <[email protected]>
 -L:    [email protected]
 +R:    Matti Vaittinen <[email protected]>
  S:    Supported
  F:    drivers/power/supply/bd99954-charger.c
  F:    drivers/power/supply/bd99954-charger.h
@@@ -17074,14 -16842,15 +17081,14 @@@ M:        Marek Vasut <marek.vasut+renesas@gma
  L:    [email protected]
  L:    [email protected]
  S:    Supported
 -F:    Documentation/devicetree/bindings/mfd/bd9571mwv.txt
 +F:    Documentation/devicetree/bindings/mfd/rohm,bd9571mwv.yaml
  F:    drivers/gpio/gpio-bd9571mwv.c
  F:    drivers/mfd/bd9571mwv.c
  F:    drivers/regulator/bd9571mwv-regulator.c
  F:    include/linux/mfd/bd9571mwv.h
  
  ROHM POWER MANAGEMENT IC DEVICE DRIVERS
 -R:    Matti Vaittinen <[email protected]>
 -L:    [email protected]
 +R:    Matti Vaittinen <[email protected]>
  S:    Supported
  F:    drivers/clk/clk-bd718x7.c
  F:    drivers/gpio/gpio-bd71815.c
@@@ -17323,7 -17092,7 +17330,7 @@@ W:   http://www.ibm.com/developerworks/li
  F:    drivers/s390/scsi/zfcp_*
  
  S3C ADC BATTERY DRIVER
 -M:    Krzysztof Kozlowski <krzk@kernel.org>
 +M:    Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
  L:    [email protected]
  S:    Odd Fixes
  F:    drivers/power/supply/s3c_adc_battery.c
@@@ -17368,16 -17137,15 +17375,16 @@@ F:        Documentation/admin-guide/LSM/SafeSe
  F:    security/safesetid/
  
  SAMSUNG AUDIO (ASoC) DRIVERS
 -M:    Krzysztof Kozlowski <krzk@kernel.org>
 +M:    Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
  M:    Sylwester Nawrocki <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
 +B:    mailto:[email protected]
  F:    Documentation/devicetree/bindings/sound/samsung*
  F:    sound/soc/samsung/
  
  SAMSUNG EXYNOS PSEUDO RANDOM NUMBER GENERATOR (RNG) DRIVER
 -M:    Krzysztof Kozlowski <krzk@kernel.org>
 +M:    Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
@@@ -17412,12 -17180,11 +17419,12 @@@ S:        Maintaine
  F:    drivers/platform/x86/samsung-laptop.c
  
  SAMSUNG MULTIFUNCTION PMIC DEVICE DRIVERS
 -M:    Krzysztof Kozlowski <krzk@kernel.org>
 +M:    Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
  M:    Bartlomiej Zolnierkiewicz <[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Supported
 +B:    mailto:[email protected]
  F:    Documentation/devicetree/bindings/clock/samsung,s2mps11.yaml
  F:    Documentation/devicetree/bindings/mfd/samsung,s2m*.yaml
  F:    Documentation/devicetree/bindings/mfd/samsung,s5m*.yaml
@@@ -17439,7 -17206,7 +17446,7 @@@ F:   drivers/media/platform/samsung/s3c-c
  F:    include/media/drv-intf/s3c_camif.h
  
  SAMSUNG S3FWRN5 NFC DRIVER
 -M:    Krzysztof Kozlowski <krzk@kernel.org>
 +M:    Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
  M:    Krzysztof Opasiak <[email protected]>
  L:    [email protected] (subscribers-only)
  S:    Maintained
@@@ -17461,7 -17228,7 +17468,7 @@@ S:   Supporte
  F:    drivers/media/i2c/s5k5baf.c
  
  SAMSUNG S5P Security SubSystem (SSS) DRIVER
 -M:    Krzysztof Kozlowski <krzk@kernel.org>
 +M:    Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
  M:    Vladimir Zapolskiy <[email protected]>
  L:    [email protected]
  L:    [email protected]
@@@ -17496,7 -17263,7 +17503,7 @@@ F:   include/linux/clk/samsung.
  F:    include/linux/platform_data/clk-s3c2410.h
  
  SAMSUNG SPI DRIVERS
 -M:    Krzysztof Kozlowski <krzk@kernel.org>
 +M:    Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
  M:    Andi Shyti <[email protected]>
  L:    [email protected]
  L:    [email protected]
@@@ -17514,7 -17281,7 +17521,7 @@@ F:   drivers/net/ethernet/samsung/sxgbe
  
  SAMSUNG THERMAL DRIVER
  M:    Bartlomiej Zolnierkiewicz <[email protected]>
 -M:    Krzysztof Kozlowski <krzk@kernel.org>
 +M:    Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
@@@ -17525,7 -17292,7 +17532,7 @@@ SAMSUNG USB2 PHY DRIVE
  M:    Sylwester Nawrocki <[email protected]>
  L:    [email protected]
  S:    Supported
 -F:    Documentation/devicetree/bindings/phy/samsung-phy.txt
 +F:    Documentation/devicetree/bindings/phy/samsung,usb2-phy.yaml
  F:    Documentation/driver-api/phy/samsung-usb2.rst
  F:    drivers/phy/samsung/phy-exynos4210-usb2.c
  F:    drivers/phy/samsung/phy-exynos4x12-usb2.c
@@@ -17555,7 -17322,6 +17562,7 @@@ R:   Steven Rostedt <[email protected]
  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)
 +R:    Valentin Schneider <[email protected]> (TOPOLOGY)
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git sched/core
@@@ -17699,8 -17465,8 +17706,8 @@@ K:   \bTIF_SECCOMP\
  
  SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) Broadcom BRCMSTB DRIVER
  M:    Al Cooper <[email protected]>
 +R:    Broadcom Kernel Team <[email protected]>
  L:    [email protected]
 -L:    [email protected]
  S:    Maintained
  F:    drivers/mmc/host/sdhci-brcmstb*
  
@@@ -18030,7 -17796,6 +18037,7 @@@ F:   drivers/platform/x86/touchscreen_dmi
  SILICON LABS WIRELESS DRIVERS (for WFxxx series)
  M:    Jérôme Pouiller <[email protected]>
  S:    Supported
 +F:    Documentation/devicetree/bindings/staging/net/wireless/silabs,wfx.yaml
  F:    drivers/staging/wfx/
  
  SILICON MOTION SM712 FRAME BUFFER DRIVER
@@@ -18809,12 -18574,12 +18816,12 @@@ M:        Ion Badulescu <[email protected]
  S:    Odd Fixes
  F:    drivers/net/ethernet/adaptec/starfire*
  
 -STARFIVE JH7100 CLOCK DRIVER
 +STARFIVE JH7100 CLOCK DRIVERS
  M:    Emil Renner Berthing <[email protected]>
  S:    Maintained
 -F:    Documentation/devicetree/bindings/clock/starfive,jh7100-clkgen.yaml
 -F:    drivers/clk/starfive/clk-starfive-jh7100.c
 -F:    include/dt-bindings/clock/starfive-jh7100.h
 +F:    Documentation/devicetree/bindings/clock/starfive,jh7100-*.yaml
 +F:    drivers/clk/starfive/clk-starfive-jh7100*
 +F:    include/dt-bindings/clock/starfive-jh7100*.h
  
  STARFIVE JH7100 PINCTRL DRIVER
  M:    Emil Renner Berthing <[email protected]>
@@@ -18833,7 -18598,7 +18840,7 @@@ F:   include/dt-bindings/reset/starfive-j
  
  STATIC BRANCH/CALL
  M:    Peter Zijlstra <[email protected]>
 -M:    Josh Poimboeuf <jpoimboe@redhat.com>
 +M:    Josh Poimboeuf <jpoimboe@kernel.org>
  M:    Jason Baron <[email protected]>
  R:    Steven Rostedt <[email protected]>
  R:    Ard Biesheuvel <[email protected]>
@@@ -18917,12 -18682,6 +18924,12 @@@ L: [email protected]
  S:    Maintained
  F:    drivers/net/ethernet/dlink/sundance.c
  
 +SUNPLUS OCOTP DRIVER
 +M:    Vincent Shih <[email protected]>
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/nvmem/sunplus,sp7021-ocotp.yaml
 +F:    drivers/nvmem/sunplus-ocotp.c
 +
  SUNPLUS RTC DRIVER
  M:    Vincent Shih <[email protected]>
  L:    [email protected]
@@@ -18937,12 -18696,6 +18944,12 @@@ S: Maintaine
  F:    Documentation/devicetree/bindings/spi/spi-sunplus-sp7021.yaml
  F:    drivers/spi/spi-sunplus-sp7021.c
  
 +SUNPLUS UART DRIVER
 +M:    Hammer Hsieh <[email protected]>
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/serial/sunplus,sp7021-uart.yaml
 +F:    drivers/tty/serial/sunplus-uart.c
 +
  SUPERH
  M:    Yoshinori Sato <[email protected]>
  M:    Rich Felker <[email protected]>
@@@ -19112,7 -18865,6 +19119,7 @@@ SYNOPSYS DESIGNWARE I2C DRIVE
  M:    Jarkko Nikula <[email protected]>
  R:    Andy Shevchenko <[email protected]>
  R:    Mika Westerberg <[email protected]>
 +R:    Jan Dabros <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/i2c/busses/i2c-designware-*
@@@ -19834,7 -19586,7 +19841,7 @@@ F:   drivers/net/wireless/ti
  F:    include/linux/wl12xx.h
  
  TIMEKEEPING, CLOCKSOURCE CORE, NTP, ALARMTIMER
 -M:    John Stultz <j[email protected]>
 +M:    John Stultz <j[email protected]>
  M:    Thomas Gleixner <[email protected]>
  R:    Stephen Boyd <[email protected]>
  L:    [email protected]
@@@ -19881,7 -19633,6 +19888,7 @@@ F:   drivers/media/usb/tm6000
  TMIO/SDHI MMC DRIVER
  M:    Wolfram Sang <[email protected]>
  L:    [email protected]
 +L:    [email protected]
  S:    Supported
  F:    drivers/mmc/host/renesas_sdhi*
  F:    drivers/mmc/host/tmio_mmc*
@@@ -19891,7 -19642,6 +19898,7 @@@ TMP401 HARDWARE MONITOR DRIVE
  M:    Guenter Roeck <[email protected]>
  L:    [email protected]
  S:    Maintained
 +F:    Documentation/devicetree/bindings/hwmon/ti,tmp401.yaml
  F:    Documentation/hwmon/tmp401.rst
  F:    drivers/hwmon/tmp401.c
  
@@@ -20143,11 -19893,6 +20150,11 @@@ W: http://linuxtv.or
  T:    git git://linuxtv.org/media_tree.git
  F:    drivers/media/pci/tw686x/
  
 +U-BOOT ENVIRONMENT VARIABLES
 +M:    Rafał Miłecki <[email protected]>
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/nvmem/u-boot,env.yaml
 +
  UACCE ACCELERATOR FRAMEWORK
  M:    Zhangfei Gao <[email protected]>
  M:    Zhou Wang <[email protected]>
@@@ -20250,7 -19995,6 +20257,7 @@@ R:   Alim Akhtar <[email protected]
  R:    Avri Altman <[email protected]>
  L:    [email protected]
  S:    Supported
 +F:    Documentation/devicetree/bindings/ufs/
  F:    Documentation/scsi/ufs.rst
  F:    drivers/scsi/ufs/
  
@@@ -20621,15 -20365,14 +20628,15 @@@ F:        Documentation/admin-guide/media/zr36
  F:    drivers/media/usb/zr364xx/
  
  USER-MODE LINUX (UML)
 -M:    Jeff Dike <[email protected]>
  M:    Richard Weinberger <[email protected]>
  M:    Anton Ivanov <[email protected]>
 +M:    Johannes Berg <[email protected]>
  L:    [email protected]
  S:    Maintained
  W:    http://user-mode-linux.sourceforge.net
  Q:    https://patchwork.ozlabs.org/project/linux-um/list/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git next
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git fixes
  F:    Documentation/virt/uml/
  F:    arch/um/
  F:    arch/x86/um/
@@@ -21123,8 -20866,7 +21130,8 @@@ S:   Supporte
  F:    drivers/ptp/ptp_vmw.c
  
  VMWARE VMCI DRIVER
 -M:    Jorgen Hansen <[email protected]>
 +M:    Bryan Tan <[email protected]>
 +M:    Rajesh Jalisatgi <[email protected]>
  M:    Vishnu Dasa <[email protected]>
  R:    VMware PV-Drivers Reviewers <[email protected]>
  L:    [email protected]
@@@ -21168,7 -20910,7 +21175,7 @@@ F:   include/linux/regulator
  K:    regulator_get_optional
  
  VOLTAGE AND CURRENT REGULATOR IRQ HELPERS
 -R:    Matti Vaittinen <ma[email protected].com>
 +R:    Matti Vaittinen <mazziesaccount@gmail.com>
  F:    drivers/regulator/irq_helpers.c
  
  VRF
@@@ -21281,8 -21023,10 +21288,8 @@@ S:  Maintaine
  F:    drivers/hid/hid-wiimote*
  
  WILOCITY WIL6210 WIRELESS DRIVER
 -M:    Maya Erez <[email protected]>
  L:    [email protected]
 -L:    [email protected]
 -S:    Supported
 +S:    Orphan
  W:    https://wireless.wiki.kernel.org/en/users/Drivers/wil6210
  F:    drivers/net/wireless/ath/wil6210/
  
@@@ -21486,15 -21230,6 +21493,15 @@@ F: arch/x86/include/asm/uv
  F:    arch/x86/kernel/apic/x2apic_uv_x.c
  F:    arch/x86/platform/uv/
  
 +X86 STACK UNWINDING
 +M:    Josh Poimboeuf <[email protected]>
 +M:    Peter Zijlstra <[email protected]>
 +S:    Supported
 +F:    arch/x86/include/asm/unwind*.h
 +F:    arch/x86/kernel/dumpstack.c
 +F:    arch/x86/kernel/stacktrace.c
 +F:    arch/x86/kernel/unwind_*.c
 +
  X86 VDSO
  M:    Andy Lutomirski <[email protected]>
  L:    [email protected]
@@@ -21657,6 -21392,7 +21664,6 @@@ F:   drivers/xen/*swiotlb
  XFS FILESYSTEM
  C:    irc://irc.oftc.net/xfs
  M:    Darrick J. Wong <[email protected]>
 -M:    [email protected]
  L:    [email protected]
  S:    Supported
  W:    http://xfs.org/
@@@ -21766,6 -21502,7 +21773,6 @@@ M:   George Cherian <[email protected]
  L:    [email protected]
  S:    Supported
  W:    http://www.marvell.com
 -F:    Documentation/devicetree/bindings/i2c/i2c-xlp9xx.txt
  F:    drivers/i2c/busses/i2c-xlp9xx.c
  
  XRA1403 GPIO EXPANDER

diff --combined drivers/hid/Kconfig
index a95a7cbc4a59c8e03545543df28bec2265a55a06,96750b3903449d5a4654323f19ffcf6daaf3e339..70da5931082f6e2b1b597244b768e91e681af38b
--- 1/drivers/hid/Kconfig
--- 2/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@@ -405,25 -405,14 +405,25 @@@ config HOLTEK_F
          Say Y here if you have a Holtek On Line Grip based game controller
          and want to have force feedback support for it.
  
 +config HID_VIVALDI_COMMON
 +      tristate
 +      help
 +        ChromeOS Vivaldi HID parsing support library. This is a hidden
 +        option so that drivers can use common code to parse the HID
 +        descriptors for vivaldi function row keymap.
 +
  config HID_GOOGLE_HAMMER
        tristate "Google Hammer Keyboard"
 +      select HID_VIVALDI_COMMON
 +      select INPUT_VIVALDIFMAP
        depends on USB_HID && LEDS_CLASS && CROS_EC
        help
        Say Y here if you have a Google Hammer device.
  
  config HID_VIVALDI
        tristate "Vivaldi Keyboard"
 +      select HID_VIVALDI_COMMON
 +      select INPUT_VIVALDIFMAP
        depends on HID
        help
          Say Y here if you want to enable support for Vivaldi keyboards.
@@@ -697,6 -686,14 +697,14 @@@ config HID_MAYFLAS
        Say Y here if you have HJZ Mayflash PS3 game controller adapters
        and want to enable force feedback support.
  
+ config HID_MEGAWORLD_FF
+       tristate "Mega World based game controller force feedback support"
+       depends on USB_HID
+       select INPUT_FF_MEMLESS
+       help
+       Say Y here if you have a Mega World based game controller and want
+       to have force feedback support for it.
+ 
  config HID_REDRAGON
        tristate "Redragon keyboards"
        depends on HID

diff --combined drivers/hid/Makefile
index 345ac5581bd85537896f2d169f7d5d41cd072b78,c2a2db163094747b03b0db548e83dbbb174bf020..cac2cbe26d112bc3ae7f942cacedcd48e0960946
--- 1/drivers/hid/Makefile
--- 2/drivers/hid/Makefile
+++ b/drivers/hid/Makefile
@@@ -50,7 -50,6 +50,7 @@@ obj-$(CONFIG_HID_FT260)               += hid-ft260.
  obj-$(CONFIG_HID_GEMBIRD)     += hid-gembird.o
  obj-$(CONFIG_HID_GFRM)                += hid-gfrm.o
  obj-$(CONFIG_HID_GLORIOUS)  += hid-glorious.o
 +obj-$(CONFIG_HID_VIVALDI_COMMON) += hid-vivaldi-common.o
  obj-$(CONFIG_HID_GOOGLE_HAMMER)       += hid-google-hammer.o
  obj-$(CONFIG_HID_VIVALDI)     += hid-vivaldi.o
  obj-$(CONFIG_HID_GT683R)      += hid-gt683r.o
@@@ -77,6 -76,7 +77,7 @@@ obj-$(CONFIG_HID_MAGICMOUSE)  += hid-mag
  obj-$(CONFIG_HID_MALTRON)     += hid-maltron.o
  obj-$(CONFIG_HID_MCP2221)     += hid-mcp2221.o
  obj-$(CONFIG_HID_MAYFLASH)    += hid-mf.o
+ obj-$(CONFIG_HID_MEGAWORLD_FF)        += hid-megaworld.o
  obj-$(CONFIG_HID_MICROSOFT)   += hid-microsoft.o
  obj-$(CONFIG_HID_MONTEREY)    += hid-monterey.o
  obj-$(CONFIG_HID_MULTITOUCH)  += hid-multitouch.o