Merge tag 'tag-chrome-platform-for-v5.16' of git://git.kernel.org/pub/scm/linux/kerne...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 10 Nov 2021 19:36:43 +0000 (11:36 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 10 Nov 2021 19:36:43 +0000 (11:36 -0800)
Pull chrome platform updates from Benson Leung:
 "cros_ec_typec:

   - Clean up use of cros_ec_check_features

  cros_ec_*:

   - Rename and move cros_ec_pd_command to cros_ec_command, and make
     changes to cros_ec_typec and cros_ec_proto to use the new common
     command, reducing duplication.

  sensorhub:

   - simplify getting .driver_data in cros_ec_sensors_core and
     cros_ec_sensorhub

  misc:

   - Maintainership change. Enric Balletbo i Serra has moved on from
     Collabora, so removing him from chrome/platform maintainers. Thanks
     for all of your hard work maintaining this, Enric, and best of luck
     to you in your new role!

   - Add Prashant Malani as driver maintainer for cros_ec_typec.c and
     cros_usbpd_notify. He was already principal contributor of these
     drivers"

* tag 'tag-chrome-platform-for-v5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux:
  platform/chrome: cros_ec_proto: Use ec_command for check_features
  platform/chrome: cros_ec_proto: Use EC struct for features
  MAINTAINERS: Chrome: Drop Enric Balletbo i Serra
  platform/chrome: cros_ec_typec: Use cros_ec_command()
  platform/chrome: cros_ec_proto: Add version for ec_command
  platform/chrome: cros_ec_proto: Make data pointers void
  platform/chrome: cros_usbpd_notify: Move ec_command()
  platform/chrome: cros_usbpd_notify: Rename cros_ec_pd_command()
  platform/chrome: cros_ec: Fix spelling mistake "responsed" -> "response"
  platform/chrome: cros_ec_sensorhub: simplify getting .driver_data
  iio: common: cros_ec_sensors: simplify getting .driver_data
  platform/chrome: cros-ec-typec: Cleanup use of check_features
  platform/chrome: cros_ec_proto: Fix check_features ret val
  MAINTAINERS: Add Prashant's maintainership of cros_ec drivers

1  2 
MAINTAINERS
drivers/mfd/cros_ec_dev.c

diff --combined MAINTAINERS
index 5695690cbc131111650a5e84ce913d3e299edebe,7cfd34c5a982f2fe6efe2097d044e7d79a30db28..5b7a13f706fa3e480f8469b68ab5593e41e32d40
@@@ -334,7 -334,7 +334,7 @@@ F: drivers/platform/x86/acer-wmi.
  
  ACPI
  M:    "Rafael J. Wysocki" <rafael@kernel.org>
 -M:    Len Brown <lenb@kernel.org>
 +R:    Len Brown <lenb@kernel.org>
  L:    linux-acpi@vger.kernel.org
  S:    Supported
  W:    https://01.org/linux-acpi
@@@ -355,7 -355,7 +355,7 @@@ F: tools/power/acpi
  
  ACPI APEI
  M:    "Rafael J. Wysocki" <rafael@kernel.org>
 -M:    Len Brown <lenb@kernel.org>
 +R:    Len Brown <lenb@kernel.org>
  R:    James Morse <james.morse@arm.com>
  R:    Tony Luck <tony.luck@intel.com>
  R:    Borislav Petkov <bp@alien8.de>
@@@ -378,6 -378,14 +378,6 @@@ F:        drivers/acpi/acpica
  F:    include/acpi/
  F:    tools/power/acpi/
  
 -ACPI FAN DRIVER
 -M:    Zhang Rui <rui.zhang@intel.com>
 -L:    linux-acpi@vger.kernel.org
 -S:    Supported
 -W:    https://01.org/linux-acpi
 -B:    https://bugzilla.kernel.org
 -F:    drivers/acpi/fan.c
 -
  ACPI FOR ARM64 (ACPI/arm64)
  M:    Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
  M:    Hanjun Guo <guohanjun@huawei.com>
@@@ -393,12 -401,6 +393,12 @@@ L:       platform-driver-x86@vger.kernel.or
  S:    Maintained
  F:    drivers/platform/x86/i2c-multi-instantiate.c
  
 +ACPI PCC(Platform Communication Channel) MAILBOX DRIVER
 +M:    Sudeep Holla <sudeep.holla@arm.com>
 +L:    linux-acpi@vger.kernel.org
 +S:    Supported
 +F:    drivers/mailbox/pcc.c
 +
  ACPI PMIC DRIVERS
  M:    "Rafael J. Wysocki" <rafael@kernel.org>
  M:    Len Brown <lenb@kernel.org>
@@@ -412,14 -414,21 +412,14 @@@ T:      git git://git.kernel.org/pub/scm/lin
  F:    drivers/acpi/pmic/
  
  ACPI THERMAL DRIVER
 -M:    Zhang Rui <rui.zhang@intel.com>
 +M:    Rafael J. Wysocki <rafael@kernel.org>
 +R:    Zhang Rui <rui.zhang@intel.com>
  L:    linux-acpi@vger.kernel.org
  S:    Supported
  W:    https://01.org/linux-acpi
  B:    https://bugzilla.kernel.org
  F:    drivers/acpi/*thermal*
  
 -ACPI VIDEO DRIVER
 -M:    Zhang Rui <rui.zhang@intel.com>
 -L:    linux-acpi@vger.kernel.org
 -S:    Supported
 -W:    https://01.org/linux-acpi
 -B:    https://bugzilla.kernel.org
 -F:    drivers/acpi/acpi_video.c
 -
  ACPI VIOT DRIVER
  M:    Jean-Philippe Brucker <jean-philippe@linaro.org>
  L:    linux-acpi@vger.kernel.org
@@@ -581,12 -590,6 +581,12 @@@ L:       platform-driver-x86@vger.kernel.or
  S:    Maintained
  F:    drivers/platform/x86/adv_swbutton.c
  
 +ADXL313 THREE-AXIS DIGITAL ACCELEROMETER DRIVER
 +M:    Lucas Stankus <lucas.p.stankus@gmail.com>
 +S:    Supported
 +F:    Documentation/devicetree/bindings/iio/accel/adi,adxl313.yaml
 +F:    drivers/iio/accel/adxl313*
 +
  ADXL34X THREE-AXIS DIGITAL ACCELEROMETER DRIVER (ADXL345/ADXL346)
  M:    Michael Hennerich <michael.hennerich@analog.com>
  S:    Supported
@@@ -595,16 -598,6 +595,16 @@@ W:       http://ez.analog.com/community/linux
  F:    Documentation/devicetree/bindings/iio/accel/adi,adxl345.yaml
  F:    drivers/input/misc/adxl34x.c
  
 +ADXL355 THREE-AXIS DIGITAL ACCELEROMETER DRIVER
 +M:    Puranjay Mohan <puranjay12@gmail.com>
 +L:    linux-iio@vger.kernel.org
 +S:    Supported
 +F:    Documentation/devicetree/bindings/iio/accel/adi,adxl355.yaml
 +F:    drivers/iio/accel/adxl355.h
 +F:    drivers/iio/accel/adxl355_core.c
 +F:    drivers/iio/accel/adxl355_i2c.c
 +F:    drivers/iio/accel/adxl355_spi.c
 +
  ADXL372 THREE-AXIS DIGITAL ACCELEROMETER DRIVER
  M:    Michael Hennerich <michael.hennerich@analog.com>
  S:    Supported
@@@ -767,7 -760,7 +767,7 @@@ F: drivers/crypto/allwinner
  ALLWINNER HARDWARE SPINLOCK SUPPORT
  M:    Wilken Gottwalt <wilken.gottwalt@posteo.net>
  S:    Maintained
 -F:    Documentation/devicetree/bindings/hwlock/allwinner,sun6i-hwspinlock.yaml
 +F:    Documentation/devicetree/bindings/hwlock/allwinner,sun6i-a31-hwspinlock.yaml
  F:    drivers/hwspinlock/sun6i_hwspinlock.c
  
  ALLWINNER THERMAL DRIVER
@@@ -804,7 -797,7 +804,7 @@@ F: Documentation/devicetree/bindings/i2
  F:    drivers/i2c/busses/i2c-altera.c
  
  ALTERA MAILBOX DRIVER
 -M:    Joyce Ooi <joyce.ooi@intel.com>
 +M:    Mun Yew Tham <mun.yew.tham@intel.com>
  S:    Maintained
  F:    drivers/mailbox/mailbox-altera.c
  
@@@ -817,7 -810,7 +817,7 @@@ F: Documentation/devicetree/bindings/dm
  F:    drivers/dma/altera-msgdma.c
  
  ALTERA PIO DRIVER
 -M:    Joyce Ooi <joyce.ooi@intel.com>
 +M:    Mun Yew Tham <mun.yew.tham@intel.com>
  L:    linux-gpio@vger.kernel.org
  S:    Maintained
  F:    drivers/gpio/gpio-altera.c
@@@ -909,7 -902,6 +909,7 @@@ F: include/uapi/linux/psp-sev.
  AMD DISPLAY CORE
  M:    Harry Wentland <harry.wentland@amd.com>
  M:    Leo Li <sunpeng.li@amd.com>
 +M:    Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
  L:    amd-gfx@lists.freedesktop.org
  S:    Supported
  T:    git https://gitlab.freedesktop.org/agd5f/linux.git
@@@ -985,12 -977,12 +985,12 @@@ L:      platform-driver-x86@vger.kernel.or
  S:    Maintained
  F:    drivers/platform/x86/amd-pmc.*
  
 -AMD POWERPLAY
 +AMD POWERPLAY AND SWSMU
  M:    Evan Quan <evan.quan@amd.com>
  L:    amd-gfx@lists.freedesktop.org
  S:    Supported
  T:    git https://gitlab.freedesktop.org/agd5f/linux.git
 -F:    drivers/gpu/drm/amd/pm/powerplay/
 +F:    drivers/gpu/drm/amd/pm/
  
  AMD PTDMA DRIVER
  M:    Sanjay R Mehta <sanju.mehta@amd.com>
@@@ -1027,14 -1019,6 +1027,14 @@@ S:    Maintaine
  F:    Documentation/devicetree/bindings/iio/light/ams,as73211.yaml
  F:    drivers/iio/light/as73211.c
  
 +AMT (Automatic Multicast Tunneling)
 +M:    Taehee Yoo <ap420073@gmail.com>
 +L:    netdev@vger.kernel.org
 +S:    Maintained
 +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:    drivers/net/amt.c
 +
  ANALOG DEVICES INC AD7192 DRIVER
  M:    Alexandru Tachici <alexandru.tachici@analog.com>
  L:    linux-iio@vger.kernel.org
@@@ -1291,19 -1275,11 +1291,19 @@@ F:   drivers/input/mouse/bcm5974.
  
  APPLE DART IOMMU DRIVER
  M:    Sven Peter <sven@svenpeter.dev>
 +R:    Alyssa Rosenzweig <alyssa@rosenzweig.io>
  L:    iommu@lists.linux-foundation.org
  S:    Maintained
  F:    Documentation/devicetree/bindings/iommu/apple,dart.yaml
  F:    drivers/iommu/apple-dart.c
  
 +APPLE PCIE CONTROLLER DRIVER
 +M:    Alyssa Rosenzweig <alyssa@rosenzweig.io>
 +M:    Marc Zyngier <maz@kernel.org>
 +L:    linux-pci@vger.kernel.org
 +S:    Maintained
 +F:    drivers/pci/controller/pcie-apple.c
 +
  APPLE SMC DRIVER
  M:    Henrik Rydberg <rydberg@bitmath.org>
  L:    linux-hwmon@vger.kernel.org
@@@ -1435,7 -1411,7 +1435,7 @@@ F:      Documentation/devicetree/bindings/au
  F:    Documentation/devicetree/bindings/clock/arm,syscon-icst.yaml
  F:    Documentation/devicetree/bindings/i2c/i2c-versatile.txt
  F:    Documentation/devicetree/bindings/interrupt-controller/arm,versatile-fpga-irq.txt
 -F:    Documentation/devicetree/bindings/mtd/arm-versatile.txt
 +F:    Documentation/devicetree/bindings/mtd/mtd-physmap.yaml
  F:    arch/arm/boot/dts/arm-realview-*
  F:    arch/arm/boot/dts/integrator*
  F:    arch/arm/boot/dts/versatile*
@@@ -1574,7 -1550,7 +1574,7 @@@ ARM PRIMECELL VIC PL190/PL192 DRIVE
  M:    Linus Walleij <linus.walleij@linaro.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
 -F:    Documentation/devicetree/bindings/interrupt-controller/arm,vic.txt
 +F:    Documentation/devicetree/bindings/interrupt-controller/arm,vic.yaml
  F:    drivers/irqchip/irq-vic.c
  
  ARM SMC WATCHDOG DRIVER
@@@ -1735,8 -1711,6 +1735,8 @@@ F:      drivers/*/*alpine
  
  ARM/APPLE MACHINE SUPPORT
  M:    Hector Martin <marcan@marcan.st>
 +M:    Sven Peter <sven@svenpeter.dev>
 +R:    Alyssa Rosenzweig <alyssa@rosenzweig.io>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  W:    https://asahilinux.org
@@@ -1744,20 -1718,12 +1744,20 @@@ B:   https://github.com/AsahiLinux/linux/
  C:    irc://irc.oftc.net/asahi-dev
  T:    git https://github.com/AsahiLinux/linux.git
  F:    Documentation/devicetree/bindings/arm/apple.yaml
 +F:    Documentation/devicetree/bindings/i2c/apple,i2c.yaml
  F:    Documentation/devicetree/bindings/interrupt-controller/apple,aic.yaml
 +F:    Documentation/devicetree/bindings/mailbox/apple,mailbox.yaml
 +F:    Documentation/devicetree/bindings/pci/apple,pcie.yaml
  F:    Documentation/devicetree/bindings/pinctrl/apple,pinctrl.yaml
  F:    arch/arm64/boot/dts/apple/
 +F:    drivers/i2c/busses/i2c-pasemi-core.c
 +F:    drivers/i2c/busses/i2c-pasemi-platform.c
  F:    drivers/irqchip/irq-apple-aic.c
 +F:    drivers/mailbox/apple-mailbox.c
 +F:    drivers/pinctrl/pinctrl-apple-gpio.c
  F:    include/dt-bindings/interrupt-controller/apple-aic.h
  F:    include/dt-bindings/pinctrl/apple.h
 +F:    include/linux/apple-mailbox.h
  
  ARM/ARTPEC MACHINE SUPPORT
  M:    Jesper Nilsson <jesper.nilsson@axis.com>
@@@ -1779,7 -1745,7 +1779,7 @@@ R:      Joel Stanley <joel@jms.id.au
  L:    linux-i2c@vger.kernel.org
  L:    openbmc@lists.ozlabs.org (moderated for non-subscribers)
  S:    Maintained
 -F:    Documentation/devicetree/bindings/i2c/i2c-aspeed.txt
 +F:    Documentation/devicetree/bindings/i2c/aspeed,i2c.yaml
  F:    Documentation/devicetree/bindings/interrupt-controller/aspeed,ast2400-i2c-ic.txt
  F:    drivers/i2c/busses/i2c-aspeed.c
  F:    drivers/irqchip/irq-aspeed-i2c-ic.c
@@@ -1906,10 -1872,10 +1906,10 @@@ M:   Linus Walleij <linus.walleij@linaro.
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  T:    git git://github.com/ulli-kroll/linux.git
 -F:    Documentation/devicetree/bindings/arm/gemini.txt
 +F:    Documentation/devicetree/bindings/arm/gemini.yaml
  F:    Documentation/devicetree/bindings/net/cortina,gemini-ethernet.txt
  F:    Documentation/devicetree/bindings/pinctrl/cortina,gemini-pinctrl.txt
 -F:    Documentation/devicetree/bindings/rtc/faraday,ftrtc010.txt
 +F:    Documentation/devicetree/bindings/rtc/faraday,ftrtc010.yaml
  F:    arch/arm/boot/dts/gemini*
  F:    arch/arm/mach-gemini/
  F:    drivers/crypto/gemini/
@@@ -2270,7 -2236,6 +2270,7 @@@ F:      arch/arm/mach-pxa/mioa701.
  
  ARM/MStar/Sigmastar Armv7 SoC support
  M:    Daniel Palmer <daniel@thingy.jp>
 +M:    Romain Perier <romain.perier@gmail.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  W:    http://linux-chenxing.org/
@@@ -2342,14 -2307,6 +2342,14 @@@ F:    arch/arm/boot/dts/nuvoton-wpcm450
  F:    arch/arm/mach-npcm/wpcm450.c
  F:    drivers/*/*wpcm*
  
 +ARM/NXP S32G ARCHITECTURE
 +M:    Chester Lin <clin@suse.com>
 +R:    Andreas Färber <afaerber@suse.de>
 +R:    Matthias Brugger <mbrugger@suse.com>
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +S:    Maintained
 +F:    arch/arm64/boot/dts/freescale/s32g*.dts*
 +
  ARM/OPENMOKO NEO FREERUNNER (GTA02) MACHINE SUPPORT
  L:    openmoko-kernel@lists.openmoko.org (subscribers-only)
  S:    Orphan
@@@ -2755,7 -2712,6 +2755,7 @@@ F:      drivers/power/reset/keystone-reset.
  
  ARM/TEXAS INSTRUMENTS K3 ARCHITECTURE
  M:    Nishanth Menon <nm@ti.com>
 +M:    Vignesh Raghavendra <vigneshr@ti.com>
  M:    Tero Kristo <kristo@kernel.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Supported
@@@ -2783,7 -2739,7 +2783,7 @@@ F:      Documentation/devicetree/bindings/ar
  F:    Documentation/devicetree/bindings/net/toshiba,visconti-dwmac.yaml
  F:    Documentation/devicetree/bindings/gpio/toshiba,gpio-visconti.yaml
  F:    Documentation/devicetree/bindings/pci/toshiba,visconti-pcie.yaml
 -F:    Documentation/devicetree/bindings/pinctrl/toshiba,tmpv7700-pinctrl.yaml
 +F:    Documentation/devicetree/bindings/pinctrl/toshiba,visconti-pinctrl.yaml
  F:    Documentation/devicetree/bindings/watchdog/toshiba,visconti-wdt.yaml
  F:    arch/arm64/boot/dts/toshiba/
  F:    drivers/net/ethernet/stmicro/stmmac/dwmac-visconti.c
@@@ -2848,8 -2804,9 +2848,8 @@@ F:      arch/arm/mach-pxa/include/mach/vpac2
  F:    arch/arm/mach-pxa/vpac270.c
  
  ARM/VT8500 ARM ARCHITECTURE
 -M:    Tony Prisk <linux@prisktech.co.nz>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -S:    Maintained
 +S:    Orphan
  F:    Documentation/devicetree/bindings/i2c/i2c-wmt.txt
  F:    arch/arm/mach-vt8500/
  F:    drivers/clocksource/timer-vt8500.c
@@@ -2937,12 -2894,6 +2937,12 @@@ S:    Maintaine
  F:    Documentation/hwmon/asc7621.rst
  F:    drivers/hwmon/asc7621.c
  
 +ASIX AX88796C SPI ETHERNET ADAPTER
 +M:    Łukasz Stelmach <l.stelmach@samsung.com>
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/net/asix,ax88796c.yaml
 +F:    drivers/net/ethernet/asix/ax88796c_*
 +
  ASPEED PINCTRL DRIVERS
  M:    Andrew Jeffery <andrew@aj.id.au>
  L:    linux-aspeed@lists.ozlabs.org (moderated for non-subscribers)
@@@ -3011,7 -2962,7 +3011,7 @@@ F:      crypto/async_tx
  F:    include/linux/async_tx.h
  
  AT24 EEPROM DRIVER
 -M:    Bartosz Golaszewski <bgolaszewski@baylibre.com>
 +M:    Bartosz Golaszewski <brgl@bgdev.pl>
  L:    linux-i2c@vger.kernel.org
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git
@@@ -3162,7 -3113,6 +3162,7 @@@ W:      https://github.com/linux-audi
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git
  F:    include/asm-generic/audit_*.h
  F:    include/linux/audit.h
 +F:    include/linux/audit_arch.h
  F:    include/uapi/linux/audit.h
  F:    kernel/audit*
  F:    lib/*audit.c
  AUXILIARY DISPLAY DRIVERS
  M:    Miguel Ojeda <ojeda@kernel.org>
  S:    Maintained
 +F:    Documentation/devicetree/bindings/auxdisplay/
  F:    drivers/auxdisplay/
  F:    include/linux/cfag12864b.h
  
@@@ -3266,12 -3215,6 +3266,12 @@@ F:    drivers/video/backlight
  F:    include/linux/backlight.h
  F:    include/linux/pwm_backlight.h
  
 +BARCO P50 GPIO DRIVER
 +M:    Santosh Kumar Yadav <santoshkumar.yadav@barco.com>
 +M:    Peter Korsgaard <peter.korsgaard@barco.com>
 +S:    Maintained
 +F:    drivers/platform/x86/barco-p50-gpio.c
 +
  BATMAN ADVANCED
  M:    Marek Lindner <mareklindner@neomailbox.ch>
  M:    Simon Wunderlich <sw@simonwunderlich.de>
@@@ -3442,11 -3385,9 +3442,11 @@@ F:    Documentation/networking/filter.rs
  F:    Documentation/userspace-api/ebpf/
  F:    arch/*/net/*
  F:    include/linux/bpf*
 +F:    include/linux/btf*
  F:    include/linux/filter.h
  F:    include/trace/events/xdp.h
  F:    include/uapi/linux/bpf*
 +F:    include/uapi/linux/btf*
  F:    include/uapi/linux/filter.h
  F:    kernel/bpf/
  F:    kernel/trace/bpf_trace.c
@@@ -3480,7 -3421,6 +3480,7 @@@ S:      Supporte
  F:    arch/arm64/net/
  
  BPF JIT for MIPS (32-BIT AND 64-BIT)
 +M:    Johan Almbladh <johan.almbladh@anyfinetworks.com>
  M:    Paul Burton <paulburton@kernel.org>
  L:    netdev@vger.kernel.org
  L:    bpf@vger.kernel.org
@@@ -3669,8 -3609,6 +3669,8 @@@ F:      arch/arm/mm/cache-b15-rac.
  F:    drivers/bus/brcmstb_gisb.c
  F:    drivers/pci/controller/pcie-brcmstb.c
  N:    brcmstb
 +N:    bcm7038
 +N:    bcm7120
  
  BROADCOM BDC DRIVER
  M:    Al Cooper <alcooperx@gmail.com>
@@@ -3818,7 -3756,7 +3818,7 @@@ L:      bcm-kernel-feedback-list@broadcom.co
  L:    netdev@vger.kernel.org
  S:    Supported
  F:    Documentation/devicetree/bindings/net/brcm,bcmgenet.txt
 -F:    Documentation/devicetree/bindings/net/brcm,unimac-mdio.txt
 +F:    Documentation/devicetree/bindings/net/brcm,unimac-mdio.yaml
  F:    drivers/net/ethernet/broadcom/genet/
  F:    drivers/net/ethernet/broadcom/unimac.h
  F:    drivers/net/mdio/mdio-bcm-unimac.c
@@@ -3883,6 -3821,7 +3883,6 @@@ F:      drivers/scsi/mpi3mr
  
  BROADCOM NETXTREME-E ROCE DRIVER
  M:    Selvin Xavier <selvin.xavier@broadcom.com>
 -M:    Naresh Kumar PBS <nareshkumar.pbs@broadcom.com>
  L:    linux-rdma@vger.kernel.org
  S:    Supported
  W:    http://www.broadcom.com
@@@ -4468,14 -4407,12 +4468,12 @@@ F:   drivers/input/touchscreen/chipone_ic
  
  CHROME HARDWARE PLATFORM SUPPORT
  M:    Benson Leung <bleung@chromium.org>
- M:    Enric Balletbo i Serra <enric.balletbo@collabora.com>
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git
  F:    drivers/platform/chrome/
  
  CHROMEOS EC CODEC DRIVER
  M:    Cheng-Yi Chiang <cychiang@chromium.org>
- R:    Enric Balletbo i Serra <enric.balletbo@collabora.com>
  R:    Guenter Roeck <groeck@chromium.org>
  S:    Maintained
  F:    Documentation/devicetree/bindings/sound/google,cros-ec-codec.yaml
@@@ -4483,15 -4420,25 +4481,25 @@@ F:   sound/soc/codecs/cros_ec_codec.
  
  CHROMEOS EC SUBDRIVERS
  M:    Benson Leung <bleung@chromium.org>
- M:    Enric Balletbo i Serra <enric.balletbo@collabora.com>
  R:    Guenter Roeck <groeck@chromium.org>
  S:    Maintained
  F:    drivers/power/supply/cros_usbpd-charger.c
  N:    cros_ec
  N:    cros-ec
  
+ CHROMEOS EC USB TYPE-C DRIVER
+ M:    Prashant Malani <pmalani@chromium.org>
+ S:    Maintained
+ F:    drivers/platform/chrome/cros_ec_typec.c
+ CHROMEOS EC USB PD NOTIFY DRIVER
+ M:    Prashant Malani <pmalani@chromium.org>
+ S:    Maintained
+ F:    drivers/platform/chrome/cros_usbpd_notify.c
+ F:    include/linux/platform_data/cros_usbpd_notify.h
  CHRONTEL CH7322 CEC DRIVER
 -M:    Jeff Chase <jnchase@google.com>
 +M:    Joe Tessler <jrt@google.com>
  L:    linux-media@vger.kernel.org
  S:    Maintained
  T:    git git://linuxtv.org/media_tree.git
@@@ -4506,17 -4453,6 +4514,17 @@@ L:    patches@opensource.cirrus.co
  S:    Maintained
  F:    sound/soc/codecs/cs*
  
 +CIRRUS LOGIC DSP FIRMWARE DRIVER
 +M:    Simon Trimmer <simont@opensource.cirrus.com>
 +M:    Charles Keepax <ckeepax@opensource.cirrus.com>
 +M:    Richard Fitzgerald <rf@opensource.cirrus.com>
 +L:    patches@opensource.cirrus.com
 +S:    Supported
 +W:    https://github.com/CirrusLogic/linux-drivers/wiki
 +T:    git https://github.com/CirrusLogic/linux-drivers.git
 +F:    drivers/firmware/cirrus/*
 +F:    include/linux/firmware/cirrus/*
 +
  CIRRUS LOGIC EP93XX ETHERNET DRIVER
  M:    Hartley Sweeten <hsweeten@visionengravers.com>
  L:    netdev@vger.kernel.org
@@@ -4728,7 -4664,7 +4736,7 @@@ W:      http://linux-cifs.samba.org
  T:    git git://git.samba.org/sfrench/cifs-2.6.git
  F:    Documentation/admin-guide/cifs/
  F:    fs/cifs/
 -F:    fs/cifs_common/
 +F:    fs/smbfs_common/
  
  COMPACTPCI HOTPLUG CORE
  M:    Scott Murray <scott@spiteful.org>
@@@ -4876,8 -4812,7 +4884,8 @@@ F:      Documentation/ABI/testing/sysfs-bus-
  F:    Documentation/driver-api/generic-counter.rst
  F:    drivers/counter/
  F:    include/linux/counter.h
 -F:    include/linux/counter_enum.h
 +F:    include/uapi/linux/counter.h
 +F:    tools/counter/
  
  CP2615 I2C DRIVER
  M:    Bence Csókás <bence98@sch.bme.hu>
@@@ -5228,7 -5163,7 +5236,7 @@@ F:      net/ax25/ax25_timer.
  F:    net/ax25/sysctl_net_ax25.c
  
  DATA ACCESS MONITOR
 -M:    SeongJae Park <sjpark@amazon.de>
 +M:    SeongJae Park <sj@kernel.org>
  L:    linux-mm@kvack.org
  S:    Maintained
  F:    Documentation/admin-guide/mm/damon/
@@@ -5525,19 -5460,6 +5533,19 @@@ F:    include/net/devlink.
  F:    include/uapi/linux/devlink.h
  F:    net/core/devlink.c
  
 +DH ELECTRONICS IMX6 DHCOM BOARD SUPPORT
 +M:    Christoph Niedermaier <cniedermaier@dh-electronics.com>
 +L:    kernel@dh-electronics.com
 +S:    Maintained
 +F:    arch/arm/boot/dts/imx6*-dhcom-*
 +
 +DH ELECTRONICS STM32MP1 DHCOM/DHCOR BOARD SUPPORT
 +M:    Marek Vasut <marex@denx.de>
 +L:    kernel@dh-electronics.com
 +S:    Maintained
 +F:    arch/arm/boot/dts/stm32mp1*-dhcom-*
 +F:    arch/arm/boot/dts/stm32mp1*-dhcor-*
 +
  DIALOG SEMICONDUCTOR DRIVERS
  M:    Support Opensource <support.opensource@diasemi.com>
  S:    Supported
@@@ -6104,12 -6026,6 +6112,12 @@@ T:    git git://anongit.freedesktop.org/dr
  F:    Documentation/devicetree/bindings/display/panel/samsung,lms397kf04.yaml
  F:    drivers/gpu/drm/panel/panel-samsung-db7430.c
  
 +DRM DRIVER FOR SAMSUNG S6D27A1 PANELS
 +M:    Markuss Broks <markuss.broks@gmail.com>
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/display/panel/samsung,s6d27a1.yaml
 +F:    drivers/gpu/drm/panel/panel-samsung-s6d27a1.c
 +
  DRM DRIVER FOR SITRONIX ST7703 PANELS
  M:    Guido Günther <agx@sigxcpu.org>
  R:    Purism Kernel Team <kernel@puri.sm>
@@@ -6233,7 -6149,8 +6241,7 @@@ T:      git git://anongit.freedesktop.org/dr
  F:    Documentation/devicetree/bindings/display/
  F:    Documentation/devicetree/bindings/gpu/
  F:    Documentation/gpu/
 -F:    drivers/gpu/drm/
 -F:    drivers/gpu/vga/
 +F:    drivers/gpu/
  F:    include/drm/
  F:    include/linux/vga*
  F:    include/uapi/drm/
@@@ -6377,7 -6294,6 +6385,7 @@@ L:      linux-tegra@vger.kernel.or
  S:    Supported
  T:    git git://anongit.freedesktop.org/tegra/linux.git
  F:    Documentation/devicetree/bindings/display/tegra/nvidia,tegra20-host1x.txt
 +F:    Documentation/devicetree/bindings/gpu/host1x/
  F:    drivers/gpu/drm/tegra/
  F:    drivers/gpu/host1x/
  F:    include/linux/host1x.h
@@@ -6517,14 -6433,6 +6525,14 @@@ T:    git git://anongit.freedesktop.org/dr
  F:    drivers/gpu/drm/ttm/
  F:    include/drm/ttm/
  
 +DRM GPU SCHEDULER
 +M:    Andrey Grodzovsky <andrey.grodzovsky@amd.com>
 +L:    dri-devel@lists.freedesktop.org
 +S:    Maintained
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
 +F:    drivers/gpu/drm/scheduler/
 +F:    include/drm/gpu_scheduler.h
 +
  DSBR100 USB FM RADIO DRIVER
  M:    Alexey Klimov <klimov.linux@gmail.com>
  L:    linux-media@vger.kernel.org
@@@ -6783,7 -6691,7 +6791,7 @@@ S:      Supporte
  F:    drivers/edac/dmc520_edac.c
  
  EDAC-E752X
 -M:    Mark Gross <mark.gross@intel.com>
 +M:    Mark Gross <markgross@kernel.org>
  L:    linux-edac@vger.kernel.org
  S:    Maintained
  F:    drivers/edac/e752x_edac.c
@@@ -7106,6 -7014,7 +7114,6 @@@ F:      drivers/net/mdio/fwnode_mdio.
  F:    drivers/net/mdio/of_mdio.c
  F:    drivers/net/pcs/
  F:    drivers/net/phy/
 -F:    drivers/of/of_net.c
  F:    include/dt-bindings/net/qca-ar803x.h
  F:    include/linux/*mdio*.h
  F:    include/linux/mdio/*.h
@@@ -7117,21 -7026,6 +7125,21 @@@ F:    include/linux/platform_data/mdio-gpi
  F:    include/trace/events/mdio.h
  F:    include/uapi/linux/mdio.h
  F:    include/uapi/linux/mii.h
 +F:    net/core/of_net.c
 +
 +EXEC & BINFMT API
 +R:    Eric Biederman <ebiederm@xmission.com>
 +R:    Kees Cook <keescook@chromium.org>
 +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
 +F:    include/linux/elf.h
 +F:    include/uapi/linux/binfmts.h
 +F:    tools/testing/selftests/exec/
 +N:    asm/elf.h
 +N:    binfmt
  
  EXFAT FILE SYSTEM
  M:    Namjae Jeon <linkinjeon@kernel.org>
@@@ -7437,15 -7331,6 +7445,15 @@@ L:    netdev@vger.kernel.or
  S:    Maintained
  F:    drivers/net/ethernet/nvidia/*
  
 +FORTIFY_SOURCE
 +M:    Kees Cook <keescook@chromium.org>
 +L:    linux-hardening@vger.kernel.org
 +S:    Supported
 +F:    include/linux/fortify-string.h
 +F:    lib/test_fortify/*
 +F:    scripts/test_fortify.sh
 +K:    \b__NO_FORTIFY\b
 +
  FPGA DFL DRIVERS
  M:    Wu Hao <hao.wu@intel.com>
  R:    Tom Rix <trix@redhat.com>
@@@ -7460,11 -7345,10 +7468,11 @@@ F:   include/uapi/linux/fpga-dfl.
  
  FPGA MANAGER FRAMEWORK
  M:    Moritz Fischer <mdf@kernel.org>
 +M:    Wu Hao <hao.wu@intel.com>
 +M:    Xu Yilun <yilun.xu@intel.com>
  R:    Tom Rix <trix@redhat.com>
  L:    linux-fpga@vger.kernel.org
  S:    Maintained
 -W:    http://www.rocketboards.org
  Q:    http://patchwork.kernel.org/project/linux-fpga/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga.git
  F:    Documentation/devicetree/bindings/fpga/
@@@ -7558,7 -7442,7 +7566,7 @@@ FREESCALE IMX / MXC FEC DRIVE
  M:    Joakim Zhang <qiangqing.zhang@nxp.com>
  L:    netdev@vger.kernel.org
  S:    Maintained
 -F:    Documentation/devicetree/bindings/net/fsl-fec.txt
 +F:    Documentation/devicetree/bindings/net/fsl,fec.yaml
  F:    drivers/net/ethernet/freescale/fec.h
  F:    drivers/net/ethernet/freescale/fec_main.c
  F:    drivers/net/ethernet/freescale/fec_ptp.c
@@@ -7842,7 -7726,6 +7850,7 @@@ M:      Ingo Molnar <mingo@redhat.com
  R:    Peter Zijlstra <peterz@infradead.org>
  R:    Darren Hart <dvhart@infradead.org>
  R:    Davidlohr Bueso <dave@stgolabs.net>
 +R:    André Almeida <andrealmeid@collabora.com>
  L:    linux-kernel@vger.kernel.org
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git locking/core
@@@ -7850,7 -7733,7 +7858,7 @@@ F:      Documentation/locking/*futex
  F:    include/asm-generic/futex.h
  F:    include/linux/futex.h
  F:    include/uapi/linux/futex.h
 -F:    kernel/futex.c
 +F:    kernel/futex/*
  F:    tools/perf/bench/futex*
  F:    tools/testing/selftests/futex/
  
@@@ -8111,7 -7994,7 +8119,7 @@@ F:      include/linux/gpio/regmap.
  
  GPIO SUBSYSTEM
  M:    Linus Walleij <linus.walleij@linaro.org>
 -M:    Bartosz Golaszewski <bgolaszewski@baylibre.com>
 +M:    Bartosz Golaszewski <brgl@bgdev.pl>
  L:    linux-gpio@vger.kernel.org
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git
@@@ -8316,7 -8199,7 +8324,7 @@@ T:      git git://linuxtv.org/anttip/media_t
  F:    drivers/media/usb/hackrf/
  
  HANTRO VPU CODEC DRIVER
 -M:    Ezequiel Garcia <ezequiel@collabora.com>
 +M:    Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
  M:    Philipp Zabel <p.zabel@pengutronix.de>
  L:    linux-media@vger.kernel.org
  L:    linux-rockchip@lists.infradead.org
@@@ -8339,7 -8222,6 +8347,7 @@@ L:      linux-hwmon@vger.kernel.or
  S:    Maintained
  W:    http://hwmon.wiki.kernel.org/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git
 +F:    Documentation/ABI/testing/sysfs-class-hwmon
  F:    Documentation/devicetree/bindings/hwmon/
  F:    Documentation/hwmon/
  F:    drivers/hwmon/
@@@ -8576,6 -8458,7 +8584,6 @@@ M:      John Stultz <john.stultz@linaro.org
  L:    linux-kernel@vger.kernel.org
  S:    Maintained
  F:    drivers/misc/hisi_hikey_usb.c
 -F:    Documentation/devicetree/bindings/misc/hisilicon-hikey-usb.yaml
  
  HISILICON PMU DRIVER
  M:    Shaokun Zhang <zhangshaokun@hisilicon.com>
@@@ -8733,8 -8616,9 +8741,8 @@@ F:      Documentation/devicetree/bindings/ii
  F:    drivers/iio/humidity/hts221*
  
  HUAWEI ETHERNET DRIVER
 -M:    Bin Luo <luobin9@huawei.com>
  L:    netdev@vger.kernel.org
 -S:    Supported
 +S:    Orphan
  F:    Documentation/networking/device_drivers/ethernet/huawei/hinic.rst
  F:    drivers/net/ethernet/huawei/hinic/
  
@@@ -8784,12 -8668,6 +8792,12 @@@ S:    Maintaine
  T:    git git://linuxtv.org/media_tree.git
  F:    drivers/media/i2c/hi556.c
  
 +HYNIX HI846 SENSOR DRIVER
 +M:    Martin Kepplinger <martin.kepplinger@puri.sm>
 +L:    linux-media@vger.kernel.org
 +S:    Maintained
 +F:    drivers/media/i2c/hi846.c
 +
  Hyper-V/Azure CORE AND DRIVERS
  M:    "K. Y. Srinivasan" <kys@microsoft.com>
  M:    Haiyang Zhang <haiyangz@microsoft.com>
@@@ -8837,7 -8715,8 +8845,7 @@@ S:      Supporte
  Q:    http://patchwork.ozlabs.org/project/linux-mtd/list/
  C:    irc://irc.oftc.net/mtd
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git cfi/next
 -F:    Documentation/devicetree/bindings/mtd/cypress,hyperflash.txt
 -F:    Documentation/devicetree/bindings/mtd/ti,am654-hbmc.txt
 +F:    Documentation/devicetree/bindings/mtd/ti,am654-hbmc.yaml
  F:    drivers/mtd/hyperbus/
  F:    include/linux/mtd/hyperbus.h
  
@@@ -9431,7 -9310,7 +9439,7 @@@ S:      Maintaine
  F:    drivers/platform/x86/intel/atomisp2/led.c
  
  INTEL BIOS SAR INT1092 DRIVER
 -M:    Shravan S <s.shravan@intel.com>
 +M:    Shravan Sudhakar <s.shravan@intel.com>
  M:    Intel Corporation <linuxwwan@intel.com>
  L:    platform-driver-x86@vger.kernel.org
  S:    Maintained
@@@ -9608,12 -9487,6 +9616,12 @@@ L:    linux-crypto@vger.kernel.or
  S:    Maintained
  F:    drivers/crypto/ixp4xx_crypto.c
  
 +INTEL ISHTP ECLITE DRIVER
 +M:    Sumesh K Naduvalath <sumesh.k.naduvalath@intel.com>
 +L:    platform-driver-x86@vger.kernel.org
 +S:    Supported
 +F:    drivers/platform/x86/intel/ishtp_eclite.c
 +
  INTEL IXP4XX QMGR, NPE, ETHERNET and HSS SUPPORT
  M:    Krzysztof Halasa <khalasa@piap.pl>
  S:    Maintained
@@@ -9627,14 -9500,14 +9635,14 @@@ F:   include/linux/soc/ixp4xx/qmgr.
  INTEL IXP4XX RANDOM NUMBER GENERATOR SUPPORT
  M:    Deepak Saxena <dsaxena@plexity.net>
  S:    Maintained
 -F:    Documentation/devicetree/bindings/display/intel,ixp46x-rng.yaml
 +F:    Documentation/devicetree/bindings/rng/intel,ixp46x-rng.yaml
  F:    drivers/char/hw_random/ixp4xx-rng.c
  
  INTEL KEEM BAY DRM DRIVER
  M:    Anitha Chrisanthus <anitha.chrisanthus@intel.com>
  M:    Edmund Dea <edmund.j.dea@intel.com>
  S:    Maintained
 -F:    Documentation/devicetree/bindings/display/intel,kmb_display.yaml
 +F:    Documentation/devicetree/bindings/display/intel,keembay-display.yaml
  F:    drivers/gpu/drm/kmb/
  
  INTEL KEEM BAY OCS AES/SM4 CRYPTO DRIVER
@@@ -9647,17 -9520,6 +9655,17 @@@ F:    drivers/crypto/keembay/keembay-ocs-a
  F:    drivers/crypto/keembay/ocs-aes.c
  F:    drivers/crypto/keembay/ocs-aes.h
  
 +INTEL KEEM BAY OCS ECC CRYPTO DRIVER
 +M:    Daniele Alessandrelli <daniele.alessandrelli@intel.com>
 +M:    Prabhjot Khurana <prabhjot.khurana@intel.com>
 +M:    Mark Gross <mgross@linux.intel.com>
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/crypto/intel,keembay-ocs-ecc.yaml
 +F:    drivers/crypto/keembay/Kconfig
 +F:    drivers/crypto/keembay/Makefile
 +F:    drivers/crypto/keembay/keembay-ocs-ecc.c
 +F:    drivers/crypto/keembay/ocs-ecc-curve-defs.h
 +
  INTEL KEEM BAY OCS HCU CRYPTO DRIVER
  M:    Daniele Alessandrelli <daniele.alessandrelli@intel.com>
  M:    Declan Murphy <declan.murphy@intel.com>
@@@ -9770,7 -9632,7 +9778,7 @@@ F:      include/uapi/linux/isst_if.
  F:    tools/power/x86/intel-speed-select/
  
  INTEL STRATIX10 FIRMWARE DRIVERS
 -M:    Richard Gong <richard.gong@linux.intel.com>
 +M:    Dinh Nguyen <dinguyen@kernel.org>
  L:    linux-kernel@vger.kernel.org
  S:    Maintained
  F:    Documentation/ABI/testing/sysfs-devices-platform-stratix10-rsu
@@@ -10141,7 -10003,6 +10149,7 @@@ JC42.4 TEMPERATURE SENSOR DRIVE
  M:    Guenter Roeck <linux@roeck-us.net>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
 +F:    Documentation/devicetree/bindings/hwmon/jedec,jc42.yaml
  F:    Documentation/hwmon/jc42.rst
  F:    drivers/hwmon/jc42.c
  
@@@ -10181,7 -10042,6 +10189,7 @@@ F:   include/linux/jbd2.
  JPU V4L2 MEM2MEM DRIVER FOR RENESAS
  M:    Mikhail Ulyanov <mikhail.ulyanov@cogentembedded.com>
  L:    linux-media@vger.kernel.org
 +L:    linux-renesas-soc@vger.kernel.org
  S:    Maintained
  F:    drivers/media/platform/rcar_jpu.c
  
@@@ -10342,8 -10202,8 +10350,8 @@@ M:   Hyunchul Lee <hyc.lee@gmail.com
  L:    linux-cifs@vger.kernel.org
  S:    Maintained
  T:    git git://git.samba.org/ksmbd.git
 -F:    fs/cifs_common/
  F:    fs/ksmbd/
 +F:    fs/smbfs_common/
  
  KERNEL UNIT TESTING FRAMEWORK (KUnit)
  M:    Brendan Higgins <brendanhiggins@google.com>
@@@ -10408,29 -10268,21 +10416,29 @@@ F:        arch/mips/include/uapi/asm/kvm
  F:    arch/mips/kvm/
  
  KERNEL VIRTUAL MACHINE FOR POWERPC (KVM/powerpc)
 -M:    Paul Mackerras <paulus@ozlabs.org>
 -L:    kvm-ppc@vger.kernel.org
 -S:    Supported
 -W:    http://www.linux-kvm.org/
 -T:    git git://github.com/agraf/linux-2.6.git
 +L:    linuxppc-dev@lists.ozlabs.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git topic/ppc-kvm
  F:    arch/powerpc/include/asm/kvm*
  F:    arch/powerpc/include/uapi/asm/kvm*
  F:    arch/powerpc/kernel/kvm*
  F:    arch/powerpc/kvm/
  
 +KERNEL VIRTUAL MACHINE FOR RISC-V (KVM/riscv)
 +M:    Anup Patel <anup.patel@wdc.com>
 +R:    Atish Patra <atish.patra@wdc.com>
 +L:    kvm@vger.kernel.org
 +L:    kvm-riscv@lists.infradead.org
 +L:    linux-riscv@lists.infradead.org
 +S:    Maintained
 +T:    git git://github.com/kvm-riscv/linux.git
 +F:    arch/riscv/include/asm/kvm*
 +F:    arch/riscv/include/uapi/asm/kvm*
 +F:    arch/riscv/kvm/
 +
  KERNEL VIRTUAL MACHINE for s390 (KVM/s390)
  M:    Christian Borntraeger <borntraeger@de.ibm.com>
  M:    Janosch Frank <frankja@linux.ibm.com>
  R:    David Hildenbrand <david@redhat.com>
 -R:    Cornelia Huck <cohuck@redhat.com>
  R:    Claudio Imbrenda <imbrenda@linux.ibm.com>
  L:    kvm@vger.kernel.org
  S:    Supported
@@@ -10594,13 -10446,10 +10602,13 @@@ M:        Anil S Keshavamurthy <anil.s.keshava
  M:    "David S. Miller" <davem@davemloft.net>
  M:    Masami Hiramatsu <mhiramat@kernel.org>
  S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git
  F:    Documentation/trace/kprobes.rst
  F:    include/asm-generic/kprobes.h
  F:    include/linux/kprobes.h
  F:    kernel/kprobes.c
 +F:    lib/test_kprobes.c
 +F:    samples/kprobes
  
  KS0108 LCD CONTROLLER DRIVER
  M:    Miguel Ojeda <ojeda@kernel.org>
@@@ -11048,7 -10897,7 +11056,7 @@@ LM90 HARDWARE MONITOR DRIVE
  M:    Jean Delvare <jdelvare@suse.com>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
 -F:    Documentation/devicetree/bindings/hwmon/lm90.txt
 +F:    Documentation/devicetree/bindings/hwmon/national,lm90.yaml
  F:    Documentation/hwmon/lm90.rst
  F:    drivers/hwmon/lm90.c
  F:    include/dt-bindings/thermal/lm90.h
@@@ -11307,7 -11156,6 +11315,7 @@@ S:   Maintaine
  F:    Documentation/devicetree/bindings/net/dsa/marvell.txt
  F:    Documentation/networking/devlink/mv88e6xxx.rst
  F:    drivers/net/dsa/mv88e6xxx/
 +F:    include/linux/dsa/mv88e6xxx.h
  F:    include/linux/platform_data/mv88e6xxx.h
  
  MARVELL ARMADA 3700 PHY DRIVERS
@@@ -11432,6 -11280,7 +11440,6 @@@ F:   Documentation/networking/device_driv
  F:    drivers/net/ethernet/marvell/octeontx2/af/
  
  MARVELL PRESTERA ETHERNET SWITCH DRIVER
 -M:    Vadym Kochan <vkochan@marvell.com>
  M:    Taras Chornyi <tchornyi@marvell.com>
  S:    Supported
  W:    https://github.com/Marvell-switching/switchdev-prestera
@@@ -11525,29 -11374,8 +11533,29 @@@ S: Maintaine
  F:    Documentation/devicetree/bindings/iio/proximity/maxbotix,mb1232.yaml
  F:    drivers/iio/proximity/mb1232.c
  
 +MAXIM MAX17040 FAMILY FUEL GAUGE DRIVERS
 +R:    Iskren Chernev <iskren.chernev@gmail.com>
 +R:    Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
 +R:    Marek Szyprowski <m.szyprowski@samsung.com>
 +R:    Matheus Castello <matheus@castello.eng.br>
 +L:    linux-pm@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/power/supply/maxim,max17040.yaml
 +F:    drivers/power/supply/max17040_battery.c
 +
 +MAXIM MAX17042 FAMILY FUEL GAUGE DRIVERS
 +R:    Hans de Goede <hdegoede@redhat.com>
 +R:    Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
 +R:    Marek Szyprowski <m.szyprowski@samsung.com>
 +R:    Sebastian Krzyszkowiak <sebastian.krzyszkowiak@puri.sm>
 +R:    Purism Kernel Team <kernel@puri.sm>
 +L:    linux-pm@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/power/supply/maxim,max17042.yaml
 +F:    drivers/power/supply/max17042_battery.c
 +
  MAXIM MAX77650 PMIC MFD DRIVER
 -M:    Bartosz Golaszewski <bgolaszewski@baylibre.com>
 +M:    Bartosz Golaszewski <brgl@bgdev.pl>
  L:    linux-kernel@vger.kernel.org
  S:    Maintained
  F:    Documentation/devicetree/bindings/*/*max77650.yaml
@@@ -11853,7 -11681,6 +11861,7 @@@ T:   git git://linuxtv.org/media_tree.gi
  F:    Documentation/devicetree/bindings/media/renesas,csi2.yaml
  F:    Documentation/devicetree/bindings/media/renesas,isp.yaml
  F:    Documentation/devicetree/bindings/media/renesas,vin.yaml
 +F:    drivers/media/platform/rcar-isp.c
  F:    drivers/media/platform/rcar-vin/
  
  MEDIA DRIVERS FOR RENESAS - VSP1
@@@ -11999,9 -11826,7 +12007,9 @@@ F:   drivers/mmc/host/mtk-sd.
  MEDIATEK MT76 WIRELESS LAN DRIVER
  M:    Felix Fietkau <nbd@nbd.name>
  M:    Lorenzo Bianconi <lorenzo.bianconi83@gmail.com>
 -R:    Ryder Lee <ryder.lee@mediatek.com>
 +M:    Ryder Lee <ryder.lee@mediatek.com>
 +R:    Shayne Chen <shayne.chen@mediatek.com>
 +R:    Sean Wang <sean.wang@mediatek.com>
  L:    linux-wireless@vger.kernel.org
  S:    Maintained
  F:    drivers/net/wireless/mediatek/mt76/
@@@ -12025,12 -11850,6 +12033,12 @@@ S: Maintaine
  F:    Documentation/devicetree/bindings/i2c/i2c-mt7621.txt
  F:    drivers/i2c/busses/i2c-mt7621.c
  
 +MEDIATEK MT7621 PCIE CONTROLLER DRIVER
 +M:    Sergio Paracuellos <sergio.paracuellos@gmail.com>
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/pci/mediatek,mt7621-pcie.yaml
 +F:    drivers/pci/controller/pcie-mt7621.c
 +
  MEDIATEK MT7621 PHY PCI DRIVER
  M:    Sergio Paracuellos <sergio.paracuellos@gmail.com>
  S:    Maintained
@@@ -12054,14 -11873,6 +12062,14 @@@ M: Sean Wang <sean.wang@mediatek.com
  S:    Maintained
  F:    drivers/char/hw_random/mtk-rng.c
  
 +MEDIATEK SMI DRIVER
 +M:    Yong Wu <yong.wu@mediatek.com>
 +L:    linux-mediatek@lists.infradead.org (moderated for non-subscribers)
 +S:    Supported
 +F:    Documentation/devicetree/bindings/memory-controllers/mediatek,smi*
 +F:    drivers/memory/mtk-smi.c
 +F:    include/soc/mediatek/smi.h
 +
  MEDIATEK SWITCH DRIVER
  M:    Sean Wang <sean.wang@mediatek.com>
  M:    Landen Chao <Landen.Chao@mediatek.com>
@@@ -12176,7 -11987,7 +12184,7 @@@ F:   drivers/net/ethernet/mellanox/mlxfw
  
  MELLANOX HARDWARE PLATFORM SUPPORT
  M:    Hans de Goede <hdegoede@redhat.com>
 -M:    Mark Gross <mgross@linux.intel.com>
 +M:    Mark Gross <markgross@kernel.org>
  M:    Vadim Pasternak <vadimp@nvidia.com>
  L:    platform-driver-x86@vger.kernel.org
  S:    Supported
@@@ -12388,8 -12199,7 +12396,8 @@@ F:   arch/arm64/boot/dts/marvell/armada-3
  
  MHI BUS
  M:    Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
 -M:    Hemant Kumar <hemantk@codeaurora.org>
 +R:    Hemant Kumar <hemantk@codeaurora.org>
 +L:    mhi@lists.linux.dev
  L:    linux-arm-msm@vger.kernel.org
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git
@@@ -12451,12 -12261,6 +12459,12 @@@ L: linux-crypto@vger.kernel.or
  S:    Maintained
  F:    drivers/crypto/atmel-ecc.*
  
 +MICROCHIP EIC DRIVER
 +M:    Claudiu Beznea <claudiu.beznea@microchip.com>
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +S:    Supported
 +F:    drivers/irqchip/irq-mchp-eic.c
 +
  MICROCHIP I2C DRIVER
  M:    Codrin Ciubotariu <codrin.ciubotariu@microchip.com>
  L:    linux-i2c@vger.kernel.org
@@@ -12635,7 -12439,7 +12643,7 @@@ F:   drivers/platform/surface/surface_gpe
  
  MICROSOFT SURFACE HARDWARE PLATFORM SUPPORT
  M:    Hans de Goede <hdegoede@redhat.com>
 -M:    Mark Gross <mgross@linux.intel.com>
 +M:    Mark Gross <markgross@kernel.org>
  M:    Maximilian Luz <luzmaximilian@gmail.com>
  L:    platform-driver-x86@vger.kernel.org
  S:    Maintained
@@@ -12952,7 -12756,6 +12960,7 @@@ M:   Laurent Pinchart <laurent.pinchart@i
  L:    linux-media@vger.kernel.org
  S:    Maintained
  T:    git git://linuxtv.org/media_tree.git
 +F:    Documentation/devicetree/bindings/media/i2c/aptina,mt9p031.yaml
  F:    drivers/media/i2c/mt9p031.c
  F:    include/media/i2c/mt9p031.h
  
@@@ -13247,7 -13050,6 +13255,7 @@@ F:   include/linux/dsa
  F:    include/linux/platform_data/dsa.h
  F:    include/net/dsa.h
  F:    net/dsa/
 +F:    tools/testing/selftests/drivers/net/dsa/
  
  NETWORKING [GENERAL]
  M:    "David S. Miller" <davem@davemloft.net>
@@@ -13460,16 -13262,10 +13468,16 @@@ W:        http://www.netlab.is.tsukuba.ac.jp/~
  F:    Documentation/scsi/NinjaSCSI.rst
  F:    drivers/scsi/nsp32*
  
 +NINTENDO HID DRIVER
 +M:    Daniel J. Ogorchock <djogorchock@gmail.com>
 +L:    linux-input@vger.kernel.org
 +S:    Maintained
 +F:    drivers/hid/hid-nintendo*
 +
  NIOS2 ARCHITECTURE
 -M:    Ley Foon Tan <ley.foon.tan@intel.com>
 +M:    Dinh Nguyen <dinguyen@kernel.org>
  S:    Maintained
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux.git
  F:    arch/nios2/
  
  NITRO ENCLAVES (NE)
@@@ -13595,12 -13391,6 +13603,12 @@@ S: Maintaine
  F:    drivers/video/fbdev/nvidia/
  F:    drivers/video/fbdev/riva/
  
 +NVIDIA WMI EC BACKLIGHT DRIVER
 +M:    Daniel Dadap <ddadap@nvidia.com>
 +L:    platform-driver-x86@vger.kernel.org
 +S:    Supported
 +F:    drivers/platform/x86/nvidia-wmi-ec-backlight.c
 +
  NVM EXPRESS DRIVER
  M:    Keith Busch <kbusch@kernel.org>
  M:    Jens Axboe <axboe@fb.com>
@@@ -13655,7 -13445,7 +13663,7 @@@ M:   Ashish Kumar <ashish.kumar@nxp.com
  R:    Yogesh Gaur <yogeshgaur.83@gmail.com>
  L:    linux-spi@vger.kernel.org
  S:    Maintained
 -F:    Documentation/devicetree/bindings/spi/spi-nxp-fspi.txt
 +F:    Documentation/devicetree/bindings/spi/spi-nxp-fspi.yaml
  F:    drivers/spi/spi-nxp-fspi.c
  
  NXP FXAS21002C DRIVER
@@@ -13683,13 -13473,6 +13691,13 @@@ S: Maintaine
  F:    Documentation/devicetree/bindings/display/imx/nxp,imx8mq-dcss.yaml
  F:    drivers/gpu/drm/imx/dcss/
  
 +NXP i.MX 8QXP ADC DRIVER
 +M:    Cai Huoqing <caihuoqing@baidu.com>
 +L:    linux-iio@vger.kernel.org
 +S:    Supported
 +F:    Documentation/devicetree/bindings/iio/adc/nxp,imx8qxp-adc.yaml
 +F:    drivers/iio/adc/imx8qxp-adc.c
 +
  NXP PF8100/PF8121A/PF8200 PMIC REGULATOR DEVICE DRIVER
  M:    Jagan Teki <jagan@amarulasolutions.com>
  S:    Maintained
@@@ -13745,7 -13528,6 +13753,7 @@@ NXP-NCI NFC DRIVE
  R:    Charles Gorand <charles.gorand@effinnov.com>
  L:    linux-nfc@lists.01.org (subscribers-only)
  S:    Supported
 +F:    Documentation/devicetree/bindings/net/nfc/nxp,nci.yaml
  F:    drivers/nfc/nxp-nci
  
  NXP i.MX 8QXP/8QM JPEG V4L2 DRIVER
@@@ -13753,7 -13535,7 +13761,7 @@@ M:   Mirela Rabulea <mirela.rabulea@nxp.c
  R:    NXP Linux Team <linux-imx@nxp.com>
  L:    linux-media@vger.kernel.org
  S:    Maintained
 -F:    Documentation/devicetree/bindings/media/imx8-jpeg.yaml
 +F:    Documentation/devicetree/bindings/media/nxp,imx8-jpeg.yaml
  F:    drivers/media/platform/imx-jpeg
  
  NZXT-KRAKEN2 HARDWARE MONITORING DRIVER
@@@ -14026,13 -13808,6 +14034,13 @@@ S: Maintaine
  T:    git git://linuxtv.org/media_tree.git
  F:    drivers/media/i2c/ov13858.c
  
 +OMNIVISION OV13B10 SENSOR DRIVER
 +M:    Arec Kao <arec.kao@intel.com>
 +L:    linux-media@vger.kernel.org
 +S:    Maintained
 +T:    git git://linuxtv.org/media_tree.git
 +F:    drivers/media/i2c/ov13b10.c
 +
  OMNIVISION OV2680 SENSOR DRIVER
  M:    Rui Miguel Silva <rmfrfs@gmail.com>
  L:    linux-media@vger.kernel.org
@@@ -14575,8 -14350,7 +14583,8 @@@ F:   Documentation/devicetree/bindings/pc
  F:    drivers/pci/controller/pci-ixp4xx.c
  
  PCI DRIVER FOR INTEL VOLUME MANAGEMENT DEVICE (VMD)
 -M:    Jonathan Derrick <jonathan.derrick@intel.com>
 +M:    Nirmal Patel <nirmal.patel@linux.intel.com>
 +R:    Jonathan Derrick <jonathan.derrick@linux.dev>
  L:    linux-pci@vger.kernel.org
  S:    Supported
  F:    drivers/pci/controller/vmd.c
@@@ -14673,12 -14447,9 +14681,12 @@@ M: Lorenzo Pieralisi <lorenzo.pieralisi
  R:    Krzysztof Wilczyński <kw@linux.com>
  L:    linux-pci@vger.kernel.org
  S:    Supported
 +Q:    https://patchwork.kernel.org/project/linux-pci/list/
 +B:    https://bugzilla.kernel.org
 +C:    irc://irc.oftc.net/linux-pci
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lpieralisi/pci.git
  F:    Documentation/PCI/endpoint/*
  F:    Documentation/misc-devices/pci-endpoint-test.rst
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kishon/pci-endpoint.git
  F:    drivers/misc/pci_endpoint_test.c
  F:    drivers/pci/endpoint/
  F:    tools/pci/
@@@ -14724,21 -14495,15 +14732,21 @@@ R:        Rob Herring <robh@kernel.org
  R:    Krzysztof Wilczyński <kw@linux.com>
  L:    linux-pci@vger.kernel.org
  S:    Supported
 -Q:    http://patchwork.ozlabs.org/project/linux-pci/list/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lpieralisi/pci.git/
 +Q:    https://patchwork.kernel.org/project/linux-pci/list/
 +B:    https://bugzilla.kernel.org
 +C:    irc://irc.oftc.net/linux-pci
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lpieralisi/pci.git
  F:    drivers/pci/controller/
 +F:    drivers/pci/pci-bridge-emul.c
 +F:    drivers/pci/pci-bridge-emul.h
  
  PCI SUBSYSTEM
  M:    Bjorn Helgaas <bhelgaas@google.com>
  L:    linux-pci@vger.kernel.org
  S:    Supported
 -Q:    http://patchwork.ozlabs.org/project/linux-pci/list/
 +Q:    https://patchwork.kernel.org/project/linux-pci/list/
 +B:    https://bugzilla.kernel.org
 +C:    irc://irc.oftc.net/linux-pci
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git
  F:    Documentation/PCI/
  F:    Documentation/devicetree/bindings/pci/
@@@ -14838,15 -14603,7 +14846,15 @@@ M: Stanimir Varbanov <svarbanov@mm-sol.
  L:    linux-pci@vger.kernel.org
  L:    linux-arm-msm@vger.kernel.org
  S:    Maintained
 -F:    drivers/pci/controller/dwc/*qcom*
 +F:    drivers/pci/controller/dwc/pcie-qcom.c
 +
 +PCIE ENDPOINT DRIVER FOR QUALCOMM
 +M:    Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
 +L:    linux-pci@vger.kernel.org
 +L:    linux-arm-msm@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/pci/qcom,pcie-ep.yaml
 +F:    drivers/pci/controller/dwc/pcie-qcom-ep.c
  
  PCIE DRIVER FOR ROCKCHIP
  M:    Shawn Lin <shawn.lin@rock-chips.com>
@@@ -15103,6 -14860,13 +15111,6 @@@ L:  linux-omap@vger.kernel.or
  S:    Maintained
  F:    drivers/pinctrl/pinctrl-single.c
  
 -PIN CONTROLLER - ST SPEAR
 -M:    Viresh Kumar <vireshk@kernel.org>
 -L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -S:    Maintained
 -W:    http://www.st.com/spear
 -F:    drivers/pinctrl/spear/
 -
  PKTCDVD DRIVER
  M:    linux-block@vger.kernel.org
  S:    Orphan
@@@ -15151,6 -14915,7 +15159,6 @@@ S:   Maintaine
  W:    http://hwmon.wiki.kernel.org/
  W:    http://www.roeck-us.net/linux/drivers/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git
 -F:    Documentation/devicetree/bindings/hwmon/ibm,cffps1.txt
  F:    Documentation/devicetree/bindings/hwmon/ltc2978.txt
  F:    Documentation/devicetree/bindings/hwmon/max31785.txt
  F:    Documentation/hwmon/adm1275.rst
@@@ -15389,7 -15154,7 +15397,7 @@@ S:   Maintaine
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git for-next/pstore
  F:    Documentation/admin-guide/ramoops.rst
  F:    Documentation/admin-guide/pstore-blk.rst
 -F:    Documentation/devicetree/bindings/reserved-memory/ramoops.txt
 +F:    Documentation/devicetree/bindings/reserved-memory/ramoops.yaml
  F:    drivers/acpi/apei/erst.c
  F:    drivers/firmware/efi/efi-pstore.c
  F:    fs/pstore/
@@@ -15699,7 -15464,6 +15707,7 @@@ M:   ath9k-devel@qca.qualcomm.co
  L:    linux-wireless@vger.kernel.org
  S:    Supported
  W:    https://wireless.wiki.kernel.org/en/users/Drivers/ath9k
 +F:    Documentation/devicetree/bindings/net/wireless/qca,ath9k.yaml
  F:    drivers/net/wireless/ath/ath9k/
  
  QUALCOMM CAMERA SUBSYSTEM DRIVER
@@@ -15816,14 -15580,6 +15824,14 @@@ S: Maintaine
  F:    Documentation/devicetree/bindings/regulator/vqmmc-ipq4019-regulator.yaml
  F:    drivers/regulator/vqmmc-ipq4019-regulator.c
  
 +QUALCOMM NAND CONTROLLER DRIVER
 +M:    Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
 +L:    linux-mtd@lists.infradead.org
 +L:    linux-arm-msm@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/mtd/qcom,nandc.yaml
 +F:    drivers/mtd/nand/raw/qcom_nandc.c
 +
  QUALCOMM RMNET DRIVER
  M:    Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>
  M:    Sean Tranchetti <stranche@codeaurora.org>
@@@ -16129,12 -15885,6 +16137,12 @@@ L: linux-wireless@vger.kernel.or
  S:    Maintained
  F:    drivers/net/wireless/realtek/rtw88/
  
 +REALTEK WIRELESS DRIVER (rtw89)
 +M:    Ping-Ke Shih <pkshih@realtek.com>
 +L:    linux-wireless@vger.kernel.org
 +S:    Maintained
 +F:    drivers/net/wireless/realtek/rtw89/
 +
  REDPINE WIRELESS DRIVER
  M:    Amitkumar Karwar <amitkarwar@gmail.com>
  M:    Siva Rebbagondla <siva8118@gmail.com>
@@@ -16162,7 -15912,7 +16170,7 @@@ M:   Bjorn Andersson <bjorn.andersson@lin
  M:    Mathieu Poirier <mathieu.poirier@linaro.org>
  L:    linux-remoteproc@vger.kernel.org
  S:    Maintained
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/andersson/remoteproc.git rproc-next
 +T:    git https://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git rproc-next
  F:    Documentation/ABI/testing/sysfs-class-remoteproc
  F:    Documentation/devicetree/bindings/remoteproc/
  F:    Documentation/staging/remoteproc.rst
@@@ -16176,7 -15926,7 +16184,7 @@@ M:   Bjorn Andersson <bjorn.andersson@lin
  M:    Mathieu Poirier <mathieu.poirier@linaro.org>
  L:    linux-remoteproc@vger.kernel.org
  S:    Maintained
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/andersson/remoteproc.git rpmsg-next
 +T:    git https://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git rpmsg-next
  F:    Documentation/ABI/testing/sysfs-bus-rpmsg
  F:    Documentation/staging/rpmsg.rst
  F:    drivers/rpmsg/
@@@ -16355,13 -16105,6 +16363,13 @@@ F: Documentation/ABI/*/sysfs-driver-hid
  F:    drivers/hid/hid-roccat*
  F:    include/linux/hid-roccat*
  
 +ROCKCHIP I2S TDM DRIVER
 +M:    Nicolas Frattaroli <frattaroli.nicolas@gmail.com>
 +L:    linux-rockchip@lists.infradead.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/sound/rockchip,i2s-tdm.yaml
 +F:    sound/soc/rockchip/rockchip_i2s_tdm.*
 +
  ROCKCHIP ISP V1 DRIVER
  M:    Helen Koike <helen.koike@collabora.com>
  M:    Dafna Hirschfeld <dafna.hirschfeld@collabora.com>
@@@ -16376,7 -16119,7 +16384,7 @@@ F:   include/uapi/linux/rkisp1-config.
  
  ROCKCHIP RASTER 2D GRAPHIC ACCELERATION UNIT DRIVER
  M:    Jacob Chen <jacob-chen@iotwrt.com>
 -M:    Ezequiel Garcia <ezequiel@collabora.com>
 +M:    Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
  L:    linux-media@vger.kernel.org
  L:    linux-rockchip@lists.infradead.org
  S:    Maintained
@@@ -16384,7 -16127,7 +16392,7 @@@ F:   Documentation/devicetree/bindings/me
  F:    drivers/media/platform/rockchip/rga/
  
  ROCKCHIP VIDEO DECODER DRIVER
 -M:    Ezequiel Garcia <ezequiel@collabora.com>
 +M:    Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
  L:    linux-media@vger.kernel.org
  L:    linux-rockchip@lists.infradead.org
  S:    Maintained
  M:    Heiko Carstens <hca@linux.ibm.com>
  M:    Vasily Gorbik <gor@linux.ibm.com>
  M:    Christian Borntraeger <borntraeger@de.ibm.com>
 +R:    Alexander Gordeev <agordeev@linux.ibm.com>
  L:    linux-s390@vger.kernel.org
  S:    Supported
  W:    http://www.ibm.com/developerworks/linux/linux390/
@@@ -16639,6 -16381,7 +16647,6 @@@ F:   drivers/s390/crypto/vfio_ap_ops.
  F:    drivers/s390/crypto/vfio_ap_private.h
  
  S390 VFIO-CCW DRIVER
 -M:    Cornelia Huck <cohuck@redhat.com>
  M:    Eric Farman <farman@linux.ibm.com>
  M:    Matthew Rosato <mjrosato@linux.ibm.com>
  R:    Halil Pasic <pasic@linux.ibm.com>
@@@ -16767,11 -16510,10 +16775,11 @@@ M:        Bartlomiej Zolnierkiewicz <b.zolnier
  L:    linux-kernel@vger.kernel.org
  L:    linux-samsung-soc@vger.kernel.org
  S:    Supported
 -F:    Documentation/devicetree/bindings/clock/samsung,s2mps11.txt
 -F:    Documentation/devicetree/bindings/mfd/samsung,sec-core.txt
 -F:    Documentation/devicetree/bindings/regulator/samsung,s2m*.txt
 -F:    Documentation/devicetree/bindings/regulator/samsung,s5m*.txt
 +F:    Documentation/devicetree/bindings/clock/samsung,s2mps11.yaml
 +F:    Documentation/devicetree/bindings/mfd/samsung,s2m*.yaml
 +F:    Documentation/devicetree/bindings/mfd/samsung,s5m*.yaml
 +F:    Documentation/devicetree/bindings/regulator/samsung,s2m*.yaml
 +F:    Documentation/devicetree/bindings/regulator/samsung,s5m*.yaml
  F:    drivers/clk/clk-s2mps11.c
  F:    drivers/mfd/sec*.c
  F:    drivers/regulator/s2m*.c
@@@ -16916,6 -16658,13 +16924,6 @@@ M:  Lubomir Rintel <lkundrak@v3.sk
  S:    Supported
  F:    drivers/char/pcmcia/scr24x_cs.c
  
 -SCSI CDROM DRIVER
 -M:    Jens Axboe <axboe@kernel.dk>
 -L:    linux-scsi@vger.kernel.org
 -S:    Maintained
 -W:    http://www.kernel.dk
 -F:    drivers/scsi/sr*
 -
  SCSI RDMA PROTOCOL (SRP) INITIATOR
  M:    Bart Van Assche <bvanassche@acm.org>
  L:    linux-rdma@vger.kernel.org
@@@ -17055,6 -16804,7 +17063,6 @@@ M:   Adrian Hunter <adrian.hunter@intel.c
  L:    linux-mmc@vger.kernel.org
  S:    Maintained
  F:    drivers/mmc/host/sdhci*
 -F:    include/linux/mmc/sdhci*
  
  SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) MICROCHIP DRIVER
  M:    Eugen Hristev <eugen.hristev@microchip.com>
@@@ -17129,13 -16879,6 +17137,13 @@@ S: Maintaine
  F:    drivers/misc/phantom.c
  F:    include/uapi/linux/phantom.h
  
 +SENSEAIR SUNRISE 006-0-0007
 +M:    Jacopo Mondi <jacopo@jmondi.org>
 +S:    Maintained
 +F:    Documentation/ABI/testing/sysfs-bus-iio-chemical-sunrise-co2
 +F:    Documentation/devicetree/bindings/iio/chemical/senseair,sunrise.yaml
 +F:    drivers/iio/chemical/sunrise_co2.c
 +
  SENSIRION SCD30 CARBON DIOXIDE SENSOR DRIVER
  M:    Tomasz Duszynski <tomasz.duszynski@octakon.com>
  S:    Maintained
@@@ -17145,12 -16888,6 +17153,12 @@@ F: drivers/iio/chemical/scd30_core.
  F:    drivers/iio/chemical/scd30_i2c.c
  F:    drivers/iio/chemical/scd30_serial.c
  
 +SENSIRION SCD4X CARBON DIOXIDE SENSOR DRIVER
 +M:    Roan van Dijk <roan@protonic.nl>
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/iio/chemical/sensirion,scd4x.yaml
 +F:    drivers/iio/chemical/scd4x.c
 +
  SENSIRION SGP40 GAS SENSOR DRIVER
  M:    Andreas Klinger <ak@it-klinger.de>
  S:    Maintained
@@@ -17226,6 -16963,7 +17234,6 @@@ F:   drivers/misc/sgi-xp
  
  SHARED MEMORY COMMUNICATIONS (SMC) SOCKETS
  M:    Karsten Graul <kgraul@linux.ibm.com>
 -M:    Guvenc Gulce <guvenc@linux.ibm.com>
  L:    linux-s390@vger.kernel.org
  S:    Supported
  W:    http://www.ibm.com/developerworks/linux/linux390/
@@@ -17902,17 -17640,21 +17910,17 @@@ W:        https://github.com/linux-speakup/spe
  B:    https://github.com/linux-speakup/speakup/issues
  F:    drivers/accessibility/speakup/
  
 -SPEAR CLOCK FRAMEWORK SUPPORT
 -M:    Viresh Kumar <vireshk@kernel.org>
 -L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -S:    Maintained
 -W:    http://www.st.com/spear
 -F:    drivers/clk/spear/
 -
 -SPEAR PLATFORM SUPPORT
 +SPEAR PLATFORM/CLOCK/PINCTRL SUPPORT
  M:    Viresh Kumar <vireshk@kernel.org>
  M:    Shiraz Hashim <shiraz.linux.kernel@gmail.com>
 +M:    soc@kernel.org
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  W:    http://www.st.com/spear
  F:    arch/arm/boot/dts/spear*
  F:    arch/arm/mach-spear/
 +F:    drivers/clk/spear/
 +F:    drivers/pinctrl/spear/
  
  SPI NOR SUBSYSTEM
  M:    Tudor Ambarus <tudor.ambarus@microchip.com>
@@@ -17924,7 -17666,6 +17932,7 @@@ W:   http://www.linux-mtd.infradead.org
  Q:    http://patchwork.ozlabs.org/project/linux-mtd/list/
  C:    irc://irc.oftc.net/mtd
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git spi-nor/next
 +F:    Documentation/devicetree/bindings/mtd/jedec,spi-nor.yaml
  F:    drivers/mtd/spi-nor/
  F:    include/linux/mtd/spi-nor.h
  
@@@ -18067,6 -17808,7 +18075,6 @@@ F:   drivers/staging/nvec
  
  STAGING - OLPC SECONDARY DISPLAY CONTROLLER (DCON)
  M:    Jens Frederich <jfrederich@gmail.com>
 -M:    Daniel Drake <dsd@laptop.org>
  M:    Jon Nettleton <jon.nettleton@gmail.com>
  S:    Maintained
  W:    http://wiki.laptop.org/go/DCON
@@@ -18157,8 -17899,7 +18165,8 @@@ M:   Olivier Moysan <olivier.moysan@foss.
  M:    Arnaud Pouliquen <arnaud.pouliquen@foss.st.com>
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
  S:    Maintained
 -F:    Documentation/devicetree/bindings/iio/adc/st,stm32-*.yaml
 +F:    Documentation/devicetree/bindings/iio/adc/st,stm32-dfsdm-adc.yaml
 +F:    Documentation/devicetree/bindings/sound/st,stm32-*.yaml
  F:    sound/soc/stm/
  
  STM32 TIMER/LPTIMER DRIVERS
@@@ -18235,11 -17976,10 +18243,11 @@@ F:        Documentation/admin-guide/svga.rs
  F:    arch/x86/boot/video*
  
  SWIOTLB SUBSYSTEM
 -M:    Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
 +M:    Christoph Hellwig <hch@infradead.org>
  L:    iommu@lists.linux-foundation.org
  S:    Supported
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb.git
 +W:    http://git.infradead.org/users/hch/dma-mapping.git
 +T:    git git://git.infradead.org/users/hch/dma-mapping.git
  F:    arch/*/kernel/pci-swiotlb.c
  F:    include/linux/swiotlb.h
  F:    kernel/dma/swiotlb.c
@@@ -18255,7 -17995,7 +18263,7 @@@ F:   net/switchdev
  SY8106A REGULATOR DRIVER
  M:    Icenowy Zheng <icenowy@aosc.io>
  S:    Maintained
 -F:    Documentation/devicetree/bindings/regulator/sy8106a-regulator.txt
 +F:    Documentation/devicetree/bindings/regulator/silergy,sy8106a.yaml
  F:    drivers/regulator/sy8106a-regulator.c
  
  SYNC FILE FRAMEWORK
@@@ -18727,7 -18467,7 +18735,7 @@@ S:   Supporte
  F:    drivers/net/ethernet/tehuti/*
  
  TELECOM CLOCK DRIVER FOR MCPL0010
 -M:    Mark Gross <mark.gross@intel.com>
 +M:    Mark Gross <markgross@kernel.org>
  S:    Supported
  F:    drivers/char/tlclk.c
  
@@@ -18780,7 -18520,7 +18788,7 @@@ M:   Santosh Shilimkar <ssantosh@kernel.o
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    Documentation/devicetree/bindings/arm/keystone/ti,k3-sci-common.yaml
 -F:    Documentation/devicetree/bindings/arm/keystone/ti,sci.txt
 +F:    Documentation/devicetree/bindings/arm/keystone/ti,sci.yaml
  F:    Documentation/devicetree/bindings/clock/ti,sci-clk.yaml
  F:    Documentation/devicetree/bindings/interrupt-controller/ti,sci-inta.yaml
  F:    Documentation/devicetree/bindings/interrupt-controller/ti,sci-intr.yaml
@@@ -18822,17 -18562,14 +18830,17 @@@ T:        git git://linuxtv.org/media_tree.gi
  F:    drivers/media/radio/radio-raremono.c
  
  THERMAL
 -M:    Zhang Rui <rui.zhang@intel.com>
 +M:    Rafael J. Wysocki <rafael@kernel.org>
  M:    Daniel Lezcano <daniel.lezcano@linaro.org>
  R:    Amit Kucheria <amitk@kernel.org>
 +R:    Zhang Rui <rui.zhang@intel.com>
  L:    linux-pm@vger.kernel.org
  S:    Supported
  Q:    https://patchwork.kernel.org/project/linux-pm/list/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git thermal
 +F:    Documentation/ABI/testing/sysfs-class-thermal
  F:    Documentation/devicetree/bindings/thermal/
 +F:    Documentation/driver-api/thermal/
  F:    drivers/thermal/
  F:    include/linux/cpu_cooling.h
  F:    include/linux/thermal.h
@@@ -18960,7 -18697,7 +18968,7 @@@ F:   include/linux/clk/ti.
  
  TI DAVINCI MACHINE SUPPORT
  M:    Sekhar Nori <nsekhar@ti.com>
 -R:    Bartosz Golaszewski <bgolaszewski@baylibre.com>
 +R:    Bartosz Golaszewski <brgl@bgdev.pl>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci.git
@@@ -19050,7 -18787,7 +19058,7 @@@ M:   Mark Greer <mgreer@animalcreek.com
  L:    linux-wireless@vger.kernel.org
  L:    linux-nfc@lists.01.org (subscribers-only)
  S:    Supported
 -F:    Documentation/devicetree/bindings/net/nfc/trf7970a.txt
 +F:    Documentation/devicetree/bindings/net/nfc/ti,trf7970a.yaml
  F:    drivers/nfc/trf7970a.c
  
  TI TSC2046 ADC DRIVER
@@@ -19245,7 -18982,7 +19253,7 @@@ TRACIN
  M:    Steven Rostedt <rostedt@goodmis.org>
  M:    Ingo Molnar <mingo@redhat.com>
  S:    Maintained
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf/core
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git
  F:    Documentation/trace/ftrace.rst
  F:    arch/*/*/*/ftrace.h
  F:    arch/*/kernel/ftrace.c
@@@ -19559,12 -19296,13 +19567,12 @@@ S:        Maintaine
  F:    drivers/usb/misc/chaoskey.c
  
  USB CYPRESS C67X00 DRIVER
 -M:    Peter Korsgaard <jacmet@sunsite.dk>
  L:    linux-usb@vger.kernel.org
 -S:    Maintained
 +S:    Orphan
  F:    drivers/usb/c67x00/
  
  USB DAVICOM DM9601 DRIVER
 -M:    Peter Korsgaard <jacmet@sunsite.dk>
 +M:    Peter Korsgaard <peter@korsgaard.com>
  L:    netdev@vger.kernel.org
  S:    Maintained
  W:    http://www.linux-usb.org/usbnet
@@@ -20203,7 -19941,7 +20211,7 @@@ F:   include/uapi/linux/virtio_snd.
  F:    sound/virtio/*
  
  VIRTIO I2C DRIVER
 -M:    Jie Deng <jie.deng@intel.com>
 +M:    Conghui Chen <conghui.chen@intel.com>
  M:    Viresh Kumar <viresh.kumar@linaro.org>
  L:    linux-i2c@vger.kernel.org
  L:    virtualization@lists.linux-foundation.org
@@@ -20211,13 -19949,6 +20219,13 @@@ S: Maintaine
  F:    drivers/i2c/busses/i2c-virtio.c
  F:    include/uapi/linux/virtio_i2c.h
  
 +VIRTIO PMEM DRIVER
 +M:    Pankaj Gupta <pankaj.gupta.linux@gmail.com>
 +L:    virtualization@lists.linux-foundation.org
 +S:    Maintained
 +F:    drivers/nvdimm/virtio_pmem.c
 +F:    drivers/nvdimm/nd_virtio.c
 +
  VIRTUAL BOX GUEST DEVICE DRIVER
  M:    Hans de Goede <hdegoede@redhat.com>
  M:    Arnd Bergmann <arnd@arndb.de>
@@@ -20613,7 -20344,6 +20621,7 @@@ X86 ARCHITECTURE (32-BIT AND 64-BIT
  M:    Thomas Gleixner <tglx@linutronix.de>
  M:    Ingo Molnar <mingo@redhat.com>
  M:    Borislav Petkov <bp@alien8.de>
 +M:    Dave Hansen <dave.hansen@linux.intel.com>
  M:    x86@kernel.org
  R:    "H. Peter Anvin" <hpa@zytor.com>
  L:    linux-kernel@vger.kernel.org
@@@ -20635,8 -20365,6 +20643,8 @@@ M:   Tony Luck <tony.luck@intel.com
  M:    Borislav Petkov <bp@alien8.de>
  L:    linux-edac@vger.kernel.org
  S:    Maintained
 +F:    Documentation/ABI/testing/sysfs-mce
 +F:    Documentation/x86/x86_64/machinecheck.rst
  F:    arch/x86/kernel/cpu/mce/*
  
  X86 MICROCODE UPDATE SUPPORT
@@@ -20655,7 -20383,7 +20663,7 @@@ F:   arch/x86/mm
  
  X86 PLATFORM DRIVERS
  M:    Hans de Goede <hdegoede@redhat.com>
 -M:    Mark Gross <mgross@linux.intel.com>
 +M:    Mark Gross <markgross@kernel.org>
  L:    platform-driver-x86@vger.kernel.org
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git
@@@ -20754,6 -20482,7 +20762,6 @@@ F:   samples/bpf/xdpsock
  F:    tools/lib/bpf/xsk*
  
  XEN BLOCK SUBSYSTEM
 -M:    Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
  M:    Roger Pau Monné <roger.pau@citrix.com>
  L:    xen-devel@lists.xenproject.org (moderated for non-subscribers)
  S:    Supported
@@@ -20801,7 -20530,7 +20809,7 @@@ S:   Supporte
  F:    drivers/net/xen-netback/*
  
  XEN PCI SUBSYSTEM
 -M:    Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
 +M:    Juergen Gross <jgross@suse.com>
  L:    xen-devel@lists.xenproject.org (moderated for non-subscribers)
  S:    Supported
  F:    arch/x86/pci/*xen*
@@@ -20824,8 -20553,7 +20832,8 @@@ S:   Supporte
  F:    sound/xen/*
  
  XEN SWIOTLB SUBSYSTEM
 -M:    Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
 +M:    Juergen Gross <jgross@suse.com>
 +M:    Stefano Stabellini <sstabellini@kernel.org>
  L:    xen-devel@lists.xenproject.org (moderated for non-subscribers)
  L:    iommu@lists.linux-foundation.org
  S:    Supported
@@@ -20984,6 -20712,7 +20992,6 @@@ S:   Maintaine
  F:    mm/zbud.c
  
  ZD1211RW WIRELESS DRIVER
 -M:    Daniel Drake <dsd@gentoo.org>
  M:    Ulrich Kunitz <kune@deine-taler.de>
  L:    linux-wireless@vger.kernel.org
  L:    zd1211-devs@lists.sourceforge.net (subscribers-only)
index 81cee1a5daa6c388d1dabc8d38412c1c12d6b0f0,6ee1f410eb53a4eef28f5f3777a9215fbcba1e84..546feef851abb5e7abc63c820322f0878220117b
@@@ -146,8 -146,8 +146,8 @@@ static int ec_device_probe(struct platf
        ec->ec_dev = dev_get_drvdata(dev->parent);
        ec->dev = dev;
        ec->cmd_offset = ec_platform->cmd_offset;
-       ec->features[0] = -1U; /* Not cached yet */
-       ec->features[1] = -1U; /* Not cached yet */
+       ec->features.flags[0] = -1U; /* Not cached yet */
+       ec->features.flags[1] = -1U; /* Not cached yet */
        device_initialize(&ec->class_dev);
  
        for (i = 0; i < ARRAY_SIZE(cros_mcu_devices); i++) {
@@@ -326,6 -326,7 +326,6 @@@ static void __exit cros_ec_dev_exit(voi
  module_init(cros_ec_dev_init);
  module_exit(cros_ec_dev_exit);
  
 -MODULE_ALIAS("platform:" DRV_NAME);
  MODULE_AUTHOR("Bill Richardson <wfrichar@chromium.org>");
  MODULE_DESCRIPTION("Userspace interface to the Chrome OS Embedded Controller");
  MODULE_VERSION("1.0");