Merge tag 'ib-drm-gpio-pdx86-rtc-wdt-v5.12-2' of git://git.infradead.org/linux-platfo...

Pull the first part of Intel MID outdated platforms removal from Andy
Shevchenko:

"The following is an automated git shortlog grouped by driver:

 drm/gma500:
  -  Get rid of duplicate NULL checks
  -  Convert to use new SCU IPC API

 gpio:
  -  msic: Remove driver for deprecated platform
  -  intel-mid: Remove driver for deprecated platform

 intel_mid_powerbtn:
  -  Remove driver for deprecated platform

 intel_mid_thermal:
  -  Remove driver for deprecated platform

 intel_scu_wdt:
  -  Drop mistakenly added const
  -  Get rid of custom x86 model comparison
  -  Drop SCU notification
  -  Move driver from arch/x86

 rtc:
  -  mrst: Remove driver for deprecated platform

 watchdog:
  -  intel-mid_wdt: Postpone IRQ handler registration till SCU is ready
  -  intel_scu_watchdog: Remove driver for deprecated platform"

* tag 'ib-drm-gpio-pdx86-rtc-wdt-v5.12-2' of git://git.infradead.org/linux-platform-drivers-x86:
  platform/x86: intel_scu_wdt: Drop mistakenly added const
  platform/x86: intel_scu_wdt: Get rid of custom x86 model comparison
  platform/x86: intel_scu_wdt: Drop SCU notification
  platform/x86: intel_scu_wdt: Move driver from arch/x86
  watchdog: intel-mid_wdt: Postpone IRQ handler registration till SCU is ready
  watchdog: intel_scu_watchdog: Remove driver for deprecated platform
  rtc: mrst: Remove driver for deprecated platform
  platform/x86: intel_mid_powerbtn: Remove driver for deprecated platform
  platform/x86: intel_mid_thermal: Remove driver for deprecated platform
  gpio: msic: Remove driver for deprecated platform
  gpio: intel-mid: Remove driver for deprecated platform
  drm/gma500: Get rid of duplicate NULL checks
  drm/gma500: Convert to use new SCU IPC API

diff --combined MAINTAINERS
index 667d03852191fbbcb6827eaa7bdbd9bbfc8c0a4f,a5f161c9a059077ad48b8e2c382e422d8ed0ec42..904eaa52f5f8522f952f354298f45e0e60662104
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -203,8 -203,8 +203,8 @@@ F: include/uapi/linux/nl80211.
  F:    net/wireless/
  
  8169 10/100/1000 GIGABIT ETHERNET DRIVER
 -M:    Realtek linux nic maintainers <[email protected]>
  M:    Heiner Kallweit <[email protected]>
 +M:    [email protected]
  L:    [email protected]
  S:    Maintained
  F:    drivers/net/ethernet/realtek/r8169*
@@@ -820,6 -820,7 +820,6 @@@ M: Netanel Belgazal <[email protected]
  M:    Arthur Kiyanovski <[email protected]>
  R:    Guy Tzalik <[email protected]>
  R:    Saeed Bishara <[email protected]>
 -R:    Zorik Machulsky <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    Documentation/networking/device_drivers/ethernet/amazon/ena.rst
@@@ -906,7 -907,7 +906,7 @@@ AMD KF
  M:    Felix Kuehling <[email protected]>
  L:    [email protected]
  S:    Supported
 -T:    git git://people.freedesktop.org/~agd5f/linux
 +T:    git https://gitlab.freedesktop.org/agd5f/linux.git
  F:    drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd*.[ch]
  F:    drivers/gpu/drm/amd/amdkfd/
  F:    drivers/gpu/drm/amd/include/cik_structs.h
@@@ -2118,7 -2119,7 +2118,7 @@@ N:      atme
  ARM/Microchip Sparx5 SoC support
  M:    Lars Povlsen <[email protected]>
  M:    Steen Hegelund <[email protected]>
 -M:    Microchip Linux Driver Support <[email protected]>
 +M:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
  T:    git git://github.com/microchip-ung/linux-upstream.git
@@@ -2616,8 -2617,8 +2616,8 @@@ S:      Maintaine
  F:    drivers/power/reset/keystone-reset.c
  
  ARM/TEXAS INSTRUMENTS K3 ARCHITECTURE
 -M:    Tero Kristo <[email protected]>
  M:    Nishanth Menon <[email protected]>
 +M:    Tero Kristo <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
  F:    Documentation/devicetree/bindings/arm/ti/k3.yaml
@@@ -2941,6 -2942,7 +2941,6 @@@ S:      Maintaine
  F:    drivers/hwmon/asus_atk0110.c
  
  ATLX ETHERNET DRIVERS
 -M:    Jay Cliburn <[email protected]>
  M:    Chris Snook <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -3239,7 -3241,6 +3239,7 @@@ L:      [email protected]
  S:    Supported
  W:    http://sourceforge.net/projects/bonding/
  F:    drivers/net/bonding/
 +F:    include/net/bonding.h
  F:    include/uapi/linux/if_bonding.h
  
  BOSCH SENSORTEC BMA400 ACCELEROMETER IIO DRIVER
@@@ -3335,7 -3336,7 +3335,7 @@@ F:      arch/riscv/net
  X:    arch/riscv/net/bpf_jit_comp64.c
  
  BPF JIT for RISC-V (64-bit)
 -M:    Björn Töpel <bjorn[email protected]>
 +M:    Björn Töpel <bjorn@kernel.org>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
@@@ -3412,7 -3413,7 +3412,7 @@@ F:      Documentation/devicetree/bindings/pc
  F:    drivers/pci/controller/pcie-brcmstb.c
  F:    drivers/staging/vc04_services
  N:    bcm2711
 -N:    bcm2835
 +N:    bcm283*
  
  BROADCOM BCM281XX/BCM11XXX/BCM216XX ARM ARCHITECTURE
  M:    Florian Fainelli <[email protected]>
@@@ -3555,7 -3556,7 +3555,7 @@@ S:      Supporte
  F:    drivers/net/ethernet/broadcom/bnxt/
  
  BROADCOM BRCM80211 IEEE802.11n WIRELESS DRIVER
 -M:    Arend van Spriel <arend.vanspriel@broadcom.com>
 +M:    Arend van Spriel <aspriel@gmail.com>
  M:    Franky Lin <[email protected]>
  M:    Hante Meuleman <[email protected]>
  M:    Chi-hsien Lin <[email protected]>
@@@ -3880,9 -3881,9 +3880,9 @@@ F:      Documentation/devicetree/bindings/mt
  F:    drivers/mtd/nand/raw/cadence-nand-controller.c
  
  CADENCE USB3 DRD IP DRIVER
 -M:    Peter Chen <peter.chen@nxp.com>
 +M:    Peter Chen <peter.chen@kernel.org>
  M:    Pawel Laszczak <[email protected]>
 -M:    Roger Quadros <[email protected]>
 +R:    Roger Quadros <[email protected]>
  R:    Aswath Govindraju <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -3960,7 -3961,7 +3960,7 @@@ F:      net/can
  CAN-J1939 NETWORK LAYER
  M:    Robin van der Gracht <[email protected]>
  M:    Oleksij Rempel <[email protected]>
 -R:    Pengutronix Kernel Team <[email protected]>
 +R:    [email protected]
  L:    [email protected]
  S:    Maintained
  F:    Documentation/networking/j1939.rst
@@@ -4162,7 -4163,7 +4162,7 @@@ S:      Maintaine
  F:    Documentation/translations/zh_CN/
  
  CHIPIDEA USB HIGH SPEED DUAL ROLE CONTROLLER
 -M:    Peter Chen <[email protected]>
 +M:    Peter Chen <[email protected]>
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git
@@@ -4304,7 -4305,7 +4304,7 @@@ S:      Maintaine
  F:    .clang-format
  
  CLANG/LLVM BUILD SUPPORT
 -M:    Nathan Chancellor <nat[email protected]>
 +M:    Nathan Chancellor <nat[email protected]>
  M:    Nick Desaulniers <[email protected]>
  L:    [email protected]
  S:    Supported
@@@ -4312,9 -4313,7 +4312,9 @@@ W:      https://clangbuiltlinux.github.io
  B:    https://github.com/ClangBuiltLinux/linux/issues
  C:    irc://chat.freenode.net/clangbuiltlinux
  F:    Documentation/kbuild/llvm.rst
 +F:    include/linux/compiler-clang.h
  F:    scripts/clang-tools/
 +F:    scripts/clang-version.sh
  F:    scripts/lld-version.sh
  K:    \b(?i:clang|llvm)\b
  
@@@ -4589,7 -4588,7 +4589,7 @@@ B:      https://bugzilla.kernel.or
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git
  F:    Documentation/admin-guide/pm/cpuidle.rst
  F:    Documentation/driver-api/pm/cpuidle.rst
 -F:    drivers/cpuidle/*
 +F:    drivers/cpuidle/
  F:    include/linux/cpuidle.h
  
  CPU POWER MONITORING SUBSYSTEM
@@@ -4923,8 -4922,9 +4923,8 @@@ F:      Documentation/scsi/dc395x.rs
  F:    drivers/scsi/dc395x.*
  
  DCCP PROTOCOL
 -M:    Gerrit Renker <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  W:    http://www.linuxfoundation.org/collaborate/workgroups/networking/dccp
  F:    include/linux/dccp.h
  F:    include/linux/tfrc.h
@@@ -6474,9 -6474,9 +6474,9 @@@ S:      Maintaine
  F:    drivers/edac/skx_*.[ch]
  
  EDAC-TI
 -M:    Tero Kristo <[email protected]>
 +M:    Tero Kristo <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Odd Fixes
  F:    drivers/edac/ti_edac.c
  
  EDIROL UA-101/UA-1000 DRIVER
@@@ -7363,6 -7363,7 +7363,6 @@@ L:      [email protected]
  S:    Maintained
  F:    Documentation/kbuild/gcc-plugins.rst
  F:    scripts/Makefile.gcc-plugins
 -F:    scripts/gcc-plugin.sh
  F:    scripts/gcc-plugins/
  
  GCOV BASED KERNEL PROFILING
@@@ -8434,8 -8435,11 +8434,8 @@@ F:     drivers/i3c
  F:    include/linux/i3c/
  
  IA64 (Itanium) PLATFORM
 -M:    Tony Luck <[email protected]>
 -M:    Fenghua Yu <[email protected]>
  L:    [email protected]
 -S:    Odd Fixes
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git
 +S:    Orphan
  F:    Documentation/ia64/
  F:    arch/ia64/
  
@@@ -8936,7 -8940,6 +8936,6 @@@ L:      [email protected]
  S:    Maintained
  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-merrifield.c
  F:    drivers/gpio/gpio-ml-ioh.c
  F:    drivers/gpio/gpio-pch.c
@@@ -9095,7 -9098,6 +9094,6 @@@ M:      Andy Shevchenko <[email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git
  F:    drivers/gpio/gpio-*cove.c
- F:    drivers/gpio/gpio-msic.c
  
  INTEL PMIC MULTIFUNCTION DEVICE DRIVERS
  M:    Andy Shevchenko <[email protected]>
@@@ -9236,7 -9238,7 +9234,7 @@@ F:      tools/testing/selftests/sgx/
  K:    \bSGX_
  
  INTERCONNECT API
 -M:    Georgi Djakov <georgi.djakov@linaro.org>
 +M:    Georgi Djakov <djakov@kernel.org>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/interconnect/
@@@ -9269,7 -9271,7 +9267,7 @@@ F:      drivers/net/ethernet/sgi/ioc3-eth.
  
  IOMAP FILESYSTEM LIBRARY
  M:    Christoph Hellwig <[email protected]>
 -M:    Darrick J. Wong <d[email protected]>
 +M:    Darrick J. Wong <d[email protected]>
  M:    [email protected]
  M:    [email protected]
  L:    [email protected]
@@@ -9323,6 -9325,7 +9321,6 @@@ W:      http://www.adaptec.com
  F:    drivers/scsi/ips*
  
  IPVS
 -M:    Wensong Zhang <[email protected]>
  M:    Simon Horman <[email protected]>
  M:    Julian Anastasov <[email protected]>
  L:    [email protected]
@@@ -9771,7 -9774,7 +9769,7 @@@ F:      tools/testing/selftests/kvm/s390x
  
  KERNEL VIRTUAL MACHINE FOR X86 (KVM/x86)
  M:    Paolo Bonzini <[email protected]>
 -R:    Sean Christopherson <sean.j.christopherson@intel.com>
 +R:    Sean Christopherson <seanjc@google.com>
  R:    Vitaly Kuznetsov <[email protected]>
  R:    Wanpeng Li <[email protected]>
  R:    Jim Mattson <[email protected]>
@@@ -10255,6 -10258,7 +10253,6 @@@ S:   Supporte
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git dev
  F:    Documentation/atomic_bitops.txt
  F:    Documentation/atomic_t.txt
 -F:    Documentation/core-api/atomic_ops.rst
  F:    Documentation/core-api/refcount-vs-atomic.rst
  F:    Documentation/litmus-tests/
  F:    Documentation/memory-barriers.txt
@@@ -10841,7 -10845,7 +10839,7 @@@ F:   drivers/media/radio/radio-maxiradio
  
  MCAN MMIO DEVICE DRIVER
  M:    Dan Murphy <[email protected]>
 -M:    Sriram Dash <sriram.dash@samsung.com>
 +M:    Pankaj Sharma <pankj.sharma@samsung.com>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/net/can/bosch,m_can.yaml
@@@ -11661,7 -11665,7 +11659,7 @@@ F:   drivers/media/platform/atmel/atmel-i
  
  MICROCHIP KSZ SERIES ETHERNET SWITCH DRIVER
  M:    Woojung Huh <[email protected]>
 -M:    Microchip Linux Driver Support <[email protected]>
 +M:    [email protected]
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/net/dsa/microchip,ksz.yaml
@@@ -11671,7 -11675,7 +11669,7 @@@ F:   net/dsa/tag_ksz.
  
  MICROCHIP LAN743X ETHERNET DRIVER
  M:    Bryan Whitehead <[email protected]>
 -M:    Microchip Linux Driver Support <[email protected]>
 +M:    [email protected]
  L:    [email protected]
  S:    Maintained
  F:    drivers/net/ethernet/microchip/lan743x_*
@@@ -11765,7 -11769,7 +11763,7 @@@ F:   drivers/net/wireless/microchip/wilc1
  
  MICROSEMI MIPS SOCS
  M:    Alexandre Belloni <[email protected]>
 -M:    Microchip Linux Driver Support <[email protected]>
 +M:    [email protected]
  L:    [email protected]
  S:    Supported
  F:    Documentation/devicetree/bindings/mips/mscc.txt
@@@ -12412,8 -12416,8 +12410,8 @@@ F:   tools/testing/selftests/net/ipsec.
  
  NETWORKING [IPv4/IPv6]
  M:    "David S. Miller" <[email protected]>
 -M:    Alexey Kuznetsov <[email protected]>
  M:    Hideaki YOSHIFUJI <[email protected]>
 +M:    David Ahern <[email protected]>
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git
@@@ -12469,6 -12473,7 +12467,6 @@@ F:   net/ipv6/tcp*.
  
  NETWORKING [TLS]
  M:    Boris Pismenny <[email protected]>
 -M:    Aviad Yehezkel <[email protected]>
  M:    John Fastabend <[email protected]>
  M:    Daniel Borkmann <[email protected]>
  M:    Jakub Kicinski <[email protected]>
@@@ -12818,10 -12823,10 +12816,10 @@@ F:        tools/objtool
  F:    include/linux/objtool.h
  
  OCELOT ETHERNET SWITCH DRIVER
 -M:    Microchip Linux Driver Support <[email protected]>
  M:    Vladimir Oltean <[email protected]>
  M:    Claudiu Manoil <[email protected]>
  M:    Alexandre Belloni <[email protected]>
 +M:    [email protected]
  L:    [email protected]
  S:    Supported
  F:    drivers/net/dsa/ocelot/*
@@@ -12843,7 -12848,7 +12841,7 @@@ F:   include/misc/ocxl
  F:    include/uapi/misc/ocxl.h
  
  OMAP AUDIO SUPPORT
 -M:    Peter Ujfalusi <peter.ujfalusi@ti.com>
 +M:    Peter Ujfalusi <peter.ujfalusi@gmail.com>
  M:    Jarkko Nikula <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected]
@@@ -13883,7 -13888,7 +13881,7 @@@ F:   drivers/platform/x86/peaq-wmi.
  
  PENSANDO ETHERNET DRIVERS
  M:    Shannon Nelson <[email protected]>
 -M:    Pensando Drivers <[email protected]>
 +M:    [email protected]
  L:    [email protected]
  S:    Supported
  F:    Documentation/networking/device_drivers/ethernet/pensando/ionic.rst
@@@ -14505,18 -14510,10 +14503,18 @@@ S:        Supporte
  F:    drivers/crypto/qat/
  
  QCOM AUDIO (ASoC) DRIVERS
 -M:    Patrick Lai <plai@codeaurora.org>
 +M:    Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
  M:    Banajit Goswami <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
 +F:    sound/soc/codecs/lpass-va-macro.c
 +F:    sound/soc/codecs/lpass-wsa-macro.*
 +F:    sound/soc/codecs/msm8916-wcd-analog.c
 +F:    sound/soc/codecs/msm8916-wcd-digital.c
 +F:    sound/soc/codecs/wcd9335.*
 +F:    sound/soc/codecs/wcd934x.c
 +F:    sound/soc/codecs/wcd-clsh-v2.*
 +F:    sound/soc/codecs/wsa881x.c
  F:    sound/soc/qcom/
  
  QCOM IPA DRIVER
@@@ -14670,7 -14667,7 +14668,7 @@@ T:   git git://git.kernel.org/pub/scm/lin
  F:    drivers/net/wireless/ath/ath11k/
  
  QUALCOMM ATHEROS ATH9K WIRELESS DRIVER
 -M:    QCA ath9k Development <[email protected]>
 +M:    [email protected]
  L:    [email protected]
  S:    Supported
  W:    https://wireless.wiki.kernel.org/en/users/Drivers/ath9k
@@@ -14821,7 -14818,7 +14819,7 @@@ M:   Alex Deucher <alexander.deucher@amd.
  M:    Christian König <[email protected]>
  L:    [email protected]
  S:    Supported
 -T:    git git://people.freedesktop.org/~agd5f/linux
 +T:    git https://gitlab.freedesktop.org/agd5f/linux.git
  F:    drivers/gpu/drm/amd/
  F:    drivers/gpu/drm/radeon/
  F:    include/uapi/drm/amdgpu_drm.h
@@@ -16322,7 -16319,6 +16320,7 @@@ M:   Pekka Enberg <[email protected]
  M:    David Rientjes <[email protected]>
  M:    Joonsoo Kim <[email protected]>
  M:    Andrew Morton <[email protected]>
 +M:    Vlastimil Babka <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    include/linux/sl?b*.h
@@@ -16712,8 -16708,6 +16710,8 @@@ M:   Samuel Thibault <samuel.thibault@ens
  L:    [email protected]
  S:    Odd Fixes
  W:    http://www.linux-speakup.org/
 +W:    https://github.com/linux-speakup/speakup
 +B:    https://github.com/linux-speakup/speakup/issues
  F:    drivers/accessibility/speakup/
  
  SPEAR CLOCK FRAMEWORK SUPPORT
@@@ -16968,7 -16962,7 +16966,7 @@@ M:   Olivier Moysan <[email protected]
  M:    Arnaud Pouliquen <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
 -F:    Documentation/devicetree/bindings/sound/st,stm32-*.txt
 +F:    Documentation/devicetree/bindings/iio/adc/st,stm32-*.yaml
  F:    sound/soc/stm/
  
  STM32 TIMER/LPTIMER DRIVERS
@@@ -17545,7 -17539,7 +17543,7 @@@ F:   arch/xtensa
  F:    drivers/irqchip/irq-xtensa-*
  
  TEXAS INSTRUMENTS ASoC DRIVERS
 -M:    Peter Ujfalusi <peter.ujfalusi@ti.com>
 +M:    Peter Ujfalusi <peter.ujfalusi@gmail.com>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    sound/soc/ti/
@@@ -17557,22 -17551,9 +17555,22 @@@ S: Supporte
  F:    Documentation/devicetree/bindings/iio/dac/ti,dac7612.txt
  F:    drivers/iio/dac/ti-dac7612.c
  
 +TEXAS INSTRUMENTS DMA DRIVERS
 +M:    Peter Ujfalusi <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/dma/ti-dma-crossbar.txt
 +F:    Documentation/devicetree/bindings/dma/ti-edma.txt
 +F:    Documentation/devicetree/bindings/dma/ti/
 +F:    drivers/dma/ti/
 +X:    drivers/dma/ti/cppi41.c
 +F:    include/linux/dma/k3-udma-glue.h
 +F:    include/linux/dma/ti-cppi5.h
 +F:    include/linux/dma/k3-psil.h
 +
  TEXAS INSTRUMENTS' SYSTEM CONTROL INTERFACE (TISCI) PROTOCOL DRIVER
  M:    Nishanth Menon <[email protected]>
 -M:    Tero Kristo <[email protected]>
 +M:    Tero Kristo <[email protected]>
  M:    Santosh Shilimkar <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -17716,9 -17697,9 +17714,9 @@@ S:   Maintaine
  F:    drivers/clk/clk-cdce706.c
  
  TI CLOCK DRIVER
 -M:    Tero Kristo <[email protected]>
 +M:    Tero Kristo <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Odd Fixes
  F:    drivers/clk/ti/
  F:    include/linux/clk/ti.h
  
@@@ -17855,7 -17836,7 +17853,7 @@@ F:   Documentation/devicetree/bindings/ne
  F:    drivers/nfc/trf7970a.c
  
  TI TWL4030 SERIES SOC CODEC DRIVER
 -M:    Peter Ujfalusi <peter.ujfalusi@ti.com>
 +M:    Peter Ujfalusi <peter.ujfalusi@gmail.com>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    sound/soc/codecs/twl4030*
@@@ -18387,7 -18368,7 +18385,7 @@@ F:   include/linux/usb/isp116x.
  
  USB LAN78XX ETHERNET DRIVER
  M:    Woojung Huh <[email protected]>
 -M:    Microchip Linux Driver Support <[email protected]>
 +M:    [email protected]
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/net/microchip,lan78xx.txt
@@@ -18421,7 -18402,7 +18419,7 @@@ F:   Documentation/usb/ohci.rs
  F:    drivers/usb/host/ohci*
  
  USB OTG FSM (Finite State Machine)
 -M:    Peter Chen <[email protected]>
 +M:    Peter Chen <[email protected]>
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git
@@@ -18501,7 -18482,7 +18499,7 @@@ F:   drivers/net/usb/smsc75xx.
  
  USB SMSC95XX ETHERNET DRIVER
  M:    Steve Glendinning <[email protected]>
 -M:    Microchip Linux Driver Support <[email protected]>
 +M:    [email protected]
  L:    [email protected]
  S:    Maintained
  F:    drivers/net/usb/smsc95xx.*
@@@ -19048,7 -19029,7 +19046,7 @@@ F:   drivers/input/mouse/vmmouse.
  
  VMWARE VMXNET3 ETHERNET DRIVER
  M:    Ronak Doshi <[email protected]>
 -M:    "VMware, Inc." <[email protected]>
 +M:    [email protected]
  L:    [email protected]
  S:    Maintained
  F:    drivers/net/vmxnet3/
@@@ -19075,6 -19056,7 +19073,6 @@@ K:   regulator_get_optiona
  
  VRF
  M:    David Ahern <[email protected]>
 -M:    Shrijeet Mukherjee <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/networking/vrf.rst
@@@ -19425,7 -19407,7 +19423,7 @@@ F:   drivers/net/ethernet/*/*/*xdp
  K:    (?:\b|_)xdp(?:\b|_)
  
  XDP SOCKETS (AF_XDP)
 -M:    Björn Töpel <bjorn[email protected]>
 +M:    Björn Töpel <bjorn@kernel.org>
  M:    Magnus Karlsson <[email protected]>
  R:    Jonathan Lemon <[email protected]>
  L:    [email protected]
@@@ -19521,7 -19503,7 +19519,7 @@@ F:   arch/x86/xen/*swiotlb
  F:    drivers/xen/*swiotlb*
  
  XFS FILESYSTEM
 -M:    Darrick J. Wong <d[email protected]>
 +M:    Darrick J. Wong <d[email protected]>
  M:    [email protected]
  L:    [email protected]
  S:    Supported

diff --combined drivers/gpio/Kconfig
index dea65d85594fcceb84cb60c721714f5276904734,a6987ff28d7c7668ad26780c059c78d3ff1f160f..47f4bdc4e053e64160e57aefe9de319b89df6835
--- 1/drivers/gpio/Kconfig
--- 2/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@@ -521,8 -521,7 +521,8 @@@ config GPIO_SAMA5D2_PIOB
  
  config GPIO_SIFIVE
        bool "SiFive GPIO support"
 -      depends on OF_GPIO && IRQ_DOMAIN_HIERARCHY
 +      depends on OF_GPIO
 +      select IRQ_DOMAIN_HIERARCHY
        select GPIO_GENERIC
        select GPIOLIB_IRQCHIP
        select REGMAP_MMIO
@@@ -598,8 -597,6 +598,8 @@@ config GPIO_TEGR
        default ARCH_TEGRA
        depends on ARCH_TEGRA || COMPILE_TEST
        depends on OF_GPIO
 +      select GPIOLIB_IRQCHIP
 +      select IRQ_DOMAIN_HIERARCHY
        help
          Say yes here to support GPIO pins on NVIDIA Tegra SoCs.
  
@@@ -1252,13 -1249,6 +1252,6 @@@ config GPIO_MAX7765
          GPIO driver for MAX77650/77651 PMIC from Maxim Semiconductor.
          These chips have a single pin that can be configured as GPIO.
  
- config GPIO_MSIC
-       bool "Intel MSIC mixed signal gpio support"
-       depends on (X86 || COMPILE_TEST) && MFD_INTEL_MSIC
-       help
-         Enable support for GPIO on intel MSIC controllers found in
-         intel MID devices
- 
  config GPIO_PALMAS
        bool "TI PALMAS series PMICs GPIO"
        depends on MFD_PALMAS
@@@ -1454,13 -1444,6 +1447,6 @@@ config GPIO_BT8X
  
          If unsure, say N.
  
- config GPIO_INTEL_MID
-       bool "Intel MID GPIO support"
-       depends on X86_INTEL_MID
-       select GPIOLIB_IRQCHIP
-       help
-         Say Y here to support Intel MID GPIO.
- 
  config GPIO_MERRIFIELD
        tristate "Intel Merrifield GPIO support"
        depends on X86_INTEL_MID