Merge tag 'acpi-5.6-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

Pull more ACPI updates from Rafael Wysocki:
 "Fix up MAINTAINERS entires related to ACPI (Andy Shevchenko)"

* tag 'acpi-5.6-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  MAINTAINERS: Sort entries in database for X-POWERS AXP288
  MAINTAINERS: Sort entries in database for ACPICA
  MAINTAINERS: Sort entries in database for ACPI

diff --combined MAINTAINERS
index 19da622dd0b1d8b6574b6cd9aec7503fc95c2b14,ec34052e7239816a6cda982a80b484595280560b..2dabe70429fa84e1195a3753c1855b79bc3ead6a
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -317,30 -317,30 +317,30 @@@ ACP
  M:    "Rafael J. Wysocki" <[email protected]>
  M:    Len Brown <[email protected]>
  L:    [email protected]
+ S:    Supported
  W:    https://01.org/linux-acpi
- Q:    https://patchwork.kernel.org/project/linux-acpi/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
+ Q:    https://patchwork.kernel.org/project/linux-acpi/list/
  B:    https://bugzilla.kernel.org
- S:    Supported
+ F:    Documentation/ABI/testing/configfs-acpi
+ F:    Documentation/ABI/testing/sysfs-bus-acpi
+ F:    Documentation/firmware-guide/acpi/
  F:    drivers/acpi/
+ F:    drivers/pci/*/*acpi*
+ F:    drivers/pci/*acpi*
  F:    drivers/pnp/pnpacpi/
+ F:    include/acpi/
  F:    include/linux/acpi.h
  F:    include/linux/fwnode.h
- F:    include/acpi/
- F:    Documentation/firmware-guide/acpi/
- F:    Documentation/ABI/testing/sysfs-bus-acpi
- F:    Documentation/ABI/testing/configfs-acpi
- F:    drivers/pci/*acpi*
- F:    drivers/pci/*/*acpi*
  F:    tools/power/acpi/
  
  ACPI APEI
  M:    "Rafael J. Wysocki" <[email protected]>
  M:    Len Brown <[email protected]>
- L:    [email protected]
  R:    James Morse <[email protected]>
  R:    Tony Luck <[email protected]>
  R:    Borislav Petkov <[email protected]>
+ L:    [email protected]
  F:    drivers/acpi/apei/
  
  ACPI COMPONENT ARCHITECTURE (ACPICA)
@@@ -349,13 -349,13 +349,13 @@@ M:      Erik Kaneda <[email protected]
  M:    "Rafael J. Wysocki" <[email protected]>
  L:    [email protected]
  L:    [email protected]
+ S:    Supported
  W:    https://acpica.org/
  W:    https://github.com/acpica/acpica/
- Q:    https://patchwork.kernel.org/project/linux-acpi/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
+ Q:    https://patchwork.kernel.org/project/linux-acpi/list/
  B:    https://bugzilla.kernel.org
  B:    https://bugs.acpica.org
- S:    Supported
  F:    drivers/acpi/acpica/
  F:    include/acpi/
  F:    tools/power/acpi/
@@@ -363,9 -363,9 +363,9 @@@
  ACPI FAN DRIVER
  M:    Zhang Rui <[email protected]>
  L:    [email protected]
+ S:    Supported
  W:    https://01.org/linux-acpi
  B:    https://bugzilla.kernel.org
- S:    Supported
  F:    drivers/acpi/fan.c
  
  ACPI FOR ARM64 (ACPI/arm64)
@@@ -389,26 -389,26 +389,26 @@@ M:      Len Brown <[email protected]
  R:    Andy Shevchenko <[email protected]>
  R:    Mika Westerberg <[email protected]>
  L:    [email protected]
- Q:    https://patchwork.kernel.org/project/linux-acpi/list/
+ S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
+ Q:    https://patchwork.kernel.org/project/linux-acpi/list/
  B:    https://bugzilla.kernel.org
- S:    Supported
  F:    drivers/acpi/pmic/
  
  ACPI THERMAL DRIVER
  M:    Zhang Rui <[email protected]>
  L:    [email protected]
+ S:    Supported
  W:    https://01.org/linux-acpi
  B:    https://bugzilla.kernel.org
- S:    Supported
  F:    drivers/acpi/*thermal*
  
  ACPI VIDEO DRIVER
  M:    Zhang Rui <[email protected]>
  L:    [email protected]
+ S:    Supported
  W:    https://01.org/linux-acpi
  B:    https://bugzilla.kernel.org
- S:    Supported
  F:    drivers/acpi/acpi_video.c
  
  ACPI WMI DRIVER
@@@ -674,14 -674,6 +674,14 @@@ S:       Maintaine
  F:    Documentation/i2c/busses/i2c-ali1563.rst
  F:    drivers/i2c/busses/i2c-ali1563.c
  
 +ALL SENSORS DLH SERIES PRESSURE SENSORS DRIVER
 +M:    Tomislav Denis <[email protected]>
 +W:    http://www.allsensors.com/
 +S:    Maintained
 +L:    [email protected]
 +F:    drivers/iio/pressure/dlhl60d.c
 +F:    Documentation/devicetree/bindings/iio/pressure/asc,dlhl60d.yaml
 +
  ALLEGRO DVT VIDEO IP CORE DRIVER
  M:    Michael Tretter <[email protected]>
  R:    Pengutronix Kernel Team <[email protected]>
@@@ -702,14 -694,6 +702,14 @@@ L:       [email protected]
  S:    Maintained
  F:    drivers/crypto/allwinner/
  
 +ALLWINNER THERMAL DRIVER
 +M:    Vasily Khoruzhick <[email protected]>
 +M:    Yangtao Li <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/thermal/allwinner,sun8i-a83t-ths.yaml
 +F:    drivers/thermal/sun8i_thermal.c
 +
  ALLWINNER VPU DRIVER
  M:    Maxime Ripard <[email protected]>
  M:    Paul Kocialkowski <[email protected]>
@@@ -742,7 -726,7 +742,7 @@@ S: Maintaine
  F:    drivers/mailbox/mailbox-altera.c
  
  ALTERA PIO DRIVER
 -M:    Tien Hock Loh <thloh@altera.com>
 +M:    Joyce Ooi <joyce.ooi@intel.com>
  L:    [email protected]
  S:    Maintained
  F:    drivers/gpio/gpio-altera.c
@@@ -807,6 -791,7 +807,6 @@@ F: include/uapi/rdma/efa-abi.
  
  AMD CRYPTOGRAPHIC COPROCESSOR (CCP) DRIVER
  M:    Tom Lendacky <[email protected]>
 -M:    Gary Hook <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    drivers/crypto/ccp/
@@@ -915,14 -900,6 +915,14 @@@ S:       Supporte
  F:    drivers/iio/dac/ad5758.c
  F:    Documentation/devicetree/bindings/iio/dac/ad5758.txt
  
 +ANALOG DEVICES INC AD7091R5 DRIVER
 +M:    Beniamin Bia <[email protected]>
 +L:    [email protected]
 +W:    http://ez.analog.com/community/linux-device-drivers
 +S:    Supported
 +F:    drivers/iio/adc/ad7091r5.c
 +F:    Documentation/devicetree/bindings/iio/adc/adi,ad7091r5.yaml
 +
  ANALOG DEVICES INC AD7124 DRIVER
  M:    Stefan Popa <[email protected]>
  L:    [email protected]
@@@ -1077,7 -1054,7 +1077,7 @@@ S:      Supporte
  F:    Documentation/ABI/testing/sysfs-bus-iio-frequency-ad9523
  F:    Documentation/ABI/testing/sysfs-bus-iio-frequency-adf4350
  F:    drivers/iio/*/ad*
 -F:    drivers/iio/adc/ltc2497*
 +F:    drivers/iio/adc/ltc249*
  X:    drivers/iio/*/adjd*
  F:    drivers/staging/iio/*/ad*
  
@@@ -2727,14 -2704,6 +2727,14 @@@ S:    Maintaine
  F:    drivers/pinctrl/aspeed/
  F:    Documentation/devicetree/bindings/pinctrl/aspeed,*
  
 +ASPEED SCU INTERRUPT CONTROLLER DRIVER
 +M:    Eddie James <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/interrupt-controller/aspeed,ast2xxx-scu-ic.txt
 +F:    drivers/irqchip/irq-aspeed-scu-ic.c
 +F:    include/dt-bindings/interrupt-controller/aspeed-scu-ic.h
 +
  ASPEED VIDEO ENGINE DRIVER
  M:    Eddie James <[email protected]>
  L:    [email protected]
@@@ -3132,13 -3101,6 +3132,13 @@@ S:    Supporte
  F:    drivers/net/bonding/
  F:    include/uapi/linux/if_bonding.h
  
 +BOSCH SENSORTEC BMA400 ACCELEROMETER IIO DRIVER
 +M:    Dan Robertson <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/iio/accel/bma400*
 +F:    Documentation/devicetree/bindings/iio/accel/bosch,bma400.yaml
 +
  BPF (Safe dynamic programs and tools)
  M:    Alexei Starovoitov <[email protected]>
  M:    Daniel Borkmann <[email protected]>
@@@ -4896,7 -4858,6 +4896,7 @@@ S:      Supporte
  F:    net/core/devlink.c
  F:    include/net/devlink.h
  F:    include/uapi/linux/devlink.h
 +F:    Documentation/networking/devlink
  
  DIALOG SEMICONDUCTOR DRIVERS
  M:    Support Opensource <[email protected]>
@@@ -5025,24 -4986,6 +5025,24 @@@ F:    Documentation/driver-api/dma-buf.rs
  K:    dma_(buf|fence|resv)
  T:    git git://anongit.freedesktop.org/drm/drm-misc
  
 +DMA-BUF HEAPS FRAMEWORK
 +M:    Sumit Semwal <[email protected]>
 +R:    Andrew F. Davis <[email protected]>
 +R:    Benjamin Gaignard <[email protected]>
 +R:    Liam Mark <[email protected]>
 +R:    Laura Abbott <[email protected]>
 +R:    Brian Starkey <[email protected]>
 +R:    John Stultz <[email protected]>
 +S:    Maintained
 +L:    [email protected]
 +L:    [email protected]
 +L:    [email protected] (moderated for non-subscribers)
 +F:    include/uapi/linux/dma-heap.h
 +F:    include/linux/dma-heap.h
 +F:    drivers/dma-buf/dma-heap.c
 +F:    drivers/dma-buf/heaps/*
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
 +
  DMA GENERIC OFFLOAD ENGINE SUBSYSTEM
  M:    Vinod Koul <[email protected]>
  L:    [email protected]
@@@ -5248,12 -5191,6 +5248,12 @@@ T:    git git://anongit.freedesktop.org/dr
  S:    Maintained
  F:    drivers/gpu/drm/bochs/
  
 +DRM DRIVER FOR BOE HIMAX8279D PANELS
 +M:    Jerry Han <[email protected]>
 +S:    Maintained
 +F:    drivers/gpu/drm/panel/panel-boe-himax8279d.c
 +F:    Documentation/devicetree/bindings/display/panel/boe,himax8279d.txt
 +
  DRM DRIVER FOR FARADAY TVE200 TV ENCODER
  M:    Linus Walleij <[email protected]>
  T:    git git://anongit.freedesktop.org/drm/drm-misc
@@@ -5409,12 -5346,6 +5409,12 @@@ S:    Maintaine
  F:    drivers/gpu/drm/tiny/st7735r.c
  F:    Documentation/devicetree/bindings/display/sitronix,st7735r.txt
  
 +DRM DRIVER FOR SONY ACX424AKP PANELS
 +M:    Linus Walleij <[email protected]>
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
 +S:    Maintained
 +F:    drivers/gpu/drm/panel/panel-sony-acx424akp.c
 +
  DRM DRIVER FOR ST-ERICSSON MCDE
  M:    Linus Walleij <[email protected]>
  T:    git git://anongit.freedesktop.org/drm/drm-misc
@@@ -5487,6 -5418,7 +5487,6 @@@ F:      include/linux/vga
  DRM DRIVERS AND MISC GPU PATCHES
  M:    Maarten Lankhorst <[email protected]>
  M:    Maxime Ripard <[email protected]>
 -M:    Sean Paul <[email protected]>
  W:    https://01.org/linuxgraphics/gfx-docs/maintainer-tools/drm-misc.html
  S:    Maintained
  T:    git git://anongit.freedesktop.org/drm/drm-misc
@@@ -6233,12 -6165,6 +6233,12 @@@ M:    Maxim Levitsky <maximlevitsky@gmail.
  S:    Maintained
  F:    drivers/media/rc/ene_ir.*
  
 +EPAPR HYPERVISOR BYTE CHANNEL DEVICE DRIVER
 +M:    Laurentiu Tudor <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/tty/ehv_bytechan.c
 +
  EPSON S1D13XXX FRAMEBUFFER DRIVER
  M:    Kristoffer Ericson <[email protected]>
  S:    Maintained
@@@ -6487,7 -6413,6 +6487,7 @@@ F:      fs/
  F:    include/linux/fs.h
  F:    include/linux/fs_types.h
  F:    include/uapi/linux/fs.h
 +F:    include/uapi/linux/openat2.h
  
  FINTEK F75375S HARDWARE MONITOR AND FAN CONTROLLER DRIVER
  M:    Riku Voipio <[email protected]>
@@@ -8442,6 -8367,7 +8442,6 @@@ S:      Maintaine
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git
  F:    drivers/gpio/gpio-ich.c
  F:    drivers/gpio/gpio-intel-mid.c
 -F:    drivers/gpio/gpio-lynxpoint.c
  F:    drivers/gpio/gpio-merrifield.c
  F:    drivers/gpio/gpio-ml-ioh.c
  F:    drivers/gpio/gpio-pch.c
@@@ -8915,7 -8841,7 +8915,7 @@@ S:      Maintaine
  F:    drivers/isdn/mISDN
  F:    drivers/isdn/hardware
  
 -ISDN/CAPI SUBSYSTEM
 +ISDN/CMTP OVER BLUETOOTH
  M:    Karsten Keil <[email protected]>
  L:    [email protected] (subscribers-only)
  L:    [email protected]
@@@ -8923,6 -8849,7 +8923,6 @@@ W:      http://www.isdn4linux.d
  S:    Odd Fixes
  F:    Documentation/isdn/
  F:    drivers/isdn/capi/
 -F:    drivers/staging/isdn/
  F:    net/bluetooth/cmtp/
  F:    include/linux/isdn/
  F:    include/uapi/linux/isdn/
@@@ -9236,7 -9163,7 +9236,7 @@@ F:      arch/x86/include/uapi/asm/svm.
  F:    arch/x86/include/asm/kvm*
  F:    arch/x86/include/asm/pvclock-abi.h
  F:    arch/x86/include/asm/svm.h
 -F:    arch/x86/include/asm/vmx.h
 +F:    arch/x86/include/asm/vmx*.h
  F:    arch/x86/kernel/kvm.c
  F:    arch/x86/kernel/kvmclock.c
  
@@@ -9685,7 -9612,6 +9685,7 @@@ LINUX KERNEL DUMP TEST MODULE (LKDTM
  M:    Kees Cook <[email protected]>
  S:    Maintained
  F:    drivers/misc/lkdtm/*
 +F:    tools/testing/selftests/lkdtm/*
  
  LINUX KERNEL MEMORY CONSISTENCY MODEL (LKMM)
  M:    Alan Stern <[email protected]>
@@@ -9994,7 -9920,7 +9994,7 @@@ S:      Maintaine
  F:    drivers/net/dsa/mv88e6xxx/
  F:    include/linux/platform_data/mv88e6xxx.h
  F:    Documentation/devicetree/bindings/net/dsa/marvell.txt
 -F:    Documentation/networking/devlink-params-mv88e6xxx.txt
 +F:    Documentation/networking/devlink/mv88e6xxx.rst
  
  MARVELL ARMADA DRM SUPPORT
  M:    Russell King <[email protected]>
@@@ -10064,7 -9990,8 +10064,7 @@@ F:    drivers/net/ethernet/marvell/mvneta.
  
  MARVELL MWIFIEX WIRELESS DRIVER
  M:    Amitkumar Karwar <[email protected]>
 -M:    Nishant Sarmukadam <[email protected]>
 -M:    Ganapathi Bhat <[email protected]>
 +M:    Ganapathi Bhat <[email protected]>
  M:    Xinming Hu <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -10103,16 -10030,6 +10103,16 @@@ M: Jerin Jacob <[email protected]
  L:    [email protected]
  S:    Supported
  F:    drivers/net/ethernet/marvell/octeontx2/af/
 +F:    Documentation/networking/device_drivers/marvell/octeontx2.rst
 +
 +MARVELL OCTEONTX2 PHYSICAL FUNCTION DRIVER
 +M:    Sunil Goutham <[email protected]>
 +M:    Geetha sowjanya <[email protected]>
 +M:    Subbaraya Sundeep <[email protected]>
 +M:    hariprasad <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/net/ethernet/marvell/octeontx2/nic/
  
  MATROX FRAMEBUFFER DRIVER
  L:    [email protected]
@@@ -10395,7 -10312,7 +10395,7 @@@ L:   [email protected]
  L:    [email protected]
  T:    git git://linuxtv.org/media_tree.git
  S:    Supported
 -F:    Documentation/devicetree/bindings/media/renesas,ceu.txt
 +F:    Documentation/devicetree/bindings/media/renesas,ceu.yaml
  F:    drivers/media/platform/renesas-ceu.c
  F:    include/media/drv-intf/renesas-ceu.h
  
@@@ -10433,7 -10350,7 +10433,7 @@@ L:   [email protected]
  L:    [email protected]
  T:    git git://linuxtv.org/media_tree.git
  S:    Supported
 -F:    Documentation/devicetree/bindings/media/renesas,csi2.txt
 +F:    Documentation/devicetree/bindings/media/renesas,csi2.yaml
  F:    Documentation/devicetree/bindings/media/renesas,vin.txt
  F:    drivers/media/platform/rcar-vin/
  
@@@ -11116,6 -11033,7 +11116,6 @@@ F:   drivers/usb/image/microtek.
  MIPS
  M:    Ralf Baechle <[email protected]>
  M:    Paul Burton <[email protected]>
 -M:    James Hogan <[email protected]>
  L:    [email protected]
  W:    http://www.linux-mips.org/
  T:    git git://git.linux-mips.org/pub/scm/ralf/linux.git
@@@ -11506,7 -11424,7 +11506,7 @@@ F:   Documentation/networking/net_failove
  
  NETEM NETWORK EMULATOR
  M:    Stephen Hemminger <[email protected]>
 -L:    net[email protected] (moderated for non-subscribers)
 +L:    net[email protected]
  S:    Maintained
  F:    net/sched/sch_netem.c
  
@@@ -11694,18 -11612,6 +11694,18 @@@ F: net/ipv6/calipso.
  F:    net/netfilter/xt_CONNSECMARK.c
  F:    net/netfilter/xt_SECMARK.c
  
 +NETWORKING [MPTCP]
 +M:    Mat Martineau <[email protected]>
 +M:    Matthieu Baerts <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +W:    https://github.com/multipath-tcp/mptcp_net-next/wiki
 +B:    https://github.com/multipath-tcp/mptcp_net-next/issues
 +S:    Maintained
 +F:    include/net/mptcp.h
 +F:    net/mptcp/
 +F:    tools/testing/selftests/net/mptcp/
 +
  NETWORKING [TCP]
  M:    Eric Dumazet <[email protected]>
  L:    [email protected]
@@@ -12564,7 -12470,7 +12564,7 @@@ L:   [email protected]
  S:    Maintained
  F:    kernel/padata.c
  F:    include/linux/padata.h
 -F:    Documentation/padata.txt
 +F:    Documentation/core-api/padata.rst
  
  PAGE POOL
  M:    Jesper Dangaard Brouer <[email protected]>
@@@ -12580,13 -12486,6 +12580,13 @@@ L: [email protected]
  S:    Maintained
  F:    drivers/platform/x86/panasonic-laptop.c
  
 +PARALLAX PING IIO SENSOR DRIVER
 +M:    Andreas Klinger <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/iio/proximity/parallax-ping.yaml
 +F:    drivers/iio/proximity/ping.c
 +
  PARALLEL LCD/KEYPAD PANEL DRIVER
  M:    Willy Tarreau <[email protected]>
  M:    Ksenija Stanojevic <[email protected]>
@@@ -12724,7 -12623,7 +12724,7 @@@ M:   Rob Herring <[email protected]
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/devicetree/bindings/pci/versatile.txt
 +F:    Documentation/devicetree/bindings/pci/versatile.yaml
  F:    drivers/pci/controller/pci-versatile.c
  
  PCI DRIVER FOR ARMADA 8K
@@@ -12757,7 -12656,7 +12757,7 @@@ M:   Will Deacon <[email protected]
  L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
 -F:    Documentation/devicetree/bindings/pci/host-generic-pci.txt
 +F:    Documentation/devicetree/bindings/pci/host-generic-pci.yaml
  F:    drivers/pci/controller/pci-host-common.c
  F:    drivers/pci/controller/pci-host-generic.c
  
@@@ -13340,11 -13239,6 +13340,6 @@@ T:  git git://github.com/intel/pm-grap
  S:    Supported
  F:    tools/power/pm-graph
  
- PNP SUPPORT
- M:    "Rafael J. Wysocki" <[email protected]>
- S:    Maintained
- F:    drivers/pnp/
- 
  PNI RM3100 IIO DRIVER
  M:    Song Qiang <[email protected]>
  L:    [email protected]
@@@ -13352,6 -13246,11 +13347,11 @@@ S: Maintaine
  F:    drivers/iio/magnetometer/rm3100*
  F:    Documentation/devicetree/bindings/iio/magnetometer/pni,rm3100.txt
  
+ PNP SUPPORT
+ M:    "Rafael J. Wysocki" <[email protected]>
+ S:    Maintained
+ F:    drivers/pnp/
+ 
  POSIX CLOCKS and TIMERS
  M:    Thomas Gleixner <[email protected]>
  L:    [email protected]
@@@ -13359,8 -13258,6 +13359,8 @@@ T:   git git://git.kernel.org/pub/scm/lin
  S:    Maintained
  F:    fs/timerfd.c
  F:    include/linux/timer*
 +F:    include/linux/time_namespace.h
 +F:    kernel/time_namespace.c
  F:    kernel/time/*timer*
  
  POWER MANAGEMENT CORE
@@@ -13796,13 -13693,6 +13796,13 @@@ T: git git://git.kernel.org/pub/scm/lin
  S:    Supported
  F:    drivers/net/wireless/ath/ath10k/
  
 +QUALCOMM ATHEROS ATH11K WIRELESS DRIVER
 +M:    Kalle Valo <[email protected]>
 +L:    [email protected]
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
 +S:    Supported
 +F:    drivers/net/wireless/ath/ath11k/
 +
  QUALCOMM ATHEROS ATH9K WIRELESS DRIVER
  M:    QCA ath9k Development <[email protected]>
  L:    [email protected]
@@@ -14668,7 -14558,7 +14668,7 @@@ F:   drivers/media/i2c/s5k5baf.
  SAMSUNG S5P Security SubSystem (SSS) DRIVER
  M:    Krzysztof Kozlowski <[email protected]>
  M:    Vladimir Zapolskiy <[email protected]>
 -M:    Kamil Konieczny <k.konieczny@partner.samsung.com>
 +M:    Kamil Konieczny <[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
@@@ -14980,7 -14870,6 +14980,7 @@@ F:   include/uapi/linux/selinux_netlink.
  F:    security/selinux/
  F:    scripts/selinux/
  F:    Documentation/admin-guide/LSM/SELinux.rst
 +F:    Documentation/ABI/obsolete/sysfs-selinux-disable
  
  SENSABLE PHANTOM
  M:    Jiri Slaby <[email protected]>
@@@ -15207,8 -15096,11 +15207,8 @@@ F:  drivers/video/fbdev/sm712
  F:    Documentation/fb/sm712fb.rst
  
  SIMPLE FIRMWARE INTERFACE (SFI)
 -M:    Len Brown <[email protected]>
 -L:    [email protected]
  W:    http://simplefirmware.org/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-sfi-2.6.git
 -S:    Supported
 +S:    Obsolete
  F:    arch/x86/platform/sfi/
  F:    drivers/sfi/
  F:    include/linux/sfi*.h
@@@ -15928,7 -15820,6 +15928,7 @@@ M:   Jose Abreu <[email protected]
  L:    [email protected]
  W:    http://www.stlinux.com
  S:    Supported
 +F:    Documentation/networking/device_drivers/stmicro/
  F:    drivers/net/ethernet/stmicro/stmmac/
  
  SUN3/3X
@@@ -16501,15 -16392,12 +16501,15 @@@ F:        Documentation/devicetree/bindings/th
  
  THERMAL/CPU_COOLING
  M:    Amit Daniel Kachhap <[email protected]>
 +M:    Daniel Lezcano <[email protected]>
  M:    Viresh Kumar <[email protected]>
  M:    Javi Merino <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    Documentation/driver-api/thermal/cpu-cooling-api.rst
 -F:    drivers/thermal/cpu_cooling.c
 +F:    Documentation/driver-api/thermal/cpu-idle-cooling.rst
 +F:    drivers/thermal/cpufreq_cooling.c
 +F:    drivers/thermal/cpuidle_cooling.c
  F:    include/linux/cpu_cooling.h
  
  THERMAL DRIVER FOR AMLOGIC SOCS
@@@ -16536,7 -16424,6 +16536,7 @@@ M:   Andreas Noever <andreas.noever@gmail
  M:    Michael Jamet <[email protected]>
  M:    Mika Westerberg <[email protected]>
  M:    Yehezkel Bernat <[email protected]>
 +L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git
  S:    Maintained
  F:    Documentation/admin-guide/thunderbolt.rst
@@@ -17539,7 -17426,7 +17539,7 @@@ F:   drivers/mtd/nand/raw/vf610_nfc.
  VFAT/FAT/MSDOS FILESYSTEM
  M:    OGAWA Hirofumi <[email protected]>
  S:    Maintained
 -F:    Documentation/filesystems/vfat.txt
 +F:    Documentation/filesystems/vfat.rst
  F:    fs/fat/
  
  VFIO DRIVER
@@@ -17662,7 -17549,6 +17662,7 @@@ F:   net/vmw_vsock/diag.
  F:    net/vmw_vsock/af_vsock_tap.c
  F:    net/vmw_vsock/virtio_transport_common.c
  F:    net/vmw_vsock/virtio_transport.c
 +F:    net/vmw_vsock/vsock_loopback.c
  F:    drivers/net/vsockmon.c
  F:    drivers/vhost/vsock.c
  F:    tools/testing/vsock/
@@@ -18033,14 -17919,6 +18033,14 @@@ L: [email protected]
  S:    Maintained
  F:    drivers/gpio/gpio-ws16c48.c
  
 +WIREGUARD SECURE NETWORK TUNNEL
 +M:    Jason A. Donenfeld <[email protected]>
 +S:    Maintained
 +F:    drivers/net/wireguard/
 +F:    tools/testing/selftests/wireguard/
 +L:    [email protected]
 +L:    [email protected]
 +
  WISTRON LAPTOP BUTTON DRIVER
  M:    Miloslav Trmac <[email protected]>
  S:    Maintained
@@@ -18104,8 -17982,8 +18104,8 @@@ F:   Documentation/core-api/workqueue.rs
  X-POWERS AXP288 PMIC DRIVERS
  M:    Hans de Goede <[email protected]>
  S:    Maintained
- N:    axp288
  F:    drivers/acpi/pmic/intel_pmic_xpower.c
+ N:    axp288
  
  X-POWERS MULTIFUNCTION PMIC DEVICE DRIVERS
  M:    Chen-Yu Tsai <[email protected]>