Merge tag 'platform-drivers-x86-v5.9-2' of git://git.infradead.org/linux-platform...

Pull x86 platform driver fixes from Andy Shevchenko:
 "We have some fixes for Tablet Mode reporting in particular, that users
  are complaining a lot about.

  Summary:

   - Attempt #3 of enabling Tablet Mode reporting w/o regressions

   - Improve battery recognition code in ASUS WMI driver

   - Fix Kconfig dependency warning for Fujitsu and LG laptop drivers

   - Add fixes in Thinkpad ACPI driver for _BCL method and NVRAM polling

   - Fix power supply extended topology in Mellanox driver

   - Fix memory leak in OLPC EC driver

   - Avoid static struct device in Intel PMC core driver

   - Add support for the touchscreen found in MPMAN Converter9 2-in-1

   - Update MAINTAINERS to reflect the real state of affairs"

* tag 'platform-drivers-x86-v5.9-2' of git://git.infradead.org/linux-platform-drivers-x86:
  platform/x86: thinkpad_acpi: re-initialize ACPI buffer size when reuse
  MAINTAINERS: Add Mark Gross and Hans de Goede as x86 platform drivers maintainers
  platform/x86: intel-vbtn: Switch to an allow-list for SW_TABLET_MODE reporting
  platform/x86: intel-vbtn: Revert "Fix SW_TABLET_MODE always reporting 1 on the HP Pavilion 11 x360"
  platform/x86: intel_pmc_core: do not create a static struct device
  platform/x86: mlx-platform: Fix extended topology configuration for power supply units
  platform/x86: pcengines-apuv2: Fix typo on define of AMD_FCH_GPIO_REG_GPIO55_DEVSLP0
  platform/x86: fix kconfig dependency warning for FUJITSU_LAPTOP
  platform/x86: fix kconfig dependency warning for LG_LAPTOP
  platform/x86: thinkpad_acpi: initialize tp_nvram_state variable
  platform/x86: intel-vbtn: Fix SW_TABLET_MODE always reporting 1 on the HP Pavilion 11 x360
  platform/x86: asus-wmi: Add BATC battery name to the list of supported
  platform/x86: asus-nb-wmi: Revert "Do not load on Asus T100TA and T200TA"
  platform/x86: touchscreen_dmi: Add info for the MPMAN Converter9 2-in-1
  Documentation: laptops: thinkpad-acpi: fix underline length build warning
  Platform: OLPC: Fix memleak in olpc_ec_probe

diff --combined MAINTAINERS
index d101b00,b1c97a1..cd2aea6
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1694,6 -1694,7 +1694,6 @@@ F:      arch/arm/mach-cns3xxx
  
  ARM/CAVIUM THUNDER NETWORK DRIVER
  M:    Sunil Goutham <sgoutham@marvell.com>
 -M:    Robert Richter <rrichter@marvell.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Supported
  F:    drivers/net/ethernet/cavium/thunder/
@@@ -3204,7 -3205,6 +3204,7 @@@ S:      Maintaine
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git
  F:    block/
  F:    drivers/block/
 +F:    include/linux/blk*
  F:    kernel/trace/blktrace.c
  F:    lib/sbitmap.c
  
@@@ -3388,7 -3388,6 +3388,7 @@@ M:      Florian Fainelli <f.fainelli@gmail.c
  L:    netdev@vger.kernel.org
  L:    openwrt-devel@lists.openwrt.org (subscribers-only)
  S:    Supported
 +F:    Documentation/devicetree/bindings/net/dsa/b53.txt
  F:    drivers/net/dsa/b53/*
  F:    include/linux/platform_data/b53.h
  
@@@ -3574,28 -3573,13 +3574,28 @@@ L:   bcm-kernel-feedback-list@broadcom.co
  S:    Maintained
  F:    drivers/phy/broadcom/phy-brcm-usb*
  
 +BROADCOM ETHERNET PHY DRIVERS
 +M:    Florian Fainelli <f.fainelli@gmail.com>
 +L:    bcm-kernel-feedback-list@broadcom.com
 +L:    netdev@vger.kernel.org
 +S:    Supported
 +F:    Documentation/devicetree/bindings/net/broadcom-bcm87xx.txt
 +F:    drivers/net/phy/bcm*.[ch]
 +F:    drivers/net/phy/broadcom.c
 +F:    include/linux/brcmphy.h
 +
  BROADCOM GENET ETHERNET DRIVER
  M:    Doug Berger <opendmb@gmail.com>
  M:    Florian Fainelli <f.fainelli@gmail.com>
  L:    bcm-kernel-feedback-list@broadcom.com
  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:    drivers/net/ethernet/broadcom/genet/
 +F:    drivers/net/mdio/mdio-bcm-unimac.c
 +F:    include/linux/platform_data/bcmgenet.h
 +F:    include/linux/platform_data/mdio-bcm-unimac.h
  
  BROADCOM IPROC ARM ARCHITECTURE
  M:    Ray Jui <rjui@broadcom.com>
@@@ -3947,8 -3931,8 +3947,8 @@@ W:      https://wireless.wiki.kernel.org/en/
  F:    drivers/net/wireless/ath/carl9170/
  
  CAVIUM I2C DRIVER
 -M:    Robert Richter <rrichter@marvell.com>
 -S:    Supported
 +M:    Robert Richter <rric@kernel.org>
 +S:    Odd Fixes
  W:    http://www.marvell.com
  F:    drivers/i2c/busses/i2c-octeon*
  F:    drivers/i2c/busses/i2c-thunderx*
@@@ -3963,8 -3947,8 +3963,8 @@@ W:      http://www.marvell.co
  F:    drivers/net/ethernet/cavium/liquidio/
  
  CAVIUM MMC DRIVER
 -M:    Robert Richter <rrichter@marvell.com>
 -S:    Supported
 +M:    Robert Richter <rric@kernel.org>
 +S:    Odd Fixes
  W:    http://www.marvell.com
  F:    drivers/mmc/host/cavium*
  
@@@ -3976,9 -3960,9 +3976,9 @@@ W:      http://www.marvell.co
  F:    drivers/crypto/cavium/cpt/
  
  CAVIUM THUNDERX2 ARM64 SOC
 -M:    Robert Richter <rrichter@marvell.com>
 +M:    Robert Richter <rric@kernel.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -S:    Maintained
 +S:    Odd Fixes
  F:    Documentation/devicetree/bindings/arm/cavium-thunder2.txt
  F:    arch/arm64/boot/dts/cavium/thunder2-99xx*
  
@@@ -4257,8 -4241,6 +4257,8 @@@ S:      Maintaine
  F:    .clang-format
  
  CLANG/LLVM BUILD SUPPORT
 +M:    Nathan Chancellor <natechancellor@gmail.com>
 +M:    Nick Desaulniers <ndesaulniers@google.com>
  L:    clang-built-linux@googlegroups.com
  S:    Supported
  W:    https://clangbuiltlinux.github.io/
@@@ -4408,6 -4390,12 +4408,6 @@@ T:     git git://git.infradead.org/users/hc
  F:    fs/configfs/
  F:    include/linux/configfs.h
  
 -CONNECTOR
 -M:    Evgeniy Polyakov <zbr@ioremap.net>
 -L:    netdev@vger.kernel.org
 -S:    Maintained
 -F:    drivers/connector/
 -
  CONSOLE SUBSYSTEM
  M:    Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  S:    Supported
@@@ -5062,7 -5050,7 +5062,7 @@@ F:      include/linux/dm-*.
  F:    include/uapi/linux/dm-*.h
  
  DEVLINK
 -M:    Jiri Pirko <jiri@mellanox.com>
 +M:    Jiri Pirko <jiri@nvidia.com>
  L:    netdev@vger.kernel.org
  S:    Supported
  F:    Documentation/networking/devlink
@@@ -5251,7 -5239,6 +5251,7 @@@ DOCUMENTATIO
  M:    Jonathan Corbet <corbet@lwn.net>
  L:    linux-doc@vger.kernel.org
  S:    Maintained
 +P:    Documentation/doc-guide/maintainer-profile.rst
  T:    git git://git.lwn.net/linux.git docs-next
  F:    Documentation/
  F:    scripts/documentation-file-ref-check
@@@ -6094,7 -6081,7 +6094,7 @@@ F:      include/linux/dynamic_debug.
  F:    lib/dynamic_debug.c
  
  DYNAMIC INTERRUPT MODERATION
 -M:    Tal Gilboa <talgi@mellanox.com>
 +M:    Tal Gilboa <talgi@nvidia.com>
  S:    Maintained
  F:    Documentation/networking/net_dim.rst
  F:    include/linux/dim.h
@@@ -6174,7 -6161,7 +6174,7 @@@ F:      Documentation/devicetree/bindings/ed
  F:    drivers/edac/aspeed_edac.c
  
  EDAC-BLUEFIELD
 -M:    Shravan Kumar Ramani <sramani@mellanox.com>
 +M:    Shravan Kumar Ramani <shravankr@nvidia.com>
  S:    Supported
  F:    drivers/edac/bluefield_edac.c
  
@@@ -6186,15 -6173,16 +6186,15 @@@ F:   drivers/edac/highbank
  
  EDAC-CAVIUM OCTEON
  M:    Ralf Baechle <ralf@linux-mips.org>
 -M:    Robert Richter <rrichter@marvell.com>
  L:    linux-edac@vger.kernel.org
  L:    linux-mips@vger.kernel.org
  S:    Supported
  F:    drivers/edac/octeon_edac*
  
  EDAC-CAVIUM THUNDERX
 -M:    Robert Richter <rrichter@marvell.com>
 +M:    Robert Richter <rric@kernel.org>
  L:    linux-edac@vger.kernel.org
 -S:    Supported
 +S:    Odd Fixes
  F:    drivers/edac/thunderx_edac*
  
  EDAC-CORE
@@@ -6202,7 -6190,7 +6202,7 @@@ M:      Borislav Petkov <bp@alien8.de
  M:    Mauro Carvalho Chehab <mchehab@kernel.org>
  M:    Tony Luck <tony.luck@intel.com>
  R:    James Morse <james.morse@arm.com>
 -R:    Robert Richter <rrichter@marvell.com>
 +R:    Robert Richter <rric@kernel.org>
  L:    linux-edac@vger.kernel.org
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git edac-for-next
@@@ -6495,8 -6483,8 +6495,8 @@@ S:      Odd Fixe
  F:    drivers/net/ethernet/agere/
  
  ETHERNET BRIDGE
 -M:    Roopa Prabhu <roopa@cumulusnetworks.com>
 -M:    Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
 +M:    Roopa Prabhu <roopa@nvidia.com>
 +M:    Nikolay Aleksandrov <nikolay@nvidia.com>
  L:    bridge@lists.linux-foundation.org (moderated for non-subscribers)
  L:    netdev@vger.kernel.org
  S:    Maintained
@@@ -6506,6 -6494,7 +6506,6 @@@ F:      net/bridge
  
  ETHERNET PHY LIBRARY
  M:    Andrew Lunn <andrew@lunn.ch>
 -M:    Florian Fainelli <f.fainelli@gmail.com>
  M:    Heiner Kallweit <hkallweit1@gmail.com>
  R:    Russell King <linux@armlinux.org.uk>
  L:    netdev@vger.kernel.org
@@@ -6610,7 -6599,7 +6610,7 @@@ F:      drivers/iommu/exynos-iommu.
  
  EZchip NPS platform support
  M:    Vineet Gupta <vgupta@synopsys.com>
 -M:    Ofer Levi <oferle@mellanox.com>
 +M:    Ofer Levi <oferle@nvidia.com>
  S:    Supported
  F:    arch/arc/boot/dts/eznps.dts
  F:    arch/arc/plat-eznps
@@@ -6895,14 -6884,6 +6895,14 @@@ L:    linuxppc-dev@lists.ozlabs.or
  S:    Maintained
  F:    drivers/dma/fsldma.*
  
 +FREESCALE DSPI DRIVER
 +M:    Vladimir Oltean <olteanv@gmail.com>
 +L:    linux-spi@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/spi/spi-fsl-dspi.txt
 +F:    drivers/spi/spi-fsl-dspi.c
 +F:    include/linux/spi/spi-fsl-dspi.h
 +
  FREESCALE ENETC ETHERNET DRIVERS
  M:    Claudiu Manoil <claudiu.manoil@nxp.com>
  L:    netdev@vger.kernel.org
@@@ -8274,7 -8255,7 +8274,7 @@@ IA64 (Itanium) PLATFOR
  M:    Tony Luck <tony.luck@intel.com>
  M:    Fenghua Yu <fenghua.yu@intel.com>
  L:    linux-ia64@vger.kernel.org
 -S:    Maintained
 +S:    Odd Fixes
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git
  F:    Documentation/ia64/
  F:    arch/ia64/
@@@ -8323,9 -8304,8 +8323,9 @@@ S:      Supporte
  F:    drivers/pci/hotplug/rpaphp*
  
  IBM Power SRIOV Virtual NIC Device Driver
 -M:    Thomas Falcon <tlfalcon@linux.ibm.com>
 -M:    John Allen <jallen@linux.ibm.com>
 +M:    Dany Madden <drt@linux.ibm.com>
 +M:    Lijun Pan <ljp@linux.ibm.com>
 +M:    Sukadev Bhattiprolu <sukadev@linux.ibm.com>
  L:    netdev@vger.kernel.org
  S:    Supported
  F:    drivers/net/ethernet/ibm/ibmvnic.*
@@@ -8339,7 -8319,7 +8339,7 @@@ F:      arch/powerpc/platforms/powernv/copy-
  F:    arch/powerpc/platforms/powernv/vas*
  
  IBM Power Virtual Ethernet Device Driver
 -M:    Thomas Falcon <tlfalcon@linux.ibm.com>
 +M:    Cristobal Forno <cforno12@linux.ibm.com>
  L:    netdev@vger.kernel.org
  S:    Supported
  F:    drivers/net/ethernet/ibm/ibmveth.*
@@@ -8583,7 -8563,7 +8583,7 @@@ F:      drivers/iio/pressure/dps310.
  
  INFINIBAND SUBSYSTEM
  M:    Doug Ledford <dledford@redhat.com>
 -M:    Jason Gunthorpe <jgg@mellanox.com>
 +M:    Jason Gunthorpe <jgg@nvidia.com>
  L:    linux-rdma@vger.kernel.org
  S:    Supported
  W:    https://github.com/linux-rdma/rdma-core
@@@ -8752,8 -8732,7 +8752,8 @@@ F:      include/drm/i915
  F:    include/uapi/drm/i915_drm.h
  
  INTEL ETHERNET DRIVERS
 -M:    Jeff Kirsher <jeffrey.t.kirsher@intel.com>
 +M:    Jesse Brandeburg <jesse.brandeburg@intel.com>
 +M:    Tony Nguyen <anthony.l.nguyen@intel.com>
  L:    intel-wired-lan@lists.osuosl.org (moderated for non-subscribers)
  S:    Supported
  W:    http://www.intel.com/support/feedback.htm
@@@ -9247,7 -9226,7 +9247,7 @@@ F:      drivers/firmware/iscsi_ibft
  
  ISCSI EXTENSIONS FOR RDMA (ISER) INITIATOR
  M:    Sagi Grimberg <sagi@grimberg.me>
 -M:    Max Gurtovoy <maxg@mellanox.com>
 +M:    Max Gurtovoy <mgurtovoy@nvidia.com>
  L:    linux-rdma@vger.kernel.org
  S:    Supported
  W:    http://www.openfabrics.org
@@@ -9796,7 -9775,7 +9796,7 @@@ F:      drivers/scsi/53c700
  
  LEAKING_ADDRESSES
  M:    Tobin C. Harding <me@tobin.cc>
 -M:    Tycho Andersen <tycho@tycho.ws>
 +M:    Tycho Andersen <tycho@tycho.pizza>
  L:    kernel-hardening@lists.openwall.com
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tobin/leaks.git
@@@ -11038,7 -11017,6 +11038,7 @@@ F:   drivers/char/hw_random/mtk-rng.
  
  MEDIATEK SWITCH DRIVER
  M:    Sean Wang <sean.wang@mediatek.com>
 +M:    Landen Chao <Landen.Chao@mediatek.com>
  L:    netdev@vger.kernel.org
  S:    Maintained
  F:    drivers/net/dsa/mt7530.*
@@@ -11094,7 -11072,7 +11094,7 @@@ F:   Documentation/devicetree/bindings/in
  F:    drivers/input/touchscreen/melfas_mip4.c
  
  MELLANOX ETHERNET DRIVER (mlx4_en)
 -M:    Tariq Toukan <tariqt@mellanox.com>
 +M:    Tariq Toukan <tariqt@nvidia.com>
  L:    netdev@vger.kernel.org
  S:    Supported
  W:    http://www.mellanox.com
@@@ -11102,7 -11080,7 +11102,7 @@@ Q:   http://patchwork.ozlabs.org/project/
  F:    drivers/net/ethernet/mellanox/mlx4/en_*
  
  MELLANOX ETHERNET DRIVER (mlx5e)
 -M:    Saeed Mahameed <saeedm@mellanox.com>
 +M:    Saeed Mahameed <saeedm@nvidia.com>
  L:    netdev@vger.kernel.org
  S:    Supported
  W:    http://www.mellanox.com
@@@ -11110,7 -11088,7 +11110,7 @@@ Q:   http://patchwork.ozlabs.org/project/
  F:    drivers/net/ethernet/mellanox/mlx5/core/en_*
  
  MELLANOX ETHERNET INNOVA DRIVERS
 -R:    Boris Pismenny <borisp@mellanox.com>
 +R:    Boris Pismenny <borisp@nvidia.com>
  L:    netdev@vger.kernel.org
  S:    Supported
  W:    http://www.mellanox.com
@@@ -11121,8 -11099,8 +11121,8 @@@ F:   drivers/net/ethernet/mellanox/mlx5/c
  F:    include/linux/mlx5/mlx5_ifc_fpga.h
  
  MELLANOX ETHERNET SWITCH DRIVERS
 -M:    Jiri Pirko <jiri@mellanox.com>
 -M:    Ido Schimmel <idosch@mellanox.com>
 +M:    Jiri Pirko <jiri@nvidia.com>
 +M:    Ido Schimmel <idosch@nvidia.com>
  L:    netdev@vger.kernel.org
  S:    Supported
  W:    http://www.mellanox.com
@@@ -11131,7 -11109,7 +11131,7 @@@ F:   drivers/net/ethernet/mellanox/mlxsw
  F:    tools/testing/selftests/drivers/net/mlxsw/
  
  MELLANOX FIRMWARE FLASH LIBRARY (mlxfw)
 -M:    mlxsw@mellanox.com
 +M:    mlxsw@nvidia.com
  L:    netdev@vger.kernel.org
  S:    Supported
  W:    http://www.mellanox.com
@@@ -11141,7 -11119,7 +11141,7 @@@ F:   drivers/net/ethernet/mellanox/mlxfw
  MELLANOX HARDWARE PLATFORM SUPPORT
  M:    Andy Shevchenko <andy@infradead.org>
  M:    Darren Hart <dvhart@infradead.org>
 -M:    Vadim Pasternak <vadimp@mellanox.com>
 +M:    Vadim Pasternak <vadimp@nvidia.com>
  L:    platform-driver-x86@vger.kernel.org
  S:    Supported
  F:    Documentation/ABI/testing/sysfs-platform-mellanox-bootctl
@@@ -11149,7 -11127,7 +11149,7 @@@ F:   drivers/platform/mellanox
  F:    include/linux/platform_data/mlxreg.h
  
  MELLANOX MLX4 core VPI driver
 -M:    Tariq Toukan <tariqt@mellanox.com>
 +M:    Tariq Toukan <tariqt@nvidia.com>
  L:    netdev@vger.kernel.org
  L:    linux-rdma@vger.kernel.org
  S:    Supported
@@@ -11159,7 -11137,7 +11159,7 @@@ F:   drivers/net/ethernet/mellanox/mlx4
  F:    include/linux/mlx4/
  
  MELLANOX MLX4 IB driver
 -M:    Yishai Hadas <yishaih@mellanox.com>
 +M:    Yishai Hadas <yishaih@nvidia.com>
  L:    linux-rdma@vger.kernel.org
  S:    Supported
  W:    http://www.mellanox.com
@@@ -11169,8 -11147,8 +11169,8 @@@ F:   include/linux/mlx4
  F:    include/uapi/rdma/mlx4-abi.h
  
  MELLANOX MLX5 core VPI driver
 -M:    Saeed Mahameed <saeedm@mellanox.com>
 -M:    Leon Romanovsky <leonro@mellanox.com>
 +M:    Saeed Mahameed <saeedm@nvidia.com>
 +M:    Leon Romanovsky <leonro@nvidia.com>
  L:    netdev@vger.kernel.org
  L:    linux-rdma@vger.kernel.org
  S:    Supported
@@@ -11181,7 -11159,7 +11181,7 @@@ F:   drivers/net/ethernet/mellanox/mlx5/c
  F:    include/linux/mlx5/
  
  MELLANOX MLX5 IB driver
 -M:    Leon Romanovsky <leonro@mellanox.com>
 +M:    Leon Romanovsky <leonro@nvidia.com>
  L:    linux-rdma@vger.kernel.org
  S:    Supported
  W:    http://www.mellanox.com
@@@ -11191,8 -11169,8 +11191,8 @@@ F:   include/linux/mlx5
  F:    include/uapi/rdma/mlx5-abi.h
  
  MELLANOX MLXCPLD I2C AND MUX DRIVER
 -M:    Vadim Pasternak <vadimp@mellanox.com>
 -M:    Michael Shych <michaelsh@mellanox.com>
 +M:    Vadim Pasternak <vadimp@nvidia.com>
 +M:    Michael Shych <michaelsh@nvidia.com>
  L:    linux-i2c@vger.kernel.org
  S:    Supported
  F:    Documentation/i2c/busses/i2c-mlxcpld.rst
@@@ -11200,7 -11178,7 +11200,7 @@@ F:   drivers/i2c/busses/i2c-mlxcpld.
  F:    drivers/i2c/muxes/i2c-mux-mlxcpld.c
  
  MELLANOX MLXCPLD LED DRIVER
 -M:    Vadim Pasternak <vadimp@mellanox.com>
 +M:    Vadim Pasternak <vadimp@nvidia.com>
  L:    linux-leds@vger.kernel.org
  S:    Supported
  F:    Documentation/leds/leds-mlxcpld.rst
@@@ -11208,7 -11186,7 +11208,7 @@@ F:   drivers/leds/leds-mlxcpld.
  F:    drivers/leds/leds-mlxreg.c
  
  MELLANOX PLATFORM DRIVER
 -M:    Vadim Pasternak <vadimp@mellanox.com>
 +M:    Vadim Pasternak <vadimp@nvidia.com>
  L:    platform-driver-x86@vger.kernel.org
  S:    Supported
  F:    drivers/platform/x86/mlx-platform.c
@@@ -12052,7 -12030,6 +12052,7 @@@ Q:   http://patchwork.ozlabs.org/project/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git
  F:    Documentation/devicetree/bindings/net/
 +F:    drivers/connector/
  F:    drivers/net/
  F:    include/linux/etherdevice.h
  F:    include/linux/fcdevice.h
@@@ -12078,7 -12055,6 +12078,7 @@@ NETWORKING [DSA
  M:    Andrew Lunn <andrew@lunn.ch>
  M:    Vivien Didelot <vivien.didelot@gmail.com>
  M:    Florian Fainelli <f.fainelli@gmail.com>
 +M:    Vladimir Oltean <olteanv@gmail.com>
  S:    Maintained
  F:    Documentation/devicetree/bindings/net/dsa/
  F:    drivers/net/dsa/
@@@ -12191,8 -12167,8 +12191,8 @@@ F:   net/ipv6/syncookies.
  F:    net/ipv6/tcp*.c
  
  NETWORKING [TLS]
 -M:    Boris Pismenny <borisp@mellanox.com>
 -M:    Aviad Yehezkel <aviadye@mellanox.com>
 +M:    Boris Pismenny <borisp@nvidia.com>
 +M:    Aviad Yehezkel <aviadye@nvidia.com>
  M:    John Fastabend <john.fastabend@gmail.com>
  M:    Daniel Borkmann <daniel@iogearbox.net>
  M:    Jakub Kicinski <kuba@kernel.org>
@@@ -12492,7 -12468,7 +12492,7 @@@ S:   Supporte
  F:    drivers/nfc/nxp-nci
  
  OBJAGG
 -M:    Jiri Pirko <jiri@mellanox.com>
 +M:    Jiri Pirko <jiri@nvidia.com>
  L:    netdev@vger.kernel.org
  S:    Supported
  F:    include/linux/objagg.h
@@@ -13134,7 -13110,7 +13134,7 @@@ F:   drivers/video/logo/logo_parisc
  F:    include/linux/hp_sdc.h
  
  PARMAN
 -M:    Jiri Pirko <jiri@mellanox.com>
 +M:    Jiri Pirko <jiri@nvidia.com>
  L:    netdev@vger.kernel.org
  S:    Supported
  F:    include/linux/parman.h
@@@ -13184,7 -13160,6 +13184,7 @@@ F:   drivers/firmware/pcdp.
  
  PCI DRIVER FOR AARDVARK (Marvell Armada 3700)
  M:    Thomas Petazzoni <thomas.petazzoni@bootlin.com>
 +M:    Pali Rohár <pali@kernel.org>
  L:    linux-pci@vger.kernel.org
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
@@@ -13454,10 -13429,10 +13454,10 @@@ F:        Documentation/devicetree/bindings/pc
  F:    drivers/pci/controller/dwc/*artpec*
  
  PCIE DRIVER FOR CAVIUM THUNDERX
 -M:    Robert Richter <rrichter@marvell.com>
 +M:    Robert Richter <rric@kernel.org>
  L:    linux-pci@vger.kernel.org
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -S:    Supported
 +S:    Odd Fixes
  F:    drivers/pci/controller/pci-thunder-*
  
  PCIE DRIVER FOR HISILICON
@@@ -13594,18 -13569,12 +13594,18 @@@ F:        kernel/events/
  F:    tools/lib/perf/
  F:    tools/perf/
  
 -PERFORMANCE EVENTS SUBSYSTEM ARM64 PMU EVENTS
 +PERFORMANCE EVENTS TOOLING ARM64
  R:    John Garry <john.garry@huawei.com>
  R:    Will Deacon <will@kernel.org>
 +R:    Mathieu Poirier <mathieu.poirier@linaro.org>
 +R:    Leo Yan <leo.yan@linaro.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Supported
 +F:    tools/build/feature/test-libopencsd.c
 +F:    tools/perf/arch/arm*/
  F:    tools/perf/pmu-events/arch/arm64/
 +F:    tools/perf/util/arm-spe*
 +F:    tools/perf/util/cs-etm*
  
  PERSONALITY HANDLING
  M:    Christoph Hellwig <hch@infradead.org>
@@@ -14396,7 -14365,7 +14396,7 @@@ M:   Rob Clark <robdclark@gmail.com
  L:    iommu@lists.linux-foundation.org
  L:    linux-arm-msm@vger.kernel.org
  S:    Maintained
 -F:    drivers/iommu/qcom_iommu.c
 +F:    drivers/iommu/arm/arm-smmu/qcom_iommu.c
  
  QUALCOMM IPCC MAILBOX DRIVER
  M:    Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
@@@ -15577,7 -15546,6 +15577,7 @@@ F:   include/uapi/linux/sed
  SECURITY CONTACT
  M:    Security Officers <security@kernel.org>
  S:    Supported
 +F:    Documentation/admin-guide/security-bugs.rst
  
  SECURITY SUBSYSTEM
  M:    James Morris <jmorris@namei.org>
@@@ -16066,7 -16034,7 +16066,7 @@@ F:   drivers/infiniband/sw/siw
  F:    include/uapi/rdma/siw-abi.h
  
  SOFT-ROCE DRIVER (rxe)
 -M:    Zhu Yanjun <yanjunz@mellanox.com>
 +M:    Zhu Yanjun <yanjunz@nvidia.com>
  L:    linux-rdma@vger.kernel.org
  S:    Supported
  F:    drivers/infiniband/sw/rxe/
@@@ -16157,7 -16125,7 +16157,7 @@@ M:   Leon Luo <leonl@leopardimaging.com
  L:    linux-media@vger.kernel.org
  S:    Maintained
  T:    git git://linuxtv.org/media_tree.git
 -F:    Documentation/devicetree/bindings/media/i2c/imx274.txt
 +F:    Documentation/devicetree/bindings/media/i2c/sony,imx274.yaml
  F:    drivers/media/i2c/imx274.c
  
  SONY IMX290 SENSOR DRIVER
@@@ -17148,8 -17116,8 +17148,8 @@@ S:   Maintaine
  F:    Documentation/devicetree/bindings/arm/keystone/ti,k3-sci-common.yaml
  F:    Documentation/devicetree/bindings/arm/keystone/ti,sci.txt
  F:    Documentation/devicetree/bindings/clock/ti,sci-clk.txt
 -F:    Documentation/devicetree/bindings/interrupt-controller/ti,sci-inta.txt
 -F:    Documentation/devicetree/bindings/interrupt-controller/ti,sci-intr.txt
 +F:    Documentation/devicetree/bindings/interrupt-controller/ti,sci-inta.yaml
 +F:    Documentation/devicetree/bindings/interrupt-controller/ti,sci-intr.yaml
  F:    Documentation/devicetree/bindings/reset/ti,sci-reset.txt
  F:    Documentation/devicetree/bindings/soc/ti/sci-pm-domain.txt
  F:    drivers/clk/keystone/sci-clk.c
@@@ -17246,8 -17214,8 +17246,8 @@@ S:   Maintaine
  F:    drivers/net/thunderbolt.c
  
  THUNDERX GPIO DRIVER
 -M:    Robert Richter <rrichter@marvell.com>
 -S:    Maintained
 +M:    Robert Richter <rric@kernel.org>
 +S:    Odd Fixes
  F:    drivers/gpio/gpio-thunderx.c
  
  TI AM437X VPFE DRIVER
@@@ -18284,8 -18252,7 +18284,8 @@@ F:   drivers/gpu/vga/vga_switcheroo.
  F:    include/linux/vga_switcheroo.h
  
  VIA RHINE NETWORK DRIVER
 -S:    Orphan
 +S:    Maintained
 +M:    Kevin Brace <kevinbrace@bracecomputerlab.com>
  F:    drivers/net/ethernet/via/via-rhine.c
  
  VIA SD/MMC CARD CONTROLLER DRIVER
@@@ -18890,10 -18857,10 +18890,10 @@@ T:        git git://git.kernel.org/pub/scm/lin
  F:    arch/x86/mm/
  
  X86 PLATFORM DRIVERS
- M:    Darren Hart <dvhart@infradead.org>
- M:    Andy Shevchenko <andy@infradead.org>
+ M:    Hans de Goede <hdegoede@redhat.com>
+ M:    Mark Gross <mgross@linux.intel.com>
  L:    platform-driver-x86@vger.kernel.org
- S:    Odd Fixes
+ S:    Maintained
  T:    git git://git.infradead.org/linux-platform-drivers-x86.git
  F:    drivers/platform/olpc/
  F:    drivers/platform/x86/
@@@ -18907,15 -18874,6 +18907,15 @@@ S: Maintaine
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/core
  F:    arch/x86/platform
  
 +X86 PLATFORM UV HPE SUPERDOME FLEX
 +M:    Steve Wahl <steve.wahl@hpe.com>
 +R:    Dimitri Sivanich <dimitri.sivanich@hpe.com>
 +R:    Russ Anderson <russ.anderson@hpe.com>
 +S:    Supported
 +F:    arch/x86/include/asm/uv/
 +F:    arch/x86/kernel/apic/x2apic_uv_x.c
 +F:    arch/x86/platform/uv/
 +
  X86 VDSO
  M:    Andy Lutomirski <luto@kernel.org>
  L:    linux-kernel@vger.kernel.org

diff --combined drivers/platform/x86/thinkpad_acpi.c
index 9c4df41,e5a62fa..eae3579
--- 1/drivers/platform/x86/thinkpad_acpi.c
--- 2/drivers/platform/x86/thinkpad_acpi.c
+++ b/drivers/platform/x86/thinkpad_acpi.c
@@@ -2569,7 -2569,7 +2569,7 @@@ static void hotkey_compare_and_issue_ev
   */
  static int hotkey_kthread(void *data)
  {
-       struct tp_nvram_state s[2];
+       struct tp_nvram_state s[2] = { 0 };
        u32 poll_mask, event_mask;
        unsigned int si, so;
        unsigned long t;
@@@ -4060,7 -4060,7 +4060,7 @@@ static bool hotkey_notify_6xxx(const u3
                 * AC status changed; can be triggered by plugging or
                 * unplugging AC adapter, docking or undocking. */
  
 -              /* fallthrough */
 +              fallthrough;
  
        case TP_HKEY_EV_KEY_NUMLOCK:
        case TP_HKEY_EV_KEY_FN:
@@@ -4176,7 -4176,7 +4176,7 @@@ static void hotkey_notify(struct ibm_st
                                known_ev = true;
                                break;
                        }
 -                      /* fallthrough - to default */
 +                      fallthrough;    /* to default */
                default:
                        known_ev = false;
                }
@@@ -6266,7 -6266,7 +6266,7 @@@ static int thermal_get_sensor(int idx, 
                        idx -= 8;
                }
  #endif
 -              /* fallthrough */
 +              fallthrough;
        case TPACPI_THERMAL_TPEC_8:
                if (idx <= 7) {
                        if (!acpi_ec_read(t + idx, &tmp))
@@@ -6829,8 -6829,10 +6829,10 @@@ static int __init tpacpi_query_bcl_leve
        list_for_each_entry(child, &device->children, node) {
                acpi_status status = acpi_evaluate_object(child->handle, "_BCL",
                                                          NULL, &buffer);
-               if (ACPI_FAILURE(status))
+               if (ACPI_FAILURE(status)) {
+                       buffer.length = ACPI_ALLOCATE_BUFFER;
                        continue;
+               }
  
                obj = (union acpi_object *)buffer.pointer;
                if (!obj || (obj->type != ACPI_TYPE_PACKAGE)) {