Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

Pull SCSI updates from James Bottomley:
 "Updates to the usual drivers (ufs, lpfc, hisi_sas, st).

  Amazingly enough, no core changes with the biggest set of driver
  changes being ufs (which conflicted with it's own fixes a bit, hence
  the merges) and the rest being minor fixes and updates"

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (97 commits)
  scsi: st: New session only when Unit Attention for new tape
  scsi: st: Add MTIOCGET and MTLOAD to ioctls allowed after device reset
  scsi: st: Don't modify unknown block number in MTIOCGET
  scsi: ufs: core: Restore SM8650 support
  scsi: sun3: Mark driver struct with __refdata to prevent section mismatch
  scsi: sg: Enable runtime power management
  scsi: qedi: Fix a possible memory leak in qedi_alloc_and_init_sb()
  scsi: qedf: Fix a possible memory leak in qedf_alloc_and_init_sb()
  scsi: fusion: Remove unused variable 'rc'
  scsi: bfa: Fix use-after-free in bfad_im_module_exit()
  scsi: esas2r: Remove unused esas2r_build_cli_req()
  scsi: target: Fix incorrect function name in pscsi_create_type_disk()
  scsi: ufs: Replace deprecated PCI functions
  scsi: Switch back to struct platform_driver::remove()
  scsi: pm8001: Increase request sg length to support 4MiB requests
  scsi: pm8001: Initialize devices in pm8001_alloc_dev()
  scsi: pm8001: Use module param to set pcs event log severity
  scsi: ufs: ufs-mediatek: Configure individual LU queue flags
  scsi: MAINTAINERS: Update UFS Exynos entry
  scsi: lpfc: Copyright updates for 14.4.0.6 patches
  ...

diff --combined MAINTAINERS
index 46325a9c9219cb030f334127d78cb54cf56a1014,6b5e9f0ffc9216db8adaa9e96600102644facad6..550a74e111efab17d36825b24cfa709725082883
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -258,6 -258,12 +258,6 @@@ L:        [email protected]
  S:    Maintained
  F:    drivers/net/ethernet/alteon/acenic*
  
 -ACER ASPIRE 1 EMBEDDED CONTROLLER DRIVER
 -M:    Nikita Travkin <[email protected]>
 -S:    Maintained
 -F:    Documentation/devicetree/bindings/platform/acer,aspire1-ec.yaml
 -F:    drivers/platform/arm64/acer-aspire1-ec.c
 -
  ACER ASPIRE ONE TEMPERATURE AND FAN DRIVER
  M:    Peter Kaestle <[email protected]>
  L:    [email protected]
@@@ -701,7 -707,7 +701,7 @@@ M: Hans Verkuil <[email protected]
  L:    [email protected]
  S:    Maintained
  W:    https://linuxtv.org
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    drivers/media/radio/radio-aimslab*
  
  AIO
@@@ -786,7 -792,6 +786,7 @@@ F: drivers/perf/alibaba_uncore_drw_pmu.
  ALIENWARE WMI DRIVER
  L:    [email protected]
  S:    Maintained
 +F:    Documentation/wmi/devices/alienware-wmi.rst
  F:    drivers/platform/x86/dell/alienware-wmi.c
  
  ALLEGRO DVT VIDEO IP CORE DRIVER
@@@ -810,7 -815,7 +810,7 @@@ ALLWINNER A10 CSI DRIVE
  M:    Maxime Ripard <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    Documentation/devicetree/bindings/media/allwinner,sun4i-a10-csi.yaml
  F:    drivers/media/platform/sunxi/sun4i-csi/
  
@@@ -819,7 -824,7 +819,7 @@@ M: Yong Deng <[email protected]
  M:    Paul Kocialkowski <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    Documentation/devicetree/bindings/media/allwinner,sun6i-a31-csi.yaml
  F:    drivers/media/platform/sunxi/sun6i-csi/
  
@@@ -827,7 -832,7 +827,7 @@@ ALLWINNER A31 ISP DRIVE
  M:    Paul Kocialkowski <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    Documentation/devicetree/bindings/media/allwinner,sun6i-a31-isp.yaml
  F:    drivers/staging/media/sunxi/sun6i-isp/
  F:    drivers/staging/media/sunxi/sun6i-isp/uapi/sun6i-isp-config.h
@@@ -836,7 -841,7 +836,7 @@@ ALLWINNER A31 MIPI CSI-2 BRIDGE DRIVE
  M:    Paul Kocialkowski <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    Documentation/devicetree/bindings/media/allwinner,sun6i-a31-mipi-csi2.yaml
  F:    drivers/media/platform/sunxi/sun6i-mipi-csi2/
  
@@@ -855,7 -860,7 +855,7 @@@ F: drivers/crypto/allwinner
  
  ALLWINNER DMIC DRIVERS
  M:    Ban Tao <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/sound/allwinner,sun50i-h6-dmic.yaml
  F:    sound/soc/sunxi/sun50i-dmic.c
@@@ -883,6 -888,7 +883,6 @@@ F: drivers/staging/media/sunxi/cedrus
  
  ALPHA PORT
  M:    Richard Henderson <[email protected]>
 -M:    Ivan Kokshaysky <[email protected]>
  M:    Matt Turner <[email protected]>
  L:    [email protected]
  S:    Odd Fixes
@@@ -966,14 -972,6 +966,14 @@@ Q:       https://patchwork.kernel.org/project
  F:    drivers/infiniband/hw/efa/
  F:    include/uapi/rdma/efa-abi.h
  
 +AMD 3D V-CACHE PERFORMANCE OPTIMIZER DRIVER
 +M:    Basavaraj Natikar <[email protected]>
 +R:    Mario Limonciello <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    Documentation/ABI/testing/sysfs-bus-platform-drivers-amd_x3d_vcache
 +F:    drivers/platform/x86/amd/x3d_vcache.c
 +
  AMD ADDRESS TRANSLATION LIBRARY (ATL)
  M:    Yazen Ghannam <[email protected]>
  L:    [email protected]
@@@ -1083,7 -1081,7 +1083,7 @@@ S:      Maintaine
  F:    Documentation/arch/x86/amd_hsmp.rst
  F:    arch/x86/include/asm/amd_hsmp.h
  F:    arch/x86/include/uapi/asm/amd_hsmp.h
 -F:    drivers/platform/x86/amd/hsmp.c
 +F:    drivers/platform/x86/amd/hsmp/
  
  AMD IOMMU (AMD-VI)
  M:    Joerg Roedel <[email protected]>
@@@ -1115,12 -1113,6 +1115,12 @@@ L:    [email protected]
  S:    Maintained
  F:    drivers/i2c/busses/i2c-amd-mp2*
  
 +AMD ASF I2C DRIVER
 +M:    Shyam Sundar S K <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/i2c/busses/i2c-amd-asf-plat.c
 +
  AMD PDS CORE DRIVER
  M:    Shannon Nelson <[email protected]>
  M:    Brett Creeley <[email protected]>
@@@ -1139,7 -1131,7 +1139,7 @@@ F:      drivers/platform/x86/amd/pmc
  AMD PMF DRIVER
  M:    Shyam Sundar S K <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Supported
  F:    Documentation/ABI/testing/sysfs-amd-pmf
  F:    drivers/platform/x86/amd/pmf/
  
@@@ -1189,9 -1181,8 +1189,9 @@@ F:      Documentation/hid/amd-sfh
  F:    drivers/hid/amd-sfh-hid/
  
  AMD SPI DRIVER
 -M:    Sanjay R Mehta <[email protected]>
 -S:    Maintained
 +M:    Raju Rangoju <[email protected]>
 +L:    [email protected]
 +S:    Supported
  F:    drivers/spi/spi-amd.c
  
  AMD XGBE DRIVER
@@@ -1526,11 -1517,10 +1526,11 @@@ F:   drivers/iio/gyro/adxrs290.
  ANALOG DEVICES INC ASOC CODEC DRIVERS
  M:    Lars-Peter Clausen <[email protected]>
  M:    Nuno Sá <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
  S:    Supported
  W:    http://wiki.analog.com/
  W:    https://ez.analog.com/linux-software-drivers
 +F:    Documentation/devicetree/bindings/sound/adi,*
  F:    sound/soc/codecs/ad1*
  F:    sound/soc/codecs/ad7*
  F:    sound/soc/codecs/adau*
@@@ -1604,7 -1594,7 +1604,7 @@@ F:      drivers/rtc/rtc-goldfish.
  AOA (Apple Onboard Audio) ALSA DRIVER
  M:    Johannes Berg <[email protected]>
  L:    [email protected]
 -L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
  S:    Maintained
  F:    sound/aoa/
  
@@@ -1771,8 -1761,8 +1771,8 @@@ F:      include/uapi/linux/if_arcnet.
  ARM AND ARM64 SoC SUB-ARCHITECTURES (COMMON PARTS)
  M:    Arnd Bergmann <[email protected]>
  M:    Olof Johansson <[email protected]>
 -M:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
  S:    Maintained
  P:    Documentation/process/maintainer-soc.rst
  C:    irc://irc.libera.chat/armlinux
@@@ -2006,7 -1996,7 +2006,7 @@@ L:      [email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    Documentation/devicetree/bindings/arm/actions.yaml
 -F:    Documentation/devicetree/bindings/clock/actions,owl-cmu.txt
 +F:    Documentation/devicetree/bindings/clock/actions,owl-cmu.yaml
  F:    Documentation/devicetree/bindings/dma/owl-dma.yaml
  F:    Documentation/devicetree/bindings/i2c/i2c-owl.yaml
  F:    Documentation/devicetree/bindings/interrupt-controller/actions,owl-sirq.yaml
@@@ -2014,7 -2004,7 +2014,7 @@@ F:      Documentation/devicetree/bindings/mm
  F:    Documentation/devicetree/bindings/net/actions,owl-emac.yaml
  F:    Documentation/devicetree/bindings/pinctrl/actions,*
  F:    Documentation/devicetree/bindings/power/actions,owl-sps.txt
 -F:    Documentation/devicetree/bindings/timer/actions,owl-timer.txt
 +F:    Documentation/devicetree/bindings/timer/actions,owl-timer.yaml
  F:    arch/arm/boot/dts/actions/
  F:    arch/arm/mach-actions/
  F:    arch/arm64/boot/dts/actions/
@@@ -2101,7 -2091,7 +2101,7 @@@ F:      drivers/crypto/amlogic
  
  ARM/Amlogic Meson SoC Sound Drivers
  M:    Jerome Brunet <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/sound/amlogic*
  F:    sound/soc/meson/
@@@ -2139,14 -2129,12 +2139,14 @@@ F:   drivers/*/*alpine
  ARM/APPLE MACHINE SOUND DRIVERS
  M:    Martin Povišer <[email protected]>
  L:    [email protected]
 -L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/sound/adi,ssm3515.yaml
 +F:    Documentation/devicetree/bindings/sound/cirrus,cs42l84.yaml
  F:    Documentation/devicetree/bindings/sound/apple,*
  F:    sound/soc/apple/*
  F:    sound/soc/codecs/cs42l83-i2c.c
 +F:    sound/soc/codecs/cs42l84.*
  F:    sound/soc/codecs/ssm3515.c
  
  ARM/APPLE MACHINE SUPPORT
@@@ -2213,7 -2201,7 +2213,7 @@@ F:      drivers/mmc/host/usdhi6rol0.
  F:    drivers/pinctrl/pinctrl-artpec*
  
  ARM/ASPEED I2C DRIVER
 -M:    Brendan Higgins <brendanhiggins@google.com>
 +M:    Ryan Chen <ryan_chen@aspeedtech.com>
  R:    Benjamin Herrenschmidt <[email protected]>
  R:    Joel Stanley <[email protected]>
  L:    [email protected]
@@@ -2275,6 -2263,12 +2275,6 @@@ L:     [email protected]
  S:    Maintained
  F:    arch/arm/mach-ep93xx/ts72xx.c
  
 -ARM/CIRRUS LOGIC CLPS711X ARM ARCHITECTURE
 -M:    Alexander Shiyan <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -S:    Odd Fixes
 -N:    clps711x
 -
  ARM/CIRRUS LOGIC EP93XX ARM ARCHITECTURE
  M:    Hartley Sweeten <[email protected]>
  M:    Alexander Sverdlin <[email protected]>
@@@ -2824,7 -2818,6 +2824,7 @@@ F:      arch/arm64/boot/dts/qcom/sdm845-chez
  
  ARM/QUALCOMM MAILING LIST
  L:    [email protected]
 +C:    irc://irc.oftc.net/linux-msm
  F:    Documentation/devicetree/bindings/*/qcom*
  F:    Documentation/devicetree/bindings/soc/qcom/
  F:    arch/arm/boot/dts/qcom/
@@@ -2866,14 -2859,13 +2866,14 @@@ M:   Bjorn Andersson <[email protected]
  M:    Konrad Dybcio <[email protected]>
  L:    [email protected]
  S:    Maintained
 +C:    irc://irc.oftc.net/linux-msm
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git
  F:    Documentation/devicetree/bindings/arm/qcom-soc.yaml
  F:    Documentation/devicetree/bindings/arm/qcom.yaml
  F:    Documentation/devicetree/bindings/bus/qcom*
  F:    Documentation/devicetree/bindings/cache/qcom,llcc.yaml
  F:    Documentation/devicetree/bindings/firmware/qcom,scm.yaml
 -F:    Documentation/devicetree/bindings/reserved-memory/qcom
 +F:    Documentation/devicetree/bindings/reserved-memory/qcom*
  F:    Documentation/devicetree/bindings/soc/qcom/
  F:    arch/arm/boot/dts/qcom/
  F:    arch/arm/configs/qcom_defconfig
@@@ -3368,7 -3360,7 +3368,7 @@@ ASAHI KASEI AK7375 LENS VOICE COIL DRIV
  M:    Tianshu Qiu <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    Documentation/devicetree/bindings/media/i2c/asahi-kasei,ak7375.yaml
  F:    drivers/media/i2c/ak7375.c
  
@@@ -3740,7 -3732,7 +3740,7 @@@ F:      arch/arm/boot/dts/microchip/at91-tse
  
  AXENTIA ASOC DRIVERS
  M:    Peter Rosin <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/sound/axentia,*
  F:    sound/soc/atmel/tse850-pcm5142.c
@@@ -3766,7 -3758,6 +3766,7 @@@ F:      drivers/spi/spi-axi-spi-engine.
  AXI PWM GENERATOR
  M:    Michael Hennerich <[email protected]>
  M:    Nuno Sá <[email protected]>
 +R:    Trevor Gamblin <[email protected]>
  L:    [email protected]
  S:    Supported
  W:    https://ez.analog.com/linux-software-drivers
@@@ -3785,7 -3776,7 +3785,7 @@@ M:      Mauro Carvalho Chehab <mchehab@kerne
  L:    [email protected]
  S:    Maintained
  W:    https://linuxtv.org
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    drivers/media/usb/dvb-usb-v2/az6007.c
  
  AZTECH FM RADIO RECEIVER DRIVER
@@@ -3793,7 -3784,7 +3793,7 @@@ M:      Hans Verkuil <[email protected]
  L:    [email protected]
  S:    Maintained
  W:    https://linuxtv.org
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    drivers/media/radio/radio-aztech*
  
  B43 WIRELESS DRIVER
@@@ -3812,7 -3803,7 +3812,7 @@@ F:      drivers/net/wireless/broadcom/b43leg
  
  BACKLIGHT CLASS/SUBSYSTEM
  M:    Lee Jones <[email protected]>
 -M:    Daniel Thompson <daniel.thompson@linaro.org>
 +M:    Daniel Thompson <danielt@kernel.org>
  M:    Jingoo Han <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -3824,6 -3815,14 +3824,6 @@@ F:     drivers/video/backlight
  F:    include/linux/backlight.h
  F:    include/linux/pwm_backlight.h
  
 -BAIKAL-T1 PVT HARDWARE MONITOR DRIVER
 -M:    Serge Semin <[email protected]>
 -L:    [email protected]
 -S:    Supported
 -F:    Documentation/devicetree/bindings/hwmon/baikal,bt1-pvt.yaml
 -F:    Documentation/hwmon/bt1-pvt.rst
 -F:    drivers/hwmon/bt1-pvt.[ch]
 -
  BARCO P50 GPIO DRIVER
  M:    Santosh Kumar Yadav <[email protected]>
  M:    Peter Korsgaard <[email protected]>
@@@ -3877,7 -3876,7 +3877,7 @@@ M:      Fabien Dessenne <fabien.dessenne@fos
  L:    [email protected]
  S:    Supported
  W:    https://linuxtv.org
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    drivers/media/platform/st/sti/bdisp
  
  BECKHOFF CX5020 ETHERCAT MASTER DRIVER
@@@ -4852,7 -4851,7 +4852,7 @@@ F:      include/uapi/linux/bsg.
  
  BT87X AUDIO DRIVER
  M:    Clemens Ladisch <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git
  F:    Documentation/sound/cards/bt87x.rst
@@@ -4885,7 -4884,7 +4885,7 @@@ M:      Mauro Carvalho Chehab <mchehab@kerne
  L:    [email protected]
  S:    Odd fixes
  W:    https://linuxtv.org
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    Documentation/driver-api/media/drivers/bttv*
  F:    drivers/media/pci/bt8xx/bttv*
  
@@@ -4914,7 -4913,7 +4914,7 @@@ F:      drivers/net/can/bxcan.
  
  C-MEDIA CMI8788 DRIVER
  M:    Clemens Ladisch <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git
  F:    sound/pci/oxygen/
@@@ -4999,13 -4998,13 +4999,13 @@@ M:   Hans Verkuil <[email protected]
  L:    [email protected]
  S:    Maintained
  W:    https://linuxtv.org
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    drivers/media/radio/radio-cadet*
  
  CAFE CMOS INTEGRATED CAMERA CONTROLLER DRIVER
  L:    [email protected]
  S:    Orphan
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    Documentation/admin-guide/media/cafe_ccic*
  F:    drivers/media/platform/marvell/
  
@@@ -5189,7 -5188,7 +5189,7 @@@ M:      Hans Verkuil <hverkuil-cisco@xs4all.
  L:    [email protected]
  S:    Supported
  W:    http://linuxtv.org
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    Documentation/ABI/testing/debugfs-cec-error-inj
  F:    Documentation/devicetree/bindings/media/cec/cec-common.yaml
  F:    Documentation/driver-api/media/cec-core.rst
@@@ -5206,7 -5205,7 +5206,7 @@@ M:      Hans Verkuil <hverkuil-cisco@xs4all.
  L:    [email protected]
  S:    Supported
  W:    http://linuxtv.org
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    Documentation/devicetree/bindings/media/cec/cec-gpio.yaml
  F:    drivers/media/cec/platform/cec-gpio/
  
@@@ -5413,7 -5412,7 +5413,7 @@@ CHRONTEL CH7322 CEC DRIVE
  M:    Joe Tessler <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    Documentation/devicetree/bindings/media/i2c/chrontel,ch7322.yaml
  F:    drivers/media/cec/i2c/ch7322.c
  
@@@ -5602,7 -5601,7 +5602,7 @@@ M:      Hans Verkuil <hverkuil-cisco@xs4all.
  L:    [email protected]
  S:    Supported
  W:    https://linuxtv.org
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    drivers/media/pci/cobalt/
  
  COCCINELLE/Semantic Patches (SmPL)
@@@ -5761,15 -5760,6 +5761,15 @@@ F:    fs/configfs
  F:    include/linux/configfs.h
  F:    samples/configfs/
  
 +CONGATEC BOARD CONTROLLER MFD DRIVER
 +M:    Thomas Richard <[email protected]>
 +S:    Maintained
 +F:    drivers/gpio/gpio-cgbc.c
 +F:    drivers/i2c/busses/i2c-cgbc.c
 +F:    drivers/mfd/cgbc-core.c
 +F:    drivers/watchdog/cgbc_wdt.c
 +F:    include/linux/mfd/cgbc.h
 +
  CONSOLE SUBSYSTEM
  M:    Greg Kroah-Hartman <[email protected]>
  S:    Supported
@@@ -5785,6 -5775,7 +5785,6 @@@ F:      kernel/context_tracking.
  
  CONTROL GROUP (CGROUP)
  M:    Tejun Heo <[email protected]>
 -M:    Zefan Li <[email protected]>
  M:    Johannes Weiner <[email protected]>
  M:    Michal Koutný <[email protected]>
  L:    [email protected]
@@@ -5813,6 -5804,7 +5813,6 @@@ F:      include/linux/blk-cgroup.
  
  CONTROL GROUP - CPUSET
  M:    Waiman Long <[email protected]>
 -M:    Zefan Li <[email protected]>
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git
@@@ -6053,7 -6045,7 +6053,7 @@@ M:      Hans Verkuil <[email protected]
  L:    [email protected]
  S:    Odd Fixes
  W:    http://linuxtv.org
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    drivers/media/i2c/cs3308.c
  
  CS5535 Audio ALSA driver
@@@ -6084,7 -6076,7 +6084,7 @@@ M:      Andy Walls <[email protected]
  L:    [email protected]
  S:    Maintained
  W:    https://linuxtv.org
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    drivers/media/pci/cx18/
  F:    include/uapi/linux/ivtv*
  
@@@ -6093,7 -6085,7 +6093,7 @@@ M:      Hans Verkuil <[email protected]
  L:    [email protected]
  S:    Maintained
  W:    https://linuxtv.org
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    drivers/media/common/cx2341x*
  F:    include/media/drv-intf/cx2341x.h
  
@@@ -6111,7 -6103,7 +6111,7 @@@ M:      Mauro Carvalho Chehab <mchehab@kerne
  L:    [email protected]
  S:    Odd fixes
  W:    https://linuxtv.org
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    Documentation/driver-api/media/drivers/cx88*
  F:    drivers/media/pci/cx88/
  
@@@ -6328,6 -6320,7 +6328,6 @@@ DECSTATION PLATFORM SUPPOR
  M:    "Maciej W. Rozycki" <[email protected]>
  L:    [email protected]
  S:    Maintained
 -W:    http://www.linux-mips.org/wiki/DECstation
  F:    arch/mips/dec/
  F:    arch/mips/include/asm/dec/
  F:    arch/mips/include/asm/mach-dec/
@@@ -6346,7 -6339,7 +6346,7 @@@ DEINTERLACE DRIVERS FOR ALLWINNER H
  M:    Jernej Skrabec <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    Documentation/devicetree/bindings/media/allwinner,sun8i-h3-deinterlace.yaml
  F:    drivers/media/platform/sunxi/sun8i-di/
  
@@@ -6473,7 -6466,7 +6473,7 @@@ M:      Hugues Fruchet <hugues.fruchet@foss.
  L:    [email protected]
  S:    Supported
  W:    https://linuxtv.org
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    drivers/media/platform/st/sti/delta
  
  DENALI NAND DRIVER
@@@ -6483,6 -6476,7 +6483,6 @@@ F:      drivers/mtd/nand/raw/denali
  
  DESIGNWARE EDMA CORE IP DRIVER
  M:    Manivannan Sadhasivam <[email protected]>
 -R:    Serge Semin <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/dma/dw-edma/
@@@ -6881,7 -6875,7 +6881,7 @@@ DONGWOON DW9714 LENS VOICE COIL DRIVE
  M:    Sakari Ailus <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    Documentation/devicetree/bindings/media/i2c/dongwoon,dw9714.yaml
  F:    drivers/media/i2c/dw9714.c
  
@@@ -6889,13 -6883,13 +6889,13 @@@ DONGWOON DW9719 LENS VOICE COIL DRIVE
  M:    Daniel Scally <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    drivers/media/i2c/dw9719.c
  
  DONGWOON DW9768 LENS VOICE COIL DRIVER
  L:    [email protected]
  S:    Orphan
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    Documentation/devicetree/bindings/media/i2c/dongwoon,dw9768.yaml
  F:    drivers/media/i2c/dw9768.c
  
@@@ -6903,7 -6897,7 +6903,7 @@@ DONGWOON DW9807 LENS VOICE COIL DRIVE
  M:    Sakari Ailus <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    Documentation/devicetree/bindings/media/i2c/dongwoon,dw9807-vcm.yaml
  F:    drivers/media/i2c/dw9807-vcm.c
  
@@@ -7103,10 -7097,12 +7103,10 @@@ M:   Javier Martinez Canillas <javierm@re
  L:    [email protected]
  S:    Maintained
  T:    git https://gitlab.freedesktop.org/drm/misc/kernel.git
 -F:    drivers/gpu/drm/drm_aperture.c
  F:    drivers/gpu/drm/tiny/ofdrm.c
  F:    drivers/gpu/drm/tiny/simpledrm.c
  F:    drivers/video/aperture.c
  F:    drivers/video/nomodeset.c
 -F:    include/drm/drm_aperture.h
  F:    include/linux/aperture.h
  F:    include/video/nomodeset.h
  
@@@ -7387,18 -7383,6 +7387,18 @@@ S:    Maintaine
  F:    Documentation/devicetree/bindings/display/panel/samsung,s6d7aa0.yaml
  F:    drivers/gpu/drm/panel/panel-samsung-s6d7aa0.c
  
 +DRM DRIVER FOR SAMSUNG S6E3HA8 PANELS
 +M:    Dzmitry Sankouski <[email protected]>
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/display/panel/samsung,s6e3ha8.yaml
 +F:    drivers/gpu/drm/panel/panel-samsung-s6e3ha8.c
 +
 +DRM DRIVER FOR SHARP MEMORY LCD
 +M:    Alex Lanzano <[email protected]>
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/display/sharp,ls010b7dh04.yaml
 +F:    drivers/gpu/drm/tiny/sharp-memory.c
 +
  DRM DRIVER FOR SITRONIX ST7586 PANELS
  M:    David Lechner <[email protected]>
  S:    Maintained
@@@ -7476,7 -7460,8 +7476,7 @@@ T:      git https://gitlab.freedesktop.org/d
  F:    drivers/gpu/drm/udl/
  
  DRM DRIVER FOR VIRTUAL KERNEL MODESETTING (VKMS)
 -M:    Rodrigo Siqueira <[email protected]>
 -M:    Maíra Canal <[email protected]>
 +M:    Louis Chauvet <[email protected]>
  R:    Haneen Mohammed <[email protected]>
  R:    Simona Vetter <[email protected]>
  R:    Melissa Wen <[email protected]>
@@@ -7808,7 -7793,6 +7808,7 @@@ F:      include/uapi/drm/v3d_drm.
  DRM DRIVERS FOR VC4
  M:    Maxime Ripard <[email protected]>
  M:    Dave Stevenson <[email protected]>
 +R:    Maíra Canal <[email protected]>
  R:    Raspberry Pi Kernel Maintenance <[email protected]>
  S:    Supported
  T:    git https://gitlab.freedesktop.org/drm/misc/kernel.git
@@@ -7843,14 -7827,11 +7843,14 @@@ L:   [email protected]
  S:    Maintained
  T:    git https://gitlab.freedesktop.org/drm/misc/kernel.git
  F:    Documentation/devicetree/bindings/display/xlnx/
 +F:    Documentation/gpu/zynqmp.rst
  F:    drivers/gpu/drm/xlnx/
  
  DRM GPU SCHEDULER
  M:    Luben Tuikov <[email protected]>
  M:    Matthew Brost <[email protected]>
 +M:    Danilo Krummrich <[email protected]>
 +M:    Philipp Stanner <[email protected]>
  L:    [email protected]
  S:    Maintained
  T:    git https://gitlab.freedesktop.org/drm/misc/kernel.git
@@@ -7894,10 -7875,10 +7894,10 @@@ F:   Documentation/gpu/automated_testing.
  F:    drivers/gpu/drm/ci/
  
  DSBR100 USB FM RADIO DRIVER
 -M:    Alexey Klimov <[email protected]>
 +M:    Alexey Klimov <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    drivers/media/radio/dsbr100.c
  
  DT3155 MEDIA DRIVER
@@@ -7905,7 -7886,7 +7905,7 @@@ M:      Hans Verkuil <[email protected]
  L:    [email protected]
  S:    Odd Fixes
  W:    https://linuxtv.org
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    drivers/media/pci/dt3155/
  
  DVB_USB_AF9015 MEDIA DRIVER
@@@ -7950,7 -7931,7 +7950,7 @@@ S:      Maintaine
  W:    https://linuxtv.org
  W:    http://github.com/mkrufky
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    drivers/media/usb/dvb-usb/cxusb*
  
  DVB_USB_EC168 MEDIA DRIVER
@@@ -8098,10 -8079,10 +8098,10 @@@ S:   Maintaine
  F:    drivers/edac/highbank*
  
  EDAC-CAVIUM OCTEON
 -M:    Ralf Baechle <[email protected]>
 +M:    Thomas Bogendoerfer <[email protected]>
  L:    [email protected]
  L:    [email protected]
 -S:    Supported
 +S:    Maintained
  F:    drivers/edac/octeon_edac*
  
  EDAC-CAVIUM THUNDERX
@@@ -8141,8 -8122,7 +8141,8 @@@ S:      Maintaine
  F:    drivers/edac/e7xxx_edac.c
  
  EDAC-FSL_DDR
 -M:    York Sun <[email protected]>
 +R:    Frank Li <[email protected]>
 +L:    [email protected]
  L:    [email protected]
  S:    Maintained
  F:    drivers/edac/fsl_ddr_edac.*
@@@ -8272,7 -8252,7 +8272,7 @@@ F:      drivers/edac/ti_edac.
  
  EDIROL UA-101/UA-1000 DRIVER
  M:    Clemens Ladisch <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git
  F:    sound/usb/misc/ua101.c
@@@ -8320,7 -8300,7 +8320,7 @@@ M:      Mauro Carvalho Chehab <mchehab@kerne
  L:    [email protected]
  S:    Maintained
  W:    https://linuxtv.org
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    Documentation/admin-guide/media/em28xx*
  F:    drivers/media/usb/em28xx/
  
@@@ -8616,7 -8596,7 +8616,7 @@@ EXTRON DA HD 4K PLUS CEC DRIVE
  M:    Hans Verkuil <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    drivers/media/cec/usb/extron-da-hd-4k-plus/
  
  EXYNOS DP DRIVER
@@@ -8834,7 -8814,7 +8834,7 @@@ F:      drivers/net/can/usb/f81604.
  FIREWIRE AUDIO DRIVERS and IEC 61883-1/6 PACKET STREAMING ENGINE
  M:    Clemens Ladisch <[email protected]>
  M:    Takashi Sakamoto <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git
  F:    include/uapi/sound/firewire.h
@@@ -8908,7 -8888,7 +8908,7 @@@ F:      drivers/input/joystick/fsia6b.
  
  FOCUSRITE SCARLETT2 MIXER DRIVER (Scarlett Gen 2+ and Clarett)
  M:    Geoffrey D. Bennett <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
  S:    Maintained
  W:    https://github.com/geoffreybennett/scarlett-gen2
  B:    https://github.com/geoffreybennett/scarlett-gen2/issues
@@@ -8932,7 -8912,6 +8932,7 @@@ F:      include/linux/fortify-string.
  F:    lib/fortify_kunit.c
  F:    lib/memcpy_kunit.c
  F:    lib/test_fortify/*
 +K:    \bunsafe_memcpy\b
  K:    \b__NO_FORTIFY\b
  
  FPGA DFL DRIVERS
@@@ -9036,16 -9015,9 +9036,16 @@@ F:    drivers/dma/fsl-edma*.
  FREESCALE ENETC ETHERNET DRIVERS
  M:    Claudiu Manoil <[email protected]>
  M:    Vladimir Oltean <[email protected]>
 +M:    Wei Fang <[email protected]>
 +M:    Clark Wang <[email protected]>
 +L:    [email protected]
  L:    [email protected]
  S:    Maintained
 +F:    Documentation/devicetree/bindings/net/fsl,enetc*.yaml
 +F:    Documentation/devicetree/bindings/net/nxp,netc-blk-ctrl.yaml
  F:    drivers/net/ethernet/freescale/enetc/
 +F:    include/linux/fsl/enetc_mdio.h
 +F:    include/linux/fsl/netc_global.h
  
  FREESCALE eTSEC ETHERNET DRIVER (GIANFAR)
  M:    Claudiu Manoil <[email protected]>
@@@ -9056,7 -9028,6 +9056,7 @@@ F:      drivers/net/ethernet/freescale/gianf
  
  FREESCALE GPMI NAND DRIVER
  M:    Han Xu <[email protected]>
 +L:    [email protected]
  L:    [email protected]
  S:    Maintained
  F:    drivers/mtd/nand/raw/gpmi-nand/*
@@@ -9238,7 -9209,7 +9238,7 @@@ M:      Shengjiu Wang <[email protected]
  M:    Xiubo Li <[email protected]>
  R:    Fabio Estevam <[email protected]>
  R:    Nicolin Chen <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
  L:    [email protected]
  S:    Maintained
  F:    sound/soc/fsl/fsl*
@@@ -9248,7 -9219,7 +9248,7 @@@ FREESCALE SOC LPC32XX SOUND DRIVER
  M:    J.M.B. Downing <[email protected]>
  M:    Piotr Wojtaszczyk <[email protected]>
  R:    Vladimir Zapolskiy <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/sound/nxp,lpc3220-i2s.yaml
@@@ -9256,7 -9227,7 +9256,7 @@@ F:      sound/soc/fsl/lpc3xxx-
  
  FREESCALE SOC SOUND QMC DRIVER
  M:    Herve Codina <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/sound/fsl,qmc-audio.yaml
@@@ -9446,7 -9417,7 +9446,7 @@@ GALAXYCORE GC2145 SENSOR DRIVE
  M:    Alain Volmat <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    Documentation/devicetree/bindings/media/i2c/galaxycore,gc2145.yaml
  F:    drivers/media/i2c/gc2145.c
  
@@@ -9494,7 -9465,7 +9494,7 @@@ M:      Hans Verkuil <[email protected]
  L:    [email protected]
  S:    Maintained
  W:    https://linuxtv.org
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    drivers/media/radio/radio-gemtek*
  
  GENERIC ARCHITECTURE TOPOLOGY
@@@ -9771,7 -9742,6 +9771,7 @@@ F:      include/dt-bindings/gpio
  F:    include/linux/gpio.h
  F:    include/linux/gpio/
  F:    include/linux/of_gpio.h
 +K:    (devm_)?gpio_(request|free|direction|get|set)
  
  GPIO UAPI
  M:    Bartosz Golaszewski <[email protected]>
@@@ -9786,6 -9756,14 +9786,6 @@@ F:     drivers/gpio/gpiolib-cdev.
  F:    include/uapi/linux/gpio.h
  F:    tools/gpio/
  
 -GRE DEMULTIPLEXER DRIVER
 -M:    Dmitry Kozlov <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    include/net/gre.h
 -F:    net/ipv4/gre_demux.c
 -F:    net/ipv4/gre_offload.c
 -
  GRETH 10/100/1G Ethernet MAC device driver
  M:    Andreas Larsson <[email protected]>
  L:    [email protected]
@@@ -9876,56 -9854,56 +9876,56 @@@ GS1662 VIDEO SERIALIZE
  M:    Charles-Antoine Couret <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    drivers/media/spi/gs1662.c
  
  GSPCA FINEPIX SUBDRIVER
  M:    Frank Zago <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    drivers/media/usb/gspca/finepix.c
  
  GSPCA GL860 SUBDRIVER
  M:    Olivier Lorin <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    drivers/media/usb/gspca/gl860/
  
  GSPCA M5602 SUBDRIVER
  M:    Erik Andren <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    drivers/media/usb/gspca/m5602/
  
  GSPCA PAC207 SONIXB SUBDRIVER
  M:    Hans Verkuil <[email protected]>
  L:    [email protected]
  S:    Odd Fixes
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    drivers/media/usb/gspca/pac207.c
  
  GSPCA SN9C20X SUBDRIVER
  M:    Brian Johnson <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    drivers/media/usb/gspca/sn9c20x.c
  
  GSPCA T613 SUBDRIVER
  M:    Leandro Costantino <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    drivers/media/usb/gspca/t613.c
  
  GSPCA USB WEBCAM DRIVER
  M:    Hans Verkuil <[email protected]>
  L:    [email protected]
  S:    Odd Fixes
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    drivers/media/usb/gspca/
  
  GTP (GPRS Tunneling Protocol)
@@@ -10042,7 -10020,7 +10042,7 @@@ M:   Hans Verkuil <[email protected]
  L:    [email protected]
  S:    Odd Fixes
  W:    https://linuxtv.org
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    drivers/media/usb/hdpvr/
  
  HEWLETT PACKARD ENTERPRISE ILO CHIF DRIVER
@@@ -10184,12 -10162,10 +10184,12 @@@ S:        Maintaine
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core
  F:    Documentation/timers/
  F:    include/linux/clockchips.h
 +F:    include/linux/delay.h
  F:    include/linux/hrtimer.h
  F:    include/linux/timer.h
  F:    kernel/time/clockevents.c
  F:    kernel/time/hrtimer.c
 +F:    kernel/time/sleep_timeout.c
  F:    kernel/time/timer.c
  F:    kernel/time/timer_list.c
  F:    kernel/time/timer_migration.*
@@@ -10291,7 -10267,7 +10291,7 @@@ F:   Documentation/devicetree/bindings/ar
  F:    drivers/bus/hisi_lpc.c
  
  HISILICON NETWORK SUBSYSTEM 3 DRIVER (HNS3)
 -M:    Yisen Zhuang <yisen.zhuang@huawei.com>
 +M:    Jian Shen <shenjian15@huawei.com>
  M:    Salil Mehta <[email protected]>
  M:    Jijie Shao <[email protected]>
  L:    [email protected]
@@@ -10299,14 -10275,8 +10299,14 @@@ S: Maintaine
  W:    http://www.hisilicon.com
  F:    drivers/net/ethernet/hisilicon/hns3/
  
 +HISILICON NETWORK HIBMCGE DRIVER
 +M:    Jijie Shao <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/net/ethernet/hisilicon/hibmcge/
 +
  HISILICON NETWORK SUBSYSTEM DRIVER
 -M:    Yisen Zhuang <yisen.zhuang@huawei.com>
 +M:    Jian Shen <shenjian15@huawei.com>
  M:    Salil Mehta <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -10547,7 -10517,6 +10547,7 @@@ F:   Documentation/mm/hugetlbfs_reserv.rs
  F:    Documentation/mm/vmemmap_dedup.rst
  F:    fs/hugetlbfs/
  F:    include/linux/hugetlb.h
 +F:    include/trace/events/hugetlbfs.h
  F:    mm/hugetlb.c
  F:    mm/hugetlb_vmemmap.c
  F:    mm/hugetlb_vmemmap.h
@@@ -10558,7 -10527,7 +10558,7 @@@ M:   Jean-Christophe Trotin <jean-christo
  L:    [email protected]
  S:    Supported
  W:    https://linuxtv.org
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    drivers/media/platform/st/sti/hva
  
  HWPOISON MEMORY FAILURE HANDLING
@@@ -10586,7 -10555,7 +10586,7 @@@ HYNIX HI556 SENSOR DRIVE
  M:    Sakari Ailus <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    drivers/media/i2c/hi556.c
  
  HYNIX HI846 SENSOR DRIVER
@@@ -10771,12 -10740,14 +10771,12 @@@ F:        Documentation/i2c/busses/i2c-viapro.
  F:    drivers/i2c/busses/i2c-ali1535.c
  F:    drivers/i2c/busses/i2c-ali1563.c
  F:    drivers/i2c/busses/i2c-ali15x3.c
 -F:    drivers/i2c/busses/i2c-amd756-s4882.c
  F:    drivers/i2c/busses/i2c-amd756.c
  F:    drivers/i2c/busses/i2c-amd8111.c
  F:    drivers/i2c/busses/i2c-i801.c
  F:    drivers/i2c/busses/i2c-isch.c
 -F:    drivers/i2c/busses/i2c-nforce2-s4985.c
  F:    drivers/i2c/busses/i2c-nforce2.c
 -F:    drivers/i2c/busses/i2c-piix4.c
 +F:    drivers/i2c/busses/i2c-piix4.*
  F:    drivers/i2c/busses/i2c-sis5595.c
  F:    drivers/i2c/busses/i2c-sis630.c
  F:    drivers/i2c/busses/i2c-sis96x.c
@@@ -11183,7 -11154,7 +11183,7 @@@ F:   drivers/iio/pressure/dps310.
  
  INFINEON PEB2466 ASoC CODEC
  M:    Herve Codina <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/sound/infineon,peb2466.yaml
  F:    sound/soc/codecs/peb2466.c
@@@ -11309,10 -11280,10 +11309,10 @@@ F:        security/integrity
  F:    security/integrity/ima/
  
  INTEGRITY POLICY ENFORCEMENT (IPE)
 -M:    Fan Wu <wufan@linux.microsoft.com>
 +M:    Fan Wu <wufan@kernel.org>
  L:    [email protected]
  S:    Supported
 -T:    git https://github.com/microsoft/ipe.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/wufan/ipe.git
  F:    Documentation/admin-guide/LSM/ipe.rst
  F:    Documentation/security/ipe.rst
  F:    scripts/ipe/
@@@ -11346,7 -11317,7 +11346,7 @@@ M:   Bard Liao <[email protected]
  M:    Ranjani Sridharan <[email protected]>
  M:    Kai Vehmanen <[email protected]>
  R:    Pierre-Louis Bossart <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
  S:    Supported
  F:    sound/soc/intel/
  
@@@ -11500,7 -11471,7 +11500,7 @@@ Q:   https://patchwork.kernel.org/project
  F:    drivers/dma/ioat*
  
  INTEL IAA CRYPTO DRIVER
 -M:    Tom Zanussi <tom.zanussi@linux.intel.com>
 +M:    Kristen Accardi <kristen.c.accardi@intel.com>
  L:    [email protected]
  S:    Supported
  F:    Documentation/driver-api/crypto/iaa/iaa-crypto.rst
@@@ -11525,7 -11496,7 +11525,7 @@@ F:   include/uapi/linux/idxd.
  
  INTEL IN FIELD SCAN (IFS) DEVICE
  M:    Jithu Joseph <[email protected]>
 -R:    Ashok Raj <ashok.raj@intel.com>
 +R:    Ashok Raj <ashok.raj.linux@gmail.com>
  R:    Tony Luck <[email protected]>
  S:    Maintained
  F:    drivers/platform/x86/intel/ifs
@@@ -11555,7 -11526,7 +11555,7 @@@ M:   Dan Scally <[email protected]
  R:    Tianshu Qiu <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    Documentation/userspace-api/media/v4l/pixfmt-srggb10-ipu3.rst
  F:    drivers/media/pci/intel/ipu3/
  
@@@ -11576,12 -11547,12 +11576,12 @@@ M:        Bingbu Cao <[email protected]
  R:    Tianshu Qiu <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    Documentation/admin-guide/media/ipu6-isys.rst
  F:    drivers/media/pci/intel/ipu6/
  
  INTEL ISHTP ECLITE DRIVER
 -M:    Sumesh K Naduvalath <sumesh.k.naduvalath@intel.com>
 +M:    Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
  L:    [email protected]
  S:    Supported
  F:    drivers/platform/x86/intel/ishtp_eclite.c
@@@ -11630,16 -11601,6 +11630,16 @@@ F: drivers/crypto/intel/keembay/keembay
  F:    drivers/crypto/intel/keembay/ocs-hcu.c
  F:    drivers/crypto/intel/keembay/ocs-hcu.h
  
 +INTEL LA JOLLA COVE ADAPTER (LJCA) USB I/O EXPANDER DRIVERS
 +M:    Wentong Wu <[email protected]>
 +M:    Sakari Ailus <[email protected]>
 +S:    Maintained
 +F:    drivers/gpio/gpio-ljca.c
 +F:    drivers/i2c/busses/i2c-ljca.c
 +F:    drivers/spi/spi-ljca.c
 +F:    drivers/usb/misc/usb-ljca.c
 +F:    include/linux/usb/ljca.h
 +
  INTEL MANAGEMENT ENGINE (mei)
  M:    Tomas Winkler <[email protected]>
  L:    [email protected]
@@@ -11814,7 -11775,7 +11814,7 @@@ M:   Srinivas Pandruvada <srinivas.pandru
  L:    [email protected]
  S:    Maintained
  F:    Documentation/ABI/testing/debugfs-tpmi
 -F:    drivers/platform/x86/intel/tpmi.c
 +F:    drivers/platform/x86/intel/vsec_tpmi.c
  F:    include/linux/intel_tpmi.h
  
  INTEL UNCORE FREQUENCY CONTROL
@@@ -11938,7 -11899,7 +11938,7 @@@ F:   Documentation/devicetree/bindings/ii
  F:    drivers/iio/gyro/mpu3050*
  
  IOC3 ETHERNET DRIVER
 -M:    Ralf Baechle <[email protected]>
 +M:    Thomas Bogendoerfer <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/net/ethernet/sgi/ioc3-eth.c
@@@ -12040,7 -12001,7 +12040,7 @@@ F:   drivers/tty/ipwireless
  
  IRON DEVICE AUDIO CODEC DRIVERS
  M:    Kiseok Jo <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/sound/irondevice,*
  F:    sound/soc/codecs/sma*
@@@ -12089,7 -12050,7 +12089,7 @@@ M:   Hans Verkuil <[email protected]
  L:    [email protected]
  S:    Maintained
  W:    https://linuxtv.org
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    drivers/media/radio/radio-isa*
  
  ISAPNP
@@@ -12157,14 -12118,6 +12157,14 @@@ F: drivers/isdn/Makefil
  F:    drivers/isdn/hardware/
  F:    drivers/isdn/mISDN/
  
 +ISL28022 HARDWARE MONITORING DRIVER
 +M:    Carsten Spieß <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/hwmon/renesas,isl28022.yaml
 +F:    Documentation/hwmon/isl28022.rst
 +F:    drivers/hwmon/isl28022.c
 +
  ISOFS FILESYSTEM
  M:    Jan Kara <[email protected]>
  L:    [email protected]
@@@ -12186,14 -12139,6 +12186,14 @@@ W: https://linuxtv.or
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
  F:    drivers/media/tuners/it913x*
  
 +ITE IT6263 LVDS TO HDMI BRIDGE DRIVER
 +M:    Liu Ying <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +T:    git https://gitlab.freedesktop.org/drm/misc/kernel.git
 +F:    Documentation/devicetree/bindings/display/bridge/ite,it6263.yaml
 +F:    drivers/gpu/drm/bridge/ite-it6263.c
 +
  ITE IT66121 HDMI BRIDGE DRIVER
  M:    Phong LE <[email protected]>
  M:    Neil Armstrong <[email protected]>
@@@ -12207,7 -12152,7 +12207,7 @@@ M:   Andy Walls <[email protected]
  L:    [email protected]
  S:    Maintained
  W:    https://linuxtv.org
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    Documentation/admin-guide/media/ivtv*
  F:    drivers/media/pci/ivtv/
  F:    include/uapi/linux/ivtv*
@@@ -12294,7 -12239,6 +12294,7 @@@ R:   Dmitry Vyukov <[email protected]
  R:    Vincenzo Frascino <[email protected]>
  L:    [email protected]
  S:    Maintained
 +B:    https://bugzilla.kernel.org/buglist.cgi?component=Sanitizers&product=Memory%20Management
  F:    Documentation/dev-tools/kasan.rst
  F:    arch/*/include/asm/*kasan.h
  F:    arch/*/mm/kasan_init*
@@@ -12318,7 -12262,6 +12318,7 @@@ R:   Dmitry Vyukov <[email protected]
  R:    Andrey Konovalov <[email protected]>
  L:    [email protected]
  S:    Maintained
 +B:    https://bugzilla.kernel.org/buglist.cgi?component=Sanitizers&product=Memory%20Management
  F:    Documentation/dev-tools/kcov.rst
  F:    include/linux/kcov.h
  F:    include/uapi/linux/kcov.h
@@@ -12355,7 -12298,7 +12355,7 @@@ M:   Hans Verkuil <[email protected]
  L:    [email protected]
  S:    Maintained
  W:    https://linuxtv.org
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    drivers/media/radio/radio-keene*
  
  KERNEL AUTOMOUNTER
@@@ -12400,10 -12343,9 +12400,10 @@@ F: include/linux/randomize_kstack.
  F:    kernel/configs/hardening.config
  F:    lib/usercopy_kunit.c
  F:    mm/usercopy.c
 +F:    security/Kconfig.hardening
  K:    \b(add|choose)_random_kstack_offset\b
  K:    \b__check_(object_size|heap_object)\b
 -K:    \b__counted_by\b
 +K:    \b__counted_by(_le|_be)?\b
  
  KERNEL JANITORS
  L:    [email protected]
@@@ -12474,7 -12416,7 +12474,7 @@@ F:   fs/smb/common
  F:    fs/smb/server/
  
  KERNEL UNIT TESTING FRAMEWORK (KUnit)
 -M:    Brendan Higgins <brendan[email protected]>
 +M:    Brendan Higgins <brendan[email protected]>
  M:    David Gow <[email protected]>
  R:    Rae Moar <[email protected]>
  L:    [email protected]
@@@ -12517,7 -12459,7 +12517,7 @@@ F:   virt/kvm/
  KERNEL VIRTUAL MACHINE FOR ARM64 (KVM/arm64)
  M:    Marc Zyngier <[email protected]>
  M:    Oliver Upton <[email protected]>
 -R:    James Morse <james.morse@arm.com>
 +R:    Joey Gouly <joey.gouly@arm.com>
  R:    Suzuki K Poulose <[email protected]>
  R:    Zenghui Yu <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -12730,7 -12672,7 +12730,7 @@@ F:   samples/kfifo
  
  KGDB / KDB /debug_core
  M:    Jason Wessel <[email protected]>
 -M:    Daniel Thompson <daniel.thompson@linaro.org>
 +M:    Daniel Thompson <danielt@kernel.org>
  R:    Douglas Anderson <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -12998,29 -12940,49 +12998,29 @@@ LIBATA PATA ARASAN COMPACT FLASH CONTRO
  M:    Viresh Kumar <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git
  F:    drivers/ata/pata_arasan_cf.c
  F:    include/linux/pata_arasan_cf_data.h
  
 -LIBATA PATA DRIVERS
 -R:    Sergey Shtylyov <[email protected]>
 -L:    [email protected]
 -F:    drivers/ata/ata_*.c
 -F:    drivers/ata/pata_*.c
 -
  LIBATA PATA FARADAY FTIDE010 AND GEMINI SATA BRIDGE DRIVERS
  M:    Linus Walleij <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git
  F:    drivers/ata/pata_ftide010.c
  F:    drivers/ata/sata_gemini.c
  F:    drivers/ata/sata_gemini.h
  
  LIBATA SATA AHCI PLATFORM devices support
  M:    Hans de Goede <[email protected]>
 -M:    Jens Axboe <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git
  F:    drivers/ata/ahci_platform.c
  F:    drivers/ata/libahci_platform.c
  F:    include/linux/ahci_platform.h
  
 -LIBATA SATA AHCI SYNOPSYS DWC CONTROLLER DRIVER
 -M:    Serge Semin <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata.git
 -F:    Documentation/devicetree/bindings/ata/baikal,bt1-ahci.yaml
 -F:    Documentation/devicetree/bindings/ata/snps,dwc-ahci.yaml
 -F:    drivers/ata/ahci_dwc.c
 -
  LIBATA SATA PROMISE TX2/TX4 CONTROLLER DRIVER
  M:    Mikael Pettersson <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git
  F:    drivers/ata/sata_promise.*
  
  LIBATA SUBSYSTEM (Serial and Parallel ATA drivers)
@@@ -13140,7 -13102,7 +13140,7 @@@ M:   Michael Ellerman <[email protected]
  R:    Nicholas Piggin <[email protected]>
  R:    Christophe Leroy <[email protected]>
  R:    Naveen N Rao <[email protected]>
 -R:    Madhavan Srinivasan <[email protected]>
 +M:    Madhavan Srinivasan <[email protected]>
  L:    [email protected]
  S:    Supported
  W:    https://github.com/linuxppc/wiki/wiki
@@@ -13639,10 -13601,10 +13639,10 @@@ Q:        http://patchwork.linuxtv.org/project
  F:    drivers/media/dvb-frontends/m88rs2000*
  
  MA901 MASTERKIT USB FM RADIO DRIVER
 -M:    Alexey Klimov <[email protected]>
 +M:    Alexey Klimov <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    drivers/media/radio/radio-ma901.c
  
  MAC80211
@@@ -13885,12 -13847,6 +13885,12 @@@ S: Supporte
  F:    Documentation/networking/device_drivers/ethernet/marvell/octeontx2.rst
  F:    drivers/net/ethernet/marvell/octeontx2/af/
  
 +MARVELL PEM PMU DRIVER
 +M:    Linu Cherian <[email protected]>
 +M:    Gowthami Thiagarajan <[email protected]>
 +S:    Supported
 +F:    drivers/perf/marvell_pem_pmu.c
 +
  MARVELL PRESTERA ETHERNET SWITCH DRIVER
  M:    Taras Chornyi <[email protected]>
  S:    Supported
@@@ -13943,7 -13899,7 +13943,7 @@@ MAX2175 SDR TUNER DRIVE
  M:    Ramesh Shanmugasundaram <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    Documentation/devicetree/bindings/media/i2c/max2175.txt
  F:    Documentation/userspace-api/media/drivers/max2175.rst
  F:    drivers/media/i2c/max2175*
@@@ -13996,7 -13952,7 +13996,7 @@@ F:   drivers/media/i2c/max96717.
  
  MAX9860 MONO AUDIO VOICE CODEC DRIVER
  M:    Peter Rosin <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/sound/max9860.txt
  F:    sound/soc/codecs/max9860.*
@@@ -14123,7 -14079,7 +14123,7 @@@ M:   Hans Verkuil <[email protected]
  L:    [email protected]
  S:    Maintained
  W:    https://linuxtv.org
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    drivers/media/radio/radio-maxiradio*
  
  MAXLINEAR ETHERNET PHY DRIVER
@@@ -14206,7 -14162,7 +14206,7 @@@ M:   Laurent Pinchart <laurent.pinchart@i
  L:    [email protected]
  S:    Supported
  W:    https://www.linuxtv.org
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    drivers/media/mc/
  F:    include/media/media-*.h
  F:    include/uapi/linux/media.h
@@@ -14215,16 -14171,17 +14215,16 @@@ MEDIA DRIVER FOR FREESCALE IMX PX
  M:    Philipp Zabel <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    drivers/media/platform/nxp/imx-pxp.[ch]
  
  MEDIA DRIVERS FOR ASCOT2E
 -M:    Sergey Kozlov <[email protected]>
 -M:    Abylay Ospan <[email protected]>
 +M:    Abylay Ospan <[email protected]>
  L:    [email protected]
  S:    Supported
  W:    https://linuxtv.org
  W:    http://netup.tv/
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    drivers/media/dvb-frontends/ascot2e*
  
  MEDIA DRIVERS FOR CXD2099AR CI CONTROLLERS
@@@ -14232,16 -14189,17 +14232,16 @@@ M:        Jasmin Jessich <[email protected]
  L:    [email protected]
  S:    Maintained
  W:    https://linuxtv.org
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    drivers/media/dvb-frontends/cxd2099*
  
  MEDIA DRIVERS FOR CXD2841ER
 -M:    Sergey Kozlov <[email protected]>
 -M:    Abylay Ospan <[email protected]>
 +M:    Abylay Ospan <[email protected]>
  L:    [email protected]
  S:    Supported
  W:    https://linuxtv.org
  W:    http://netup.tv/
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    drivers/media/dvb-frontends/cxd2841er*
  
  MEDIA DRIVERS FOR CXD2880
@@@ -14249,7 -14207,7 +14249,7 @@@ M:   Yasunari Takiguchi <Yasunari.Takiguc
  L:    [email protected]
  S:    Supported
  W:    http://linuxtv.org/
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    drivers/media/dvb-frontends/cxd2880/*
  F:    drivers/media/spi/cxd2880*
  
@@@ -14257,7 -14215,7 +14257,7 @@@ MEDIA DRIVERS FOR DIGITAL DEVICES PCIE 
  L:    [email protected]
  S:    Orphan
  W:    https://linuxtv.org
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    drivers/media/pci/ddbridge/*
  
  MEDIA DRIVERS FOR FREESCALE IMX
@@@ -14265,7 -14223,7 +14265,7 @@@ M:   Steve Longerbeam <slongerbeam@gmail.
  M:    Philipp Zabel <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    Documentation/admin-guide/media/imx.rst
  F:    Documentation/devicetree/bindings/media/imx.txt
  F:    drivers/staging/media/imx/
@@@ -14279,7 -14237,7 +14279,7 @@@ M:   Martin Kepplinger <martin.kepplinger
  R:    Purism Kernel Team <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    Documentation/admin-guide/media/imx7.rst
  F:    Documentation/devicetree/bindings/media/nxp,imx-mipi-csi2.yaml
  F:    Documentation/devicetree/bindings/media/nxp,imx7-csi.yaml
@@@ -14289,46 -14247,49 +14289,46 @@@ F:        drivers/media/platform/nxp/imx7-medi
  F:    drivers/media/platform/nxp/imx8mq-mipi-csi2.c
  
  MEDIA DRIVERS FOR HELENE
 -M:    Abylay Ospan <aospan@netup.ru>
 +M:    Abylay Ospan <aospan@amazon.com>
  L:    [email protected]
  S:    Supported
  W:    https://linuxtv.org
  W:    http://netup.tv/
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    drivers/media/dvb-frontends/helene*
  
  MEDIA DRIVERS FOR HORUS3A
 -M:    Sergey Kozlov <[email protected]>
 -M:    Abylay Ospan <[email protected]>
 +M:    Abylay Ospan <[email protected]>
  L:    [email protected]
  S:    Supported
  W:    https://linuxtv.org
  W:    http://netup.tv/
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    drivers/media/dvb-frontends/horus3a*
  
  MEDIA DRIVERS FOR LNBH25
 -M:    Sergey Kozlov <[email protected]>
 -M:    Abylay Ospan <[email protected]>
 +M:    Abylay Ospan <[email protected]>
  L:    [email protected]
  S:    Supported
  W:    https://linuxtv.org
  W:    http://netup.tv/
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    drivers/media/dvb-frontends/lnbh25*
  
  MEDIA DRIVERS FOR MXL5XX TUNER DEMODULATORS
  L:    [email protected]
  S:    Orphan
  W:    https://linuxtv.org
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    drivers/media/dvb-frontends/mxl5xx*
  
  MEDIA DRIVERS FOR NETUP PCI UNIVERSAL DVB devices
 -M:    Sergey Kozlov <[email protected]>
 -M:    Abylay Ospan <[email protected]>
 +M:    Abylay Ospan <[email protected]>
  L:    [email protected]
  S:    Supported
  W:    https://linuxtv.org
  W:    http://netup.tv/
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    drivers/media/pci/netup_unidvb/*
  
  MEDIA DRIVERS FOR NVIDIA TEGRA - VDE
@@@ -14336,7 -14297,7 +14336,7 @@@ M:   Dmitry Osipenko <[email protected]
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    Documentation/devicetree/bindings/media/nvidia,tegra-vde.yaml
  F:    drivers/media/platform/nvidia/tegra-vde/
  
@@@ -14345,7 -14306,7 +14345,7 @@@ M:   Jacopo Mondi <[email protected]
  L:    [email protected]
  L:    [email protected]
  S:    Supported
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    Documentation/devicetree/bindings/media/renesas,ceu.yaml
  F:    drivers/media/platform/renesas/renesas-ceu.c
  F:    include/media/drv-intf/renesas-ceu.h
@@@ -14355,7 -14316,7 +14355,7 @@@ M:   Fabrizio Castro <fabrizio.castro.jz@
  L:    [email protected]
  L:    [email protected]
  S:    Supported
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    Documentation/devicetree/bindings/media/renesas,drif.yaml
  F:    drivers/media/platform/renesas/rcar_drif.c
  
@@@ -14364,7 -14325,7 +14364,7 @@@ M:   Laurent Pinchart <laurent.pinchart@i
  L:    [email protected]
  L:    [email protected]
  S:    Supported
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    Documentation/devicetree/bindings/media/renesas,fcp.yaml
  F:    drivers/media/platform/renesas/rcar-fcp.c
  F:    include/media/rcar-fcp.h
@@@ -14374,7 -14335,7 +14374,7 @@@ M:   Kieran Bingham <kieran.bingham+renes
  L:    [email protected]
  L:    [email protected]
  S:    Supported
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    Documentation/devicetree/bindings/media/renesas,fdp1.yaml
  F:    drivers/media/platform/renesas/rcar_fdp1.c
  
@@@ -14383,7 -14344,7 +14383,7 @@@ M:   Niklas Söderlund <niklas.soderlund@
  L:    [email protected]
  L:    [email protected]
  S:    Supported
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    Documentation/devicetree/bindings/media/renesas,csi2.yaml
  F:    Documentation/devicetree/bindings/media/renesas,isp.yaml
  F:    Documentation/devicetree/bindings/media/renesas,vin.yaml
@@@ -14397,7 -14358,7 +14397,7 @@@ M:   Kieran Bingham <kieran.bingham+renes
  L:    [email protected]
  L:    [email protected]
  S:    Supported
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    Documentation/devicetree/bindings/media/renesas,vsp1.yaml
  F:    drivers/media/platform/renesas/vsp1/
  
@@@ -14405,14 -14366,14 +14405,14 @@@ MEDIA DRIVERS FOR ST STV0910 DEMODULATO
  L:    [email protected]
  S:    Orphan
  W:    https://linuxtv.org
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    drivers/media/dvb-frontends/stv0910*
  
  MEDIA DRIVERS FOR ST STV6111 TUNER ICs
  L:    [email protected]
  S:    Orphan
  W:    https://linuxtv.org
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    drivers/media/dvb-frontends/stv6111*
  
  MEDIA DRIVERS FOR STM32 - DCMI / DCMIPP
@@@ -14420,7 -14381,7 +14420,7 @@@ M:   Hugues Fruchet <hugues.fruchet@foss.
  M:    Alain Volmat <[email protected]>
  L:    [email protected]
  S:    Supported
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    Documentation/devicetree/bindings/media/st,stm32-dcmi.yaml
  F:    Documentation/devicetree/bindings/media/st,stm32-dcmipp.yaml
  F:    drivers/media/platform/st/stm32/stm32-dcmi.c
@@@ -14432,7 -14393,7 +14432,7 @@@ L:   [email protected]
  S:    Maintained
  W:    https://linuxtv.org
  Q:    http://patchwork.kernel.org/project/linux-media/list/
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    Documentation/admin-guide/media/
  F:    Documentation/devicetree/bindings/media/
  F:    Documentation/driver-api/media/
@@@ -14459,12 -14420,10 +14459,12 @@@ F:        Documentation/devicetree/bindings/ne
  F:    drivers/bluetooth/btmtkuart.c
  
  MEDIATEK BOARD LEVEL SHUTDOWN DRIVERS
 +M:    Sen Chu <[email protected]>
  M:    Sean Wang <[email protected]>
 +M:    Macpaul Lin <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/devicetree/bindings/power/reset/mt6323-poweroff.txt
 +F:    Documentation/devicetree/bindings/mfd/mediatek,mt6397.yaml
  F:    drivers/power/reset/mt6323-poweroff.c
  
  MEDIATEK CIR DRIVER
@@@ -14504,10 -14463,8 +14504,10 @@@ M: Qingfang Deng <[email protected]
  M:    SkyLake Huang <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/net/phy/mediatek-ge-soc.c
 -F:    drivers/net/phy/mediatek-ge.c
 +F:    drivers/net/phy/mediatek/mtk-ge-soc.c
 +F:    drivers/net/phy/mediatek/mtk-phy-lib.c
 +F:    drivers/net/phy/mediatek/mtk-ge.c
 +F:    drivers/net/phy/mediatek/mtk.h
  F:    drivers/phy/mediatek/phy-mtk-xfi-tphy.c
  
  MEDIATEK I2C CONTROLLER DRIVER
@@@ -14571,32 -14528,6 +14571,32 @@@ S: Maintaine
  F:    Documentation/devicetree/bindings/mmc/mtk-sd.yaml
  F:    drivers/mmc/host/mtk-sd.c
  
 +MEDIATEK MT6735 CLOCK & RESET DRIVERS
 +M:    Yassine Oudjana <[email protected]>
 +L:    [email protected]
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +F:    drivers/clk/mediatek/clk-mt6735-apmixedsys.c
 +F:    drivers/clk/mediatek/clk-mt6735-imgsys.c
 +F:    drivers/clk/mediatek/clk-mt6735-infracfg.c
 +F:    drivers/clk/mediatek/clk-mt6735-mfgcfg.c
 +F:    drivers/clk/mediatek/clk-mt6735-pericfg.c
 +F:    drivers/clk/mediatek/clk-mt6735-topckgen.c
 +F:    drivers/clk/mediatek/clk-mt6735-vdecsys.c
 +F:    drivers/clk/mediatek/clk-mt6735-vencsys.c
 +F:    include/dt-bindings/clock/mediatek,mt6735-apmixedsys.h
 +F:    include/dt-bindings/clock/mediatek,mt6735-imgsys.h
 +F:    include/dt-bindings/clock/mediatek,mt6735-infracfg.h
 +F:    include/dt-bindings/clock/mediatek,mt6735-mfgcfg.h
 +F:    include/dt-bindings/clock/mediatek,mt6735-pericfg.h
 +F:    include/dt-bindings/clock/mediatek,mt6735-topckgen.h
 +F:    include/dt-bindings/clock/mediatek,mt6735-vdecsys.h
 +F:    include/dt-bindings/clock/mediatek,mt6735-vencsys.h
 +F:    include/dt-bindings/reset/mediatek,mt6735-infracfg.h
 +F:    include/dt-bindings/reset/mediatek,mt6735-mfgcfg.h
 +F:    include/dt-bindings/reset/mediatek,mt6735-pericfg.h
 +F:    include/dt-bindings/reset/mediatek,mt6735-vdecsys.h
 +
  MEDIATEK MT76 WIRELESS LAN DRIVER
  M:    Felix Fietkau <[email protected]>
  M:    Lorenzo Bianconi <[email protected]>
@@@ -14653,11 -14584,9 +14653,11 @@@ F: Documentation/devicetree/bindings/mt
  F:    drivers/mtd/nand/raw/mtk_*
  
  MEDIATEK PMIC LED DRIVER
 +M:    Sen Chu <[email protected]>
  M:    Sean Wang <[email protected]>
 +M:    Macpaul Lin <[email protected]>
  S:    Maintained
 -F:    Documentation/devicetree/bindings/leds/leds-mt6323.txt
 +F:    Documentation/devicetree/bindings/mfd/mediatek,mt6397.yaml
  F:    drivers/leds/leds-mt6323.c
  
  MEDIATEK RANDOM NUMBER GENERATOR SUPPORT
@@@ -14957,8 -14886,6 +14957,8 @@@ S:   Maintaine
  W:    http://www.linux-mm.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
  T:    quilt git://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new
 +F:    Documentation/admin-guide/mm/
 +F:    Documentation/mm/
  F:    include/linux/gfp.h
  F:    include/linux/gfp_types.h
  F:    include/linux/memfd.h
@@@ -14982,10 -14909,9 +14982,10 @@@ N: include/linux/page[-_]
  
  MEMORY MAPPING
  M:    Andrew Morton <[email protected]>
 -R:    Liam R. Howlett <[email protected]>
 +M:    Liam R. Howlett <[email protected]>
 +M:    Lorenzo Stoakes <[email protected]>
  R:    Vlastimil Babka <[email protected]>
 -R:    Lorenzo Stoakes <lorenzo.stoakes@oracle.com>
 +R:    Jann Horn <jannh@google.com>
  L:    [email protected]
  S:    Maintained
  W:    http://www.linux-mm.org
@@@ -15008,6 -14934,13 +15008,6 @@@ F:  drivers/mtd
  F:    include/linux/mtd/
  F:    include/uapi/mtd/
  
 -MEMSENSING MICROSYSTEMS MSA311 DRIVER
 -M:    Dmitry Rokosov <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    Documentation/devicetree/bindings/iio/accel/memsensing,msa311.yaml
 -F:    drivers/iio/accel/msa311.c
 -
  MEN A21 WATCHDOG DRIVER
  M:    Johannes Thumshirn <[email protected]>
  L:    [email protected]
@@@ -15042,7 -14975,7 +15042,7 @@@ L:   [email protected]
  L:    [email protected]
  S:    Supported
  W:    http://linux-meson.com/
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    Documentation/devicetree/bindings/media/cec/amlogic,meson-gx-ao-cec.yaml
  F:    drivers/media/cec/platform/meson/ao-cec-g12a.c
  F:    drivers/media/cec/platform/meson/ao-cec.c
@@@ -15052,7 -14985,7 +15052,7 @@@ M:   Neil Armstrong <neil.armstrong@linar
  L:    [email protected]
  L:    [email protected]
  S:    Supported
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    Documentation/devicetree/bindings/media/amlogic,axg-ge2d.yaml
  F:    drivers/media/platform/amlogic/meson-ge2d/
  
@@@ -15068,7 -15001,7 +15068,7 @@@ M:   Neil Armstrong <neil.armstrong@linar
  L:    [email protected]
  L:    [email protected]
  S:    Supported
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    Documentation/devicetree/bindings/media/amlogic,gx-vdec.yaml
  F:    drivers/staging/media/meson/vdec/
  
@@@ -15152,8 -15085,7 +15152,8 @@@ F:   drivers/spi/spi-at91-usart.
  
  MICROCHIP AUDIO ASOC DRIVERS
  M:    Claudiu Beznea <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 +M:    Andrei Simion <[email protected]>
 +L:    [email protected]
  S:    Supported
  F:    Documentation/devicetree/bindings/sound/atmel*
  F:    Documentation/devicetree/bindings/sound/axentia,tse850-pcm5142.txt
@@@ -15252,19 -15184,6 +15252,19 @@@ S: Maintaine
  F:    Documentation/devicetree/bindings/interrupt-controller/microchip,lan966x-oic.yaml
  F:    drivers/irqchip/irq-lan966x-oic.c
  
 +MICROCHIP LAN966X PCI DRIVER
 +M:    Herve Codina <[email protected]>
 +S:    Maintained
 +F:    drivers/misc/lan966x_pci.c
 +F:    drivers/misc/lan966x_pci.dtso
 +
 +MICROCHIP LAN969X ETHERNET DRIVER
 +M:    Daniel Machon <[email protected]>
 +M:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/net/ethernet/microchip/lan969x/*
 +
  MICROCHIP LCDFB DRIVER
  M:    Nicolas Ferre <[email protected]>
  L:    [email protected]
@@@ -15274,7 -15193,6 +15274,7 @@@ F:   include/video/atmel_lcdc.
  
  MICROCHIP MCP16502 PMIC DRIVER
  M:    Claudiu Beznea <[email protected]>
 +M:    Andrei Simion <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
  F:    Documentation/devicetree/bindings/regulator/microchip,mcp16502.yaml
@@@ -15356,6 -15274,7 +15356,6 @@@ F:   drivers/tty/serial/8250/8250_pci1xxx
  
  MICROCHIP POLARFIRE FPGA DRIVERS
  M:    Conor Dooley <[email protected]>
 -R:    Vladimir Georgiev <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    Documentation/devicetree/bindings/fpga/microchip,mpf-spi-fpga-mgr.yaml
@@@ -15405,7 -15324,6 +15405,7 @@@ F:   drivers/spi/spi-atmel.
  
  MICROCHIP SSC DRIVER
  M:    Claudiu Beznea <[email protected]>
 +M:    Andrei Simion <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
  F:    Documentation/devicetree/bindings/misc/atmel-ssc.txt
@@@ -15585,15 -15503,6 +15585,15 @@@ F: arch/arm/boot/dts/marvell/armada-xp-
  F:    arch/arm/boot/dts/marvell/armada-xp-crs328-4c-20s-4s-bit.dts
  F:    arch/arm/boot/dts/marvell/armada-xp-crs328-4c-20s-4s.dts
  
 +MIN HEAP
 +M:    Kuan-Wei Chiu <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/core-api/min_heap.rst
 +F:    include/linux/min_heap.h
 +F:    lib/min_heap.c
 +F:    lib/test_min_heap.c
 +
  MIPI CCS, SMIA AND SMIA++ IMAGE SENSOR DRIVER
  M:    Sakari Ailus <[email protected]>
  L:    [email protected]
@@@ -15611,6 -15520,7 +15611,6 @@@ MIP
  M:    Thomas Bogendoerfer <[email protected]>
  L:    [email protected]
  S:    Maintained
 -W:    http://www.linux-mips.org/
  Q:    https://patchwork.kernel.org/project/linux-mips/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git
  F:    Documentation/devicetree/bindings/mips/
@@@ -15619,6 -15529,17 +15619,6 @@@ F:  arch/mips
  F:    drivers/platform/mips/
  F:    include/dt-bindings/mips/
  
 -MIPS BAIKAL-T1 PLATFORM
 -M:    Serge Semin <[email protected]>
 -L:    [email protected]
 -S:    Supported
 -F:    Documentation/devicetree/bindings/bus/baikal,bt1-*.yaml
 -F:    Documentation/devicetree/bindings/clock/baikal,bt1-*.yaml
 -F:    drivers/bus/bt1-*.c
 -F:    drivers/clk/baikal-t1/
 -F:    drivers/memory/bt1-l2-ctl.c
 -F:    drivers/mtd/maps/physmap-bt1-rom.[ch]
 -
  MIPS BOSTON DEVELOPMENT BOARD
  M:    Paul Burton <[email protected]>
  L:    [email protected]
@@@ -15631,6 -15552,7 +15631,6 @@@ F:   include/dt-bindings/clock/boston-clo
  
  MIPS CORE DRIVERS
  M:    Thomas Bogendoerfer <[email protected]>
 -M:    Serge Semin <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    drivers/bus/mips_cdmm.c
@@@ -15687,7 -15609,7 +15687,7 @@@ M:   Hans Verkuil <[email protected]
  L:    [email protected]
  S:    Odd Fixes
  W:    https://linuxtv.org
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    drivers/media/radio/radio-miropcm20*
  
  MITSUMI MM8013 FG DRIVER
@@@ -15836,10 -15758,10 +15836,10 @@@ F:        Documentation/hwmon/mp9941.rs
  F:    drivers/hwmon/pmbus/mp9941.c
  
  MR800 AVERMEDIA USB FM RADIO DRIVER
 -M:    Alexey Klimov <[email protected]>
 +M:    Alexey Klimov <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    drivers/media/radio/radio-mr800.c
  
  MRF24J40 IEEE 802.15.4 RADIO DRIVER
@@@ -15906,7 -15828,7 +15906,7 @@@ MT9M114 ONSEMI SENSOR DRIVE
  M:    Laurent Pinchart <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    Documentation/devicetree/bindings/media/i2c/onnn,mt9m114.yaml
  F:    drivers/media/i2c/mt9m114.c
  
@@@ -15914,15 -15836,16 +15914,15 @@@ MT9P031 APTINA CAMERA SENSO
  M:    Laurent Pinchart <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    Documentation/devicetree/bindings/media/i2c/aptina,mt9p031.yaml
  F:    drivers/media/i2c/mt9p031.c
 -F:    include/media/i2c/mt9p031.h
  
  MT9T112 APTINA CAMERA SENSOR
  M:    Jacopo Mondi <[email protected]>
  L:    [email protected]
  S:    Odd Fixes
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    drivers/media/i2c/mt9t112.c
  F:    include/media/i2c/mt9t112.h
  
@@@ -15930,7 -15853,7 +15930,7 @@@ MT9V032 APTINA CAMERA SENSO
  M:    Laurent Pinchart <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    Documentation/devicetree/bindings/media/i2c/mt9v032.txt
  F:    drivers/media/i2c/mt9v032.c
  F:    include/media/i2c/mt9v032.h
@@@ -15939,7 -15862,7 +15939,7 @@@ MT9V111 APTINA CAMERA SENSO
  M:    Jacopo Mondi <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    Documentation/devicetree/bindings/media/i2c/aptina,mt9v111.yaml
  F:    drivers/media/i2c/mt9v111.c
  
@@@ -16034,7 -15957,7 +16034,7 @@@ F:   include/linux/mtd/*nand*.
  
  NATIVE INSTRUMENTS USB SOUND INTERFACE DRIVER
  M:    Daniel Mack <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
  S:    Maintained
  W:    http://www.native-instruments.com
  F:    sound/usb/caiaq/
@@@ -16071,14 -15994,6 +16071,14 @@@ S: Maintaine
  F:    Documentation/devicetree/bindings/hwmon/nuvoton,nct6775.yaml
  F:    drivers/hwmon/nct6775-i2c.c
  
 +NCT7363 HARDWARE MONITOR DRIVER
 +M:    Ban Feng <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/hwmon/nuvoton,nct7363.yaml
 +F:    Documentation/hwmon/nct7363.rst
 +F:    drivers/hwmon/nct7363.c
 +
  NETCONSOLE
  M:    Breno Leitao <[email protected]>
  S:    Maintained
@@@ -16130,8 -16045,9 +16130,8 @@@ F:   net/netfilter
  F:    tools/testing/selftests/net/netfilter/
  
  NETROM NETWORK LAYER
 -M:    Ralf Baechle <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  W:    https://linux-ax25.in-berlin.de
  F:    include/net/netrom.h
  F:    include/uapi/linux/netrom.h
@@@ -16172,7 -16088,6 +16172,7 @@@ F:   include/uapi/linux/net_dropmon.
  F:    net/core/drop_monitor.c
  
  NETWORKING DRIVERS
 +M:    Andrew Lunn <[email protected]>
  M:    "David S. Miller" <[email protected]>
  M:    Eric Dumazet <[email protected]>
  M:    Jakub Kicinski <[email protected]>
@@@ -16201,13 -16116,10 +16201,13 @@@ F:        include/linux/platform_data/wiznet.
  F:    include/uapi/linux/cn_proc.h
  F:    include/uapi/linux/ethtool_netlink.h
  F:    include/uapi/linux/if_*
 +F:    include/uapi/linux/net_shaper.h
  F:    include/uapi/linux/netdev*
  F:    tools/testing/selftests/drivers/net/
  X:    Documentation/devicetree/bindings/net/bluetooth/
 +X:    Documentation/devicetree/bindings/net/can/
  X:    Documentation/devicetree/bindings/net/wireless/
 +X:    drivers/net/can/
  X:    drivers/net/wireless/
  
  NETWORKING DRIVERS (WIRELESS)
@@@ -16223,6 -16135,7 +16223,6 @@@ F:   drivers/net/wireless
  
  NETWORKING [DSA]
  M:    Andrew Lunn <[email protected]>
 -M:    Florian Fainelli <[email protected]>
  M:    Vladimir Oltean <[email protected]>
  S:    Maintained
  F:    Documentation/devicetree/bindings/net/dsa/
@@@ -16240,7 -16153,6 +16240,7 @@@ M:   "David S. Miller" <[email protected]
  M:    Eric Dumazet <[email protected]>
  M:    Jakub Kicinski <[email protected]>
  M:    Paolo Abeni <[email protected]>
 +R:    Simon Horman <[email protected]>
  L:    [email protected]
  S:    Maintained
  P:    Documentation/process/maintainer-netdev.rst
@@@ -16283,23 -16195,10 +16283,23 @@@ F:        include/uapi/linux/rtnetlink.
  F:    lib/net_utils.c
  F:    lib/random32.c
  F:    net/
 +F:    samples/pktgen/
  F:    tools/net/
  F:    tools/testing/selftests/net/
 +X:    Documentation/networking/mac80211-injection.rst
 +X:    Documentation/networking/mac80211_hwsim/
 +X:    Documentation/networking/regulatory.rst
 +X:    include/net/cfg80211.h
 +X:    include/net/ieee80211_radiotap.h
 +X:    include/net/iw_handler.h
 +X:    include/net/mac80211.h
 +X:    include/net/wext.h
  X:    net/9p/
  X:    net/bluetooth/
 +X:    net/can/
 +X:    net/mac80211/
 +X:    net/rfkill/
 +X:    net/wireless/
  
  NETWORKING [IPSEC]
  M:    Steffen Klassert <[email protected]>
@@@ -16385,7 -16284,7 +16385,7 @@@ F:   include/net/mptcp.
  F:    include/trace/events/mptcp.h
  F:    include/uapi/linux/mptcp*.h
  F:    net/mptcp/
 -F:    tools/testing/selftests/bpf/*/*mptcp*.c
 +F:    tools/testing/selftests/bpf/*/*mptcp*.[ch]
  F:    tools/testing/selftests/net/mptcp/
  
  NETWORKING [TCP]
@@@ -16579,7 -16478,6 +16579,7 @@@ NOVATEK NVT-TS I2C TOUCHSCREEN DRIVE
  M:    Hans de Goede <[email protected]>
  L:    [email protected]
  S:    Maintained
 +F:    Documentation/devicetree/bindings/input/touchscreen/novatek,nvt-ts.yaml
  F:    drivers/input/touchscreen/novatek-nvt-ts.c
  
  NSDEPS
@@@ -16610,6 -16508,12 +16610,6 @@@ F:  include/linux/ntb.
  F:    include/linux/ntb_transport.h
  F:    tools/testing/selftests/ntb/
  
 -NTB IDT DRIVER
 -M:    Serge Semin <[email protected]>
 -L:    [email protected]
 -S:    Supported
 -F:    drivers/ntb/hw/idt/
 -
  NTB INTEL DRIVER
  M:    Dave Jiang <[email protected]>
  L:    [email protected]
@@@ -16824,7 -16728,7 +16824,7 @@@ F:   drivers/extcon/extcon-ptn5150.
  
  NXP SGTL5000 DRIVER
  M:    Fabio Estevam <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/sound/fsl,sgtl5000.yaml
  F:    sound/soc/codecs/sgtl5000*
@@@ -16848,7 -16752,7 +16848,7 @@@ K:   "nxp,tda998x
  
  NXP TFA9879 DRIVER
  M:    Peter Rosin <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/sound/nxp,tfa9879.yaml
  F:    sound/soc/codecs/tfa9879*
@@@ -16860,7 -16764,7 +16860,7 @@@ F:   drivers/nfc/nxp-nc
  
  NXP/Goodix TFA989X (TFA1) DRIVER
  M:    Stephan Gerhold <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/sound/nxp,tfa989x.yaml
  F:    sound/soc/codecs/tfa989x.c
@@@ -16880,6 -16784,13 +16880,6 @@@ S:  Maintaine
  F:    Documentation/hwmon/nzxt-kraken3.rst
  F:    drivers/hwmon/nzxt-kraken3.c
  
 -NZXT-SMART2 HARDWARE MONITORING DRIVER
 -M:    Aleksandr Mezin <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    Documentation/hwmon/nzxt-smart2.rst
 -F:    drivers/hwmon/nzxt-smart2.c
 -
  OBJAGG
  M:    Jiri Pirko <[email protected]>
  L:    [email protected]
@@@ -16939,7 -16850,7 +16939,7 @@@ F:   include/uapi/misc/ocxl.
  OMAP AUDIO SUPPORT
  M:    Peter Ujfalusi <[email protected]>
  M:    Jarkko Nikula <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
  L:    [email protected]
  S:    Maintained
  F:    sound/soc/ti/n810.c
@@@ -17021,6 -16932,14 +17021,6 @@@ S:  Maintaine
  F:    Documentation/devicetree/bindings/i2c/ti,omap4-i2c.yaml
  F:    drivers/i2c/busses/i2c-omap.c
  
 -OMAP IMAGING SUBSYSTEM (OMAP3 ISP and OMAP4 ISS)
 -M:    Laurent Pinchart <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    Documentation/devicetree/bindings/media/ti,omap3isp.txt
 -F:    drivers/media/platform/ti/omap3isp/
 -F:    drivers/staging/media/omap4iss/
 -
  OMAP MMC SUPPORT
  M:    Aaro Koskinen <[email protected]>
  L:    [email protected]
@@@ -17131,13 -17050,13 +17131,13 @@@ OMNIVISION OV01A10 SENSOR DRIVE
  M:    Bingbu Cao <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    drivers/media/i2c/ov01a10.c
  
  OMNIVISION OV02A10 SENSOR DRIVER
  L:    [email protected]
  S:    Orphan
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    Documentation/devicetree/bindings/media/i2c/ovti,ov02a10.yaml
  F:    drivers/media/i2c/ov02a10.c
  
@@@ -17145,29 -17064,28 +17145,29 @@@ OMNIVISION OV08D10 SENSOR DRIVE
  M:    Jimmy Su <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    drivers/media/i2c/ov08d10.c
  
  OMNIVISION OV08X40 SENSOR DRIVER
  M:    Jason Chen <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    drivers/media/i2c/ov08x40.c
 +F:    Documentation/devicetree/bindings/media/i2c/ovti,ov08x40.yaml
  
  OMNIVISION OV13858 SENSOR DRIVER
  M:    Sakari Ailus <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    drivers/media/i2c/ov13858.c
  
  OMNIVISION OV13B10 SENSOR DRIVER
  M:    Arec Kao <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    drivers/media/i2c/ov13b10.c
  
  OMNIVISION OV2680 SENSOR DRIVER
@@@ -17175,7 -17093,7 +17175,7 @@@ M:   Rui Miguel Silva <[email protected]
  M:    Hans de Goede <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    Documentation/devicetree/bindings/media/i2c/ovti,ov2680.yaml
  F:    drivers/media/i2c/ov2680.c
  
@@@ -17183,7 -17101,7 +17183,7 @@@ OMNIVISION OV2685 SENSOR DRIVE
  M:    Shunqian Zheng <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    Documentation/devicetree/bindings/media/i2c/ovti,ov2685.yaml
  F:    drivers/media/i2c/ov2685.c
  
@@@ -17193,14 -17111,14 +17193,14 @@@ R:        Sakari Ailus <[email protected]
  R:    Bingbu Cao <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    drivers/media/i2c/ov2740.c
  
  OMNIVISION OV4689 SENSOR DRIVER
  M:    Mikhail Rudenko <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    Documentation/devicetree/bindings/media/i2c/ovti,ov4689.yaml
  F:    drivers/media/i2c/ov4689.c
  
@@@ -17208,7 -17126,7 +17208,7 @@@ OMNIVISION OV5640 SENSOR DRIVE
  M:    Steve Longerbeam <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    drivers/media/i2c/ov5640.c
  
  OMNIVISION OV5647 SENSOR DRIVER
@@@ -17216,7 -17134,7 +17216,7 @@@ M:   Dave Stevenson <dave.stevenson@raspb
  M:    Jacopo Mondi <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    Documentation/devicetree/bindings/media/i2c/ovti,ov5647.yaml
  F:    drivers/media/i2c/ov5647.c
  
@@@ -17224,7 -17142,7 +17224,7 @@@ OMNIVISION OV5670 SENSOR DRIVE
  M:    Sakari Ailus <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    Documentation/devicetree/bindings/media/i2c/ovti,ov5670.yaml
  F:    drivers/media/i2c/ov5670.c
  
@@@ -17232,7 -17150,7 +17232,7 @@@ OMNIVISION OV5675 SENSOR DRIVE
  M:    Sakari Ailus <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    Documentation/devicetree/bindings/media/i2c/ovti,ov5675.yaml
  F:    drivers/media/i2c/ov5675.c
  
@@@ -17240,7 -17158,7 +17240,7 @@@ OMNIVISION OV5693 SENSOR DRIVE
  M:    Daniel Scally <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    Documentation/devicetree/bindings/media/i2c/ovti,ov5693.yaml
  F:    drivers/media/i2c/ov5693.c
  
@@@ -17248,21 -17166,21 +17248,21 @@@ OMNIVISION OV5695 SENSOR DRIVE
  M:    Shunqian Zheng <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    drivers/media/i2c/ov5695.c
  
  OMNIVISION OV64A40 SENSOR DRIVER
  M:    Jacopo Mondi <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    Documentation/devicetree/bindings/media/i2c/ovti,ov64a40.yaml
  F:    drivers/media/i2c/ov64a40.c
  
  OMNIVISION OV7670 SENSOR DRIVER
  L:    [email protected]
  S:    Orphan
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    Documentation/devicetree/bindings/media/i2c/ov7670.txt
  F:    drivers/media/i2c/ov7670.c
  
@@@ -17270,7 -17188,7 +17270,7 @@@ OMNIVISION OV772x SENSOR DRIVE
  M:    Jacopo Mondi <[email protected]>
  L:    [email protected]
  S:    Odd fixes
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    Documentation/devicetree/bindings/media/i2c/ovti,ov772x.yaml
  F:    drivers/media/i2c/ov772x.c
  F:    include/media/i2c/ov772x.h
@@@ -17278,7 -17196,7 +17278,7 @@@
  OMNIVISION OV7740 SENSOR DRIVER
  L:    [email protected]
  S:    Orphan
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    Documentation/devicetree/bindings/media/i2c/ov7740.txt
  F:    drivers/media/i2c/ov7740.c
  
@@@ -17286,7 -17204,7 +17286,7 @@@ OMNIVISION OV8856 SENSOR DRIVE
  M:    Sakari Ailus <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    Documentation/devicetree/bindings/media/i2c/ovti,ov8856.yaml
  F:    drivers/media/i2c/ov8856.c
  
@@@ -17295,7 -17213,7 +17295,7 @@@ M:   Jacopo Mondi <jacopo.mondi@ideasonbo
  M:    Nicholas Roth <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    Documentation/devicetree/bindings/media/i2c/ovti,ov8858.yaml
  F:    drivers/media/i2c/ov8858.c
  
@@@ -17303,7 -17221,7 +17303,7 @@@ OMNIVISION OV9282 SENSOR DRIVE
  M:    Dave Stevenson <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    Documentation/devicetree/bindings/media/i2c/ovti,ov9282.yaml
  F:    drivers/media/i2c/ov9282.c
  
@@@ -17319,7 -17237,7 +17319,7 @@@ R:   Akinobu Mita <[email protected]
  R:    Sylwester Nawrocki <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    Documentation/devicetree/bindings/media/i2c/ov9650.txt
  F:    drivers/media/i2c/ov9650.c
  
@@@ -17328,7 -17246,7 +17328,7 @@@ M:   Tianshu Qiu <[email protected]
  R:    Bingbu Cao <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    drivers/media/i2c/ov9734.c
  
  ONBOARD USB HUB DRIVER
@@@ -17489,7 -17407,7 +17489,7 @@@ F:   include/linux/pm_opp.
  
  OPL4 DRIVER
  M:    Clemens Ladisch <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git
  F:    sound/drivers/opl4/
@@@ -17553,7 -17471,6 +17553,7 @@@ S:   Supporte
  F:    Documentation/core-api/packing.rst
  F:    include/linux/packing.h
  F:    lib/packing.c
 +F:    lib/packing_test.c
  
  PADATA PARALLEL EXECUTION MECHANISM
  M:    Steffen Klassert <[email protected]>
@@@ -18315,13 -18232,6 +18315,13 @@@ F: drivers/pinctrl
  F:    include/dt-bindings/pinctrl/
  F:    include/linux/pinctrl/
  
 +PIN CONTROLLER - AIROHA
 +M:    Lorenzo Bianconi <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/pinctrl/airoha,en7581-pinctrl.yaml
 +F:    drivers/pinctrl/mediatek/pinctrl-airoha.c
 +
  PIN CONTROLLER - AMD
  M:    Basavaraj Natikar <[email protected]>
  M:    Shyam Sundar S K <[email protected]>
@@@ -18398,7 -18308,6 +18398,7 @@@ PIN CONTROLLER - QUALCOM
  M:    Bjorn Andersson <[email protected]>
  L:    [email protected]
  S:    Maintained
 +C:    irc://irc.oftc.net/linux-msm
  F:    Documentation/devicetree/bindings/pinctrl/qcom,*
  F:    drivers/pinctrl/qcom/
  
@@@ -18625,6 -18534,13 +18625,6 @@@ F:  drivers/pps
  F:    include/linux/pps*.h
  F:    include/uapi/linux/pps.h
  
 -PPTP DRIVER
 -M:    Dmitry Kozlov <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -W:    http://sourceforge.net/projects/accel-pptp
 -F:    drivers/net/ppp/pptp.c
 -
  PRESSURE STALL INFORMATION (PSI)
  M:    Johannes Weiner <[email protected]>
  M:    Suren Baghdasaryan <[email protected]>
@@@ -18660,6 -18576,7 +18660,6 @@@ F:   include/linux/proc_fs.
  F:    tools/testing/selftests/proc/
  
  PROC SYSCTL
 -M:    Luis Chamberlain <[email protected]>
  M:    Kees Cook <[email protected]>
  M:    Joel Granados <[email protected]>
  L:    [email protected]
@@@ -18765,13 -18682,6 +18765,13 @@@ S: Maintaine
  F:    drivers/ptp/ptp_vclock.c
  F:    net/ethtool/phc_vclocks.c
  
 +PTP VMCLOCK SUPPORT
 +M:    David Woodhouse <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/ptp/ptp_vmclock.c
 +F:    include/uapi/linux/vmclock-abi.h
 +
  PTRACE SUPPORT
  M:    Oleg Nesterov <[email protected]>
  S:    Maintained
@@@ -18788,7 -18698,7 +18788,7 @@@ PULSE8-CEC DRIVE
  M:    Hans Verkuil <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    drivers/media/cec/usb/pulse8/
  
  PURELIFI PLFXLC DRIVER
@@@ -18803,7 -18713,7 +18803,7 @@@ L:   [email protected]       (subscribers-only
  L:    [email protected]
  S:    Maintained
  W:    http://www.isely.net/pvrusb2/
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    Documentation/driver-api/media/drivers/pvrusb2*
  F:    drivers/media/usb/pvrusb2/
  
@@@ -18811,7 -18721,7 +18811,7 @@@ PWC WEBCAM DRIVE
  M:    Hans Verkuil <[email protected]>
  L:    [email protected]
  S:    Odd Fixes
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    drivers/media/usb/pwc/*
  F:    include/trace/events/pwc.h
  
@@@ -18880,7 -18790,7 +18880,7 @@@ F:   drivers/crypto/intel/qat
  
  QCOM AUDIO (ASoC) DRIVERS
  M:    Srinivas Kandagatla <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
  L:    [email protected]
  S:    Supported
  F:    Documentation/devicetree/bindings/soc/qcom/qcom,apr*
@@@ -19315,7 -19225,7 +19315,7 @@@ R:   Bryan O'Donoghue <bryan.odonoghue@li
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    Documentation/devicetree/bindings/media/*venus*
  F:    drivers/media/platform/qcom/venus/
  
@@@ -19360,14 -19270,14 +19360,14 @@@ RADIOSHARK RADIO DRIVE
  M:    Hans Verkuil <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    drivers/media/radio/radio-shark.c
  
  RADIOSHARK2 RADIO DRIVER
  M:    Hans Verkuil <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    drivers/media/radio/radio-shark2.c
  F:    drivers/media/radio/radio-tea5777.c
  
@@@ -19391,7 -19301,7 +19391,7 @@@ RAINSHADOW-CEC DRIVE
  M:    Hans Verkuil <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    drivers/media/cec/usb/rainshadow/
  
  RALINK MIPS ARCHITECTURE
@@@ -19470,19 -19380,12 +19470,19 @@@ F:        Documentation/devicetree/bindings/me
  F:    drivers/media/platform/raspberrypi/pisp_be/
  F:    include/uapi/linux/media/raspberrypi/
  
 +RASPBERRY PI PISP CAMERA FRONT END
 +M:    Tomi Valkeinen <[email protected]>
 +M:    Raspberry Pi Kernel Maintenance <[email protected]>
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/media/raspberrypi,rp1-cfe.yaml
 +F:    drivers/media/platform/raspberrypi/rp1-cfe/
 +
  RC-CORE / LIRC FRAMEWORK
  M:    Sean Young <[email protected]>
  L:    [email protected]
  S:    Maintained
  W:    http://linuxtv.org
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    Documentation/driver-api/media/rc-core.rst
  F:    Documentation/userspace-api/media/rc/
  F:    drivers/media/rc/
@@@ -19611,14 -19514,6 +19611,14 @@@ S: Maintaine
  F:    Documentation/tools/rtla/
  F:    tools/tracing/rtla/
  
 +Real-time Linux (PREEMPT_RT)
 +M:    Sebastian Andrzej Siewior <[email protected]>
 +M:    Clark Williams <[email protected]>
 +M:    Steven Rostedt <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +K:    PREEMPT_RT
 +
  REALTEK AUDIO CODECS
  M:    Oder Chiou <[email protected]>
  S:    Maintained
@@@ -19639,12 -19534,6 +19639,12 @@@ S: Maintaine
  F:    Documentation/devicetree/bindings/net/dsa/realtek.yaml
  F:    drivers/net/dsa/realtek/*
  
 +REALTEK SPI-NAND
 +M:    Chris Packham <[email protected]>
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/spi/realtek,rtl9301-snand.yaml
 +F:    drivers/spi/spi-realtek-rtl-snand.c
 +
  REALTEK WIRELESS DRIVER (rtlwifi family)
  M:    Ping-Ke Shih <[email protected]>
  L:    [email protected]
@@@ -19680,6 -19569,11 +19680,6 @@@ F:  Documentation/devicetree/bindings/re
  F:    drivers/base/regmap/
  F:    include/linux/regmap.h
  
 -REISERFS FILE SYSTEM
 -L:    [email protected]
 -S:    Obsolete
 -F:    fs/reiserfs/
 -
  REMOTE PROCESSOR (REMOTEPROC) SUBSYSTEM
  M:    Bjorn Andersson <[email protected]>
  M:    Mathieu Poirier <[email protected]>
@@@ -19730,11 -19624,9 +19730,11 @@@ F: Documentation/devicetree/bindings/i2
  F:    drivers/i2c/busses/i2c-emev2.c
  
  RENESAS ETHERNET AVB DRIVER
 -R:    Sergey Shtylyov <[email protected]>
 +M:    Paul Barker <[email protected]>
 +M:    Niklas Söderlund <[email protected]>
  L:    [email protected]
  L:    [email protected]
 +S:    Supported
  F:    Documentation/devicetree/bindings/net/renesas,etheravb.yaml
  F:    drivers/net/ethernet/renesas/Kconfig
  F:    drivers/net/ethernet/renesas/Makefile
@@@ -19760,22 -19652,11 +19760,22 @@@ F:        drivers/net/ethernet/renesas/rtsn.
  
  RENESAS IDT821034 ASoC CODEC
  M:    Herve Codina <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/sound/renesas,idt821034.yaml
  F:    sound/soc/codecs/idt821034.c
  
 +RENESAS R-CAR & FSI AUDIO (ASoC) DRIVERS
 +M:    Kuninori Morimoto <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Supported
 +F:    Documentation/devicetree/bindings/sound/renesas,rsnd.*
 +F:    Documentation/devicetree/bindings/sound/renesas,fsi.yaml
 +F:    sound/soc/renesas/rcar/
 +F:    sound/soc/renesas/fsi.c
 +F:    include/sound/sh_fsi.h
 +
  RENESAS R-CAR GEN3 & RZ/N1 NAND CONTROLLER DRIVER
  M:    Miquel Raynal <[email protected]>
  L:    [email protected]
@@@ -19801,7 -19682,7 +19801,7 @@@ F:   drivers/i2c/busses/i2c-rcar.
  F:    drivers/i2c/busses/i2c-sh_mobile.c
  
  RENESAS R-CAR SATA DRIVER
 -R:    Sergey Shtylyov <[email protected]>
 +M:    Geert Uytterhoeven <[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Supported
@@@ -19824,15 -19705,6 +19824,15 @@@ S: Supporte
  F:    Documentation/devicetree/bindings/i2c/renesas,riic.yaml
  F:    drivers/i2c/busses/i2c-riic.c
  
 +RENESAS RZ AUDIO (ASoC) DRIVER
 +M:    Biju Das <[email protected]>
 +M:    Lad Prabhakar <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Supported
 +F:    Documentation/devicetree/bindings/sound/renesas,rz-ssi.yaml
 +F:    sound/soc/renesas/rz-ssi.c
 +
  RENESAS RZ/G2L A/D DRIVER
  M:    Lad Prabhakar <[email protected]>
  L:    [email protected]
@@@ -19893,10 -19765,9 +19893,10 @@@ F: Documentation/devicetree/bindings/i2
  F:    drivers/i2c/busses/i2c-rzv2m.c
  
  RENESAS SUPERH ETHERNET DRIVER
 -R:    Sergey Shtylyov <[email protected]>
 +M:    Niklas Söderlund <[email protected]>
  L:    [email protected]
  L:    [email protected]
 +S:    Supported
  F:    Documentation/devicetree/bindings/net/renesas,ether.yaml
  F:    drivers/net/ethernet/renesas/Kconfig
  F:    drivers/net/ethernet/renesas/Makefile
@@@ -20010,15 -19881,6 +20010,15 @@@ F: arch/riscv
  N:    riscv
  K:    riscv
  
 +RISC-V IOMMU
 +M:    Tomasz Jeznach <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/iommu/linux.git
 +F:    Documentation/devicetree/bindings/iommu/riscv,iommu.yaml
 +F:    drivers/iommu/riscv/
 +
  RISC-V MICROCHIP FPGA SUPPORT
  M:    Conor Dooley <[email protected]>
  M:    Daire McNamara <[email protected]>
@@@ -20038,7 -19900,6 +20038,7 @@@ F:   arch/riscv/boot/dts/microchip
  F:    drivers/char/hw_random/mpfs-rng.c
  F:    drivers/clk/microchip/clk-mpfs*.c
  F:    drivers/firmware/microchip/mpfs-auto-update.c
 +F:    drivers/gpio/gpio-mpfs.c
  F:    drivers/i2c/busses/i2c-microchip-corei2c.c
  F:    drivers/mailbox/mailbox-mpfs.c
  F:    drivers/pci/controller/plda/pcie-microchip-host.c
@@@ -20057,10 -19918,12 +20057,10 @@@ L:        [email protected]
  S:    Maintained
  Q:    https://patchwork.kernel.org/project/linux-riscv/list/
  T:    git https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git/
 -F:    Documentation/devicetree/bindings/riscv/
 -F:    arch/riscv/boot/dts/
 -X:    arch/riscv/boot/dts/allwinner/
 -X:    arch/riscv/boot/dts/renesas/
 -X:    arch/riscv/boot/dts/sophgo/
 -X:    arch/riscv/boot/dts/thead/
 +F:    arch/riscv/boot/dts/canaan/
 +F:    arch/riscv/boot/dts/microchip/
 +F:    arch/riscv/boot/dts/sifive/
 +F:    arch/riscv/boot/dts/starfive/
  
  RISC-V PMU DRIVERS
  M:    Atish Patra <[email protected]>
@@@ -20079,14 -19942,8 +20079,14 @@@ L: [email protected]
  S:    Maintained
  T:    git https://github.com/pdp7/linux.git
  F:    Documentation/devicetree/bindings/clock/thead,th1520-clk-ap.yaml
 +F:    Documentation/devicetree/bindings/mailbox/thead,th1520-mbox.yaml
 +F:    Documentation/devicetree/bindings/net/thead,th1520-gmac.yaml
 +F:    Documentation/devicetree/bindings/pinctrl/thead,th1520-pinctrl.yaml
  F:    arch/riscv/boot/dts/thead/
  F:    drivers/clk/thead/clk-th1520-ap.c
 +F:    drivers/mailbox/mailbox-th1520.c
 +F:    drivers/net/ethernet/stmicro/stmmac/dwmac-thead.c
 +F:    drivers/pinctrl/pinctrl-th1520.c
  F:    include/dt-bindings/clock/thead,th1520-clk-ap.h
  
  RNBD BLOCK DRIVERS
@@@ -20251,8 -20108,9 +20251,8 @@@ F:   include/linux/mfd/rohm-generic.
  F:    include/linux/mfd/rohm-shared.h
  
  ROSE NETWORK LAYER
 -M:    Ralf Baechle <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  W:    https://linux-ax25.in-berlin.de
  F:    include/net/rose.h
  F:    include/uapi/linux/rose.h
@@@ -20262,7 -20120,7 +20262,7 @@@ ROTATION DRIVER FOR ALLWINNER A83
  M:    Jernej Skrabec <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    Documentation/devicetree/bindings/media/allwinner,sun8i-a83t-de2-rotate.yaml
  F:    drivers/media/platform/sunxi/sun8i-rotate/
  
@@@ -20326,13 -20184,6 +20326,13 @@@ S: Maintaine
  T:    git https://github.com/pkshih/rtw.git
  F:    drivers/net/wireless/realtek/rtl8xxxu/
  
 +RTL9300 I2C DRIVER (rtl9300-i2c)
 +M:    Chris Packham <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/i2c/realtek,rtl9301-i2c.yaml
 +F:    drivers/i2c/busses/i2c-rtl9300.c
 +
  RTRS TRANSPORT DRIVERS
  M:    Md. Haris Iqbal <[email protected]>
  M:    Jack Wang <[email protected]>
@@@ -20368,7 -20219,6 +20368,7 @@@ C:   zulip://rust-for-linux.zulipchat.co
  P:    https://rust-for-linux.com/contributing
  T:    git https://github.com/Rust-for-Linux/linux.git rust-next
  F:    Documentation/rust/
 +F:    include/trace/events/rust_sample.h
  F:    rust/
  F:    samples/rust/
  F:    scripts/*rust*
@@@ -20416,16 -20266,6 +20416,16 @@@ L: [email protected]
  S:    Supported
  F:    drivers/s390/cio/
  
 +S390 CRYPTO MODULES, PRNG DRIVER, ARCH RANDOM
 +M:    Harald Freudenberger <[email protected]>
 +M:    Holger Dengler <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Supported
 +F:    arch/s390/crypto/
 +F:    arch/s390/include/asm/archrandom.h
 +F:    arch/s390/include/asm/cpacf.h
 +
  S390 DASD DRIVER
  M:    Stefan Haberland <[email protected]>
  M:    Jan Hoeppner <[email protected]>
@@@ -20435,14 -20275,6 +20435,14 @@@ F: block/partitions/ibm.
  F:    drivers/s390/block/dasd*
  F:    include/linux/dasd_mod.h
  
 +S390 HWRANDOM TRNG DRIVER
 +M:    Harald Freudenberger <[email protected]>
 +M:    Holger Dengler <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/char/hw_random/s390-trng.c
 +
  S390 IOMMU (PCI)
  M:    Niklas Schnelle <[email protected]>
  M:    Matthew Rosato <[email protected]>
@@@ -20487,12 -20319,6 +20487,12 @@@ F: Documentation/arch/s390/pci.rs
  F:    arch/s390/pci/
  F:    drivers/pci/hotplug/s390_pci_hpc.c
  
 +S390 PTP DRIVER
 +M:    Sven Schnelle <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/ptp/ptp_s390.c
 +
  S390 SCM DRIVER
  M:    Vineeth Vijayan <[email protected]>
  L:    [email protected]
@@@ -20530,16 -20356,10 +20530,16 @@@ F:        arch/s390/kvm/pci
  F:    drivers/vfio/pci/vfio_pci_zdev.c
  F:    include/uapi/linux/vfio_zdev.h
  
 -S390 ZCRYPT DRIVER
 +S390 ZCRYPT AND PKEY DRIVER AND AP BUS
  M:    Harald Freudenberger <[email protected]>
 +M:    Holger Dengler <[email protected]>
  L:    [email protected]
  S:    Supported
 +F:    arch/s390/include/asm/ap.h
 +F:    arch/s390/include/asm/pkey.h
 +F:    arch/s390/include/asm/trace/zcrypt.h
 +F:    arch/s390/include/uapi/asm/pkey.h
 +F:    arch/s390/include/uapi/asm/zcrypt.h
  F:    drivers/s390/crypto/
  
  S390 ZFCP DRIVER
@@@ -20554,7 -20374,7 +20554,7 @@@ M:   Hans Verkuil <[email protected]
  L:    [email protected]
  S:    Odd Fixes
  W:    https://linuxtv.org
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    drivers/media/i2c/saa6588*
  
  SAA7134 VIDEO4LINUX DRIVER
@@@ -20562,7 -20382,7 +20562,7 @@@ M:   Mauro Carvalho Chehab <mchehab@kerne
  L:    [email protected]
  S:    Odd fixes
  W:    https://linuxtv.org
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    Documentation/driver-api/media/drivers/saa7134*
  F:    drivers/media/pci/saa7134/
  
@@@ -20570,7 -20390,7 +20570,7 @@@ SAA7146 VIDEO4LINUX-2 DRIVE
  M:    Hans Verkuil <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    drivers/media/common/saa7146/
  F:    drivers/media/pci/saa7146/
  F:    include/media/drv-intf/saa7146*
@@@ -20583,7 -20403,7 +20583,7 @@@ F:   security/safesetid
  
  SAMSUNG AUDIO (ASoC) DRIVERS
  M:    Sylwester Nawrocki <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
  S:    Maintained
  B:    mailto:[email protected]
  F:    Documentation/devicetree/bindings/sound/samsung*
@@@ -20641,7 -20461,7 +20641,7 @@@ L:   [email protected]
  S:    Maintained
  B:    mailto:[email protected]
  F:    Documentation/devicetree/bindings/clock/samsung,s2mps11.yaml
 -F:    Documentation/devicetree/bindings/mfd/samsung,s2m*.yaml
 +F:    Documentation/devicetree/bindings/mfd/samsung,s2*.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
@@@ -21026,7 -20846,6 +21026,7 @@@ Q:   https://patchwork.kernel.org/project
  B:    mailto:[email protected]
  P:    https://github.com/LinuxSecurityModule/kernel/blob/main/README.md
  T:    git https://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git
 +F:    include/linux/lsm/
  F:    include/linux/lsm_audit.h
  F:    include/linux/lsm_hook_defs.h
  F:    include/linux/lsm_hooks.h
@@@ -21120,7 -20939,7 +21120,7 @@@ F:   drivers/media/rc/serial_ir.
  
  SERIAL LOW-POWER INTER-CHIP MEDIA BUS (SLIMbus)
  M:    Srinivas Kandagatla <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/slimbus/
  F:    drivers/slimbus/
@@@ -21173,7 -20992,6 +21173,7 @@@ M:   Jan Karcher <[email protected]
  R:    D. Wythe <[email protected]>
  R:    Tony Lu <[email protected]>
  R:    Wen Gu <[email protected]>
 +L:    [email protected]
  L:    [email protected]
  S:    Supported
  F:    net/smc/
@@@ -21190,7 -21008,7 +21190,7 @@@ SHARP RJ54N1CB0C SENSOR DRIVE
  M:    Jacopo Mondi <[email protected]>
  L:    [email protected]
  S:    Odd fixes
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    drivers/media/i2c/rj54n1cb0c.c
  F:    include/media/i2c/rj54n1cb0c.h
  
@@@ -21240,7 -21058,7 +21240,7 @@@ M:   Hans Verkuil <[email protected]
  L:    [email protected]
  S:    Odd Fixes
  W:    https://linuxtv.org
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    Documentation/devicetree/bindings/media/silabs,si470x.yaml
  F:    drivers/media/radio/si470x/radio-si470x-i2c.c
  
@@@ -21249,7 -21067,7 +21249,7 @@@ M:   Hans Verkuil <[email protected]
  L:    [email protected]
  S:    Maintained
  W:    https://linuxtv.org
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    drivers/media/radio/si470x/radio-si470x-common.c
  F:    drivers/media/radio/si470x/radio-si470x-usb.c
  F:    drivers/media/radio/si470x/radio-si470x.h
@@@ -21259,7 -21077,7 +21259,7 @@@ M:   Eduardo Valentin <[email protected]
  L:    [email protected]
  S:    Odd Fixes
  W:    https://linuxtv.org
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    drivers/media/radio/si4713/si4713.?
  
  SI4713 FM RADIO TRANSMITTER PLATFORM DRIVER
@@@ -21267,7 -21085,7 +21267,7 @@@ M:   Eduardo Valentin <[email protected]
  L:    [email protected]
  S:    Odd Fixes
  W:    https://linuxtv.org
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    drivers/media/radio/si4713/radio-platform-si4713.c
  
  SI4713 FM RADIO TRANSMITTER USB DRIVER
@@@ -21275,7 -21093,7 +21275,7 @@@ M:   Hans Verkuil <[email protected]
  L:    [email protected]
  S:    Maintained
  W:    https://linuxtv.org
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    drivers/media/radio/si4713/radio-usb-si4713.c
  
  SIANO DVB DRIVER
@@@ -21283,23 -21101,23 +21283,23 @@@ M:        Mauro Carvalho Chehab <mchehab@kerne
  L:    [email protected]
  S:    Odd fixes
  W:    https://linuxtv.org
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    drivers/media/common/siano/
  F:    drivers/media/mmc/siano/
  F:    drivers/media/usb/siano/
  F:    drivers/media/usb/siano/
  
  SIEMENS IPC LED DRIVERS
 -M:    Gerd Haeussler <gerd.haeussler.ext@siemens.com>
 -M:    Xing Tong Wu <xingtong.wu@siemens.com>
 +M:    Bao Cheng Su <baocheng.su@siemens.com>
 +M:    Benedikt Niedermayr <benedikt.niedermayr@siemens.com>
  M:    Tobias Schaffner <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/leds/simple/
  
  SIEMENS IPC PLATFORM DRIVERS
 -M:    Gerd Haeussler <gerd.haeussler.ext@siemens.com>
 -M:    Xing Tong Wu <xingtong.wu@siemens.com>
 +M:    Bao Cheng Su <baocheng.su@siemens.com>
 +M:    Benedikt Niedermayr <benedikt.niedermayr@siemens.com>
  M:    Tobias Schaffner <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -21308,8 -21126,8 +21308,8 @@@ F:   include/linux/platform_data/x86/sima
  F:    include/linux/platform_data/x86/simatic-ipc.h
  
  SIEMENS IPC WATCHDOG DRIVERS
 -M:    Gerd Haeussler <gerd.haeussler.ext@siemens.com>
 -M:    Xing Tong Wu <xingtong.wu@siemens.com>
 +M:    Bao Cheng Su <baocheng.su@siemens.com>
 +M:    Benedikt Niedermayr <benedikt.niedermayr@siemens.com>
  M:    Tobias Schaffner <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -21555,7 -21373,7 +21555,7 @@@ F:   Documentation/devicetree/bindings/i2
  F:    drivers/i2c/busses/i2c-synquacer.c
  
  SOCIONEXT UNIPHIER SOUND DRIVER
 -L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
  S:    Orphan
  F:    sound/soc/uniphier/
  
@@@ -21617,11 -21435,11 +21617,11 @@@ F:        include/linux/property.
  
  SOFTWARE RAID (Multiple Disks) SUPPORT
  M:    Song Liu <[email protected]>
 -R:    Yu Kuai <[email protected]>
 +M:    Yu Kuai <[email protected]>
  L:    [email protected]
  S:    Supported
  Q:    https://patchwork.kernel.org/project/linux-raid/list/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/song/md.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mdraid/linux.git
  F:    drivers/md/Kconfig
  F:    drivers/md/Makefile
  F:    drivers/md/md*
@@@ -21659,14 -21477,14 +21659,14 @@@ SONY IMX208 SENSOR DRIVE
  M:    Sakari Ailus <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    drivers/media/i2c/imx208.c
  
  SONY IMX214 SENSOR DRIVER
  M:    Ricardo Ribalda <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    Documentation/devicetree/bindings/media/i2c/sony,imx214.yaml
  F:    drivers/media/i2c/imx214.c
  
@@@ -21674,7 -21492,7 +21674,7 @@@ SONY IMX219 SENSOR DRIVE
  M:    Dave Stevenson <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    Documentation/devicetree/bindings/media/i2c/imx219.yaml
  F:    drivers/media/i2c/imx219.c
  
@@@ -21682,7 -21500,7 +21682,7 @@@ SONY IMX258 SENSOR DRIVE
  M:    Sakari Ailus <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    Documentation/devicetree/bindings/media/i2c/sony,imx258.yaml
  F:    drivers/media/i2c/imx258.c
  
@@@ -21690,7 -21508,7 +21690,7 @@@ SONY IMX274 SENSOR DRIVE
  M:    Leon Luo <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    Documentation/devicetree/bindings/media/i2c/sony,imx274.yaml
  F:    drivers/media/i2c/imx274.c
  
@@@ -21699,7 -21517,7 +21699,7 @@@ M:   Kieran Bingham <kieran.bingham@ideas
  M:    Umang Jain <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    Documentation/devicetree/bindings/media/i2c/sony,imx283.yaml
  F:    drivers/media/i2c/imx283.c
  
@@@ -21707,7 -21525,7 +21707,7 @@@ SONY IMX290 SENSOR DRIVE
  M:    Manivannan Sadhasivam <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    Documentation/devicetree/bindings/media/i2c/sony,imx290.yaml
  F:    drivers/media/i2c/imx290.c
  
@@@ -21716,7 -21534,7 +21716,7 @@@ M:   Laurent Pinchart <laurent.pinchart@i
  M:    Manivannan Sadhasivam <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    Documentation/devicetree/bindings/media/i2c/sony,imx296.yaml
  F:    drivers/media/i2c/imx296.c
  
@@@ -21724,20 -21542,20 +21724,20 @@@ SONY IMX319 SENSOR DRIVE
  M:    Bingbu Cao <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    drivers/media/i2c/imx319.c
  
  SONY IMX334 SENSOR DRIVER
  L:    [email protected]
  S:    Orphan
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    Documentation/devicetree/bindings/media/i2c/sony,imx334.yaml
  F:    drivers/media/i2c/imx334.c
  
  SONY IMX335 SENSOR DRIVER
  L:    [email protected]
  S:    Orphan
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    Documentation/devicetree/bindings/media/i2c/sony,imx335.yaml
  F:    drivers/media/i2c/imx335.c
  
@@@ -21745,13 -21563,13 +21745,13 @@@ SONY IMX355 SENSOR DRIVE
  M:    Tianshu Qiu <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    drivers/media/i2c/imx355.c
  
  SONY IMX412 SENSOR DRIVER
  L:    [email protected]
  S:    Orphan
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    Documentation/devicetree/bindings/media/i2c/sony,imx412.yaml
  F:    drivers/media/i2c/imx412.c
  
@@@ -21759,7 -21577,7 +21759,7 @@@ SONY IMX415 SENSOR DRIVE
  M:    Michael Riesch <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    Documentation/devicetree/bindings/media/i2c/sony,imx415.yaml
  F:    drivers/media/i2c/imx415.c
  
@@@ -21814,7 -21632,7 +21814,7 @@@ F:   tools/testing/selftests/als
  
  SOUND - COMPRESSED AUDIO
  M:    Vinod Koul <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git
  F:    Documentation/sound/designs/compress-offload.rst
@@@ -21872,21 -21690,12 +21872,21 @@@ S:        Supporte
  W:    https://github.com/thesofproject/linux/
  F:    sound/soc/sof/
  
 +SOUND - GENERIC SOUND CARD (Simple-Audio-Card, Audio-Graph-Card)
 +M:    Kuninori Morimoto <[email protected]>
 +S:    Supported
 +L:    [email protected]
 +F:    sound/soc/generic/
 +F:    include/sound/simple_card*
 +F:    Documentation/devicetree/bindings/sound/simple-card.yaml
 +F:    Documentation/devicetree/bindings/sound/audio-graph*.yaml
 +
  SOUNDWIRE SUBSYSTEM
  M:    Vinod Koul <[email protected]>
  M:    Bard Liao <[email protected]>
  R:    Pierre-Louis Bossart <[email protected]>
  R:    Sanyog Kale <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git
  F:    Documentation/driver-api/soundwire/
@@@ -21959,8 -21768,8 +21959,8 @@@ F:   drivers/accessibility/speakup
  SPEAR PLATFORM/CLOCK/PINCTRL SUPPORT
  M:    Viresh Kumar <[email protected]>
  M:    Shiraz Hashim <[email protected]>
 -M:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
  S:    Maintained
  W:    http://www.st.com/spear
  F:    arch/arm/boot/dts/st/spear*
@@@ -22048,7 -21857,7 +22048,7 @@@ M:   Benjamin Mugnier <benjamin.mugnier@f
  M:    Sylvain Petinot <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    Documentation/devicetree/bindings/media/i2c/st,st-mipid02.yaml
  F:    drivers/media/i2c/st-mipid02.c
  
@@@ -22084,7 -21893,7 +22084,7 @@@ M:   Benjamin Mugnier <benjamin.mugnier@f
  M:    Sylvain Petinot <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    Documentation/devicetree/bindings/media/i2c/st,st-vgxy61.yaml
  F:    Documentation/userspace-api/media/drivers/vgxy61.rst
  F:    drivers/media/i2c/vgxy61.c
@@@ -22359,7 -22168,7 +22359,7 @@@ F:   kernel/static_call.
  
  STI AUDIO (ASoC) DRIVERS
  M:    Arnaud Pouliquen <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/sound/st,sti-asoc-card.txt
  F:    sound/soc/sti/
@@@ -22374,13 -22183,13 +22374,13 @@@ STK1160 USB VIDEO CAPTURE DRIVE
  M:    Ezequiel Garcia <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    drivers/media/usb/stk1160/
  
  STM32 AUDIO (ASoC) DRIVERS
  M:    Olivier Moysan <[email protected]>
  M:    Arnaud Pouliquen <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/iio/adc/st,stm32-dfsdm-adc.yaml
  F:    Documentation/devicetree/bindings/sound/st,stm32-*.yaml
@@@ -22434,6 -22243,12 +22434,6 @@@ S:  Maintaine
  F:    Documentation/devicetree/bindings/input/allwinner,sun4i-a10-lradc-keys.yaml
  F:    drivers/input/keyboard/sun4i-lradc-keys.c
  
 -SUNDANCE NETWORK DRIVER
 -M:    Denis Kirjanov <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/net/ethernet/dlink/sundance.c
 -
  SUNPLUS ETHERNET DRIVER
  M:    Wells Lu <[email protected]>
  L:    [email protected]
@@@ -22612,11 -22427,19 +22612,11 @@@ F:        drivers/tty/serial/8250/8250_lpss.
  
  SYNOPSYS DESIGNWARE APB GPIO DRIVER
  M:    Hoan Tran <[email protected]>
 -M:    Serge Semin <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/gpio/snps,dw-apb-gpio.yaml
  F:    drivers/gpio/gpio-dwapb.c
  
 -SYNOPSYS DESIGNWARE APB SSI DRIVER
 -M:    Serge Semin <[email protected]>
 -L:    [email protected]
 -S:    Supported
 -F:    Documentation/devicetree/bindings/spi/snps,dw-apb-ssi.yaml
 -F:    drivers/spi/spi-dw*
 -
  SYNOPSYS DESIGNWARE AXI DMAC DRIVER
  M:    Eugeniy Paltsev <[email protected]>
  S:    Maintained
@@@ -22805,7 -22628,7 +22805,7 @@@ L:   [email protected]
  S:    Maintained
  W:    https://linuxtv.org
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    drivers/media/tuners/tda18250*
  
  TDA18271 MEDIA DRIVER
@@@ -22851,7 -22674,7 +22851,7 @@@ M:   Hans Verkuil <[email protected]
  L:    [email protected]
  S:    Maintained
  W:    https://linuxtv.org
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    drivers/media/i2c/tda9840*
  
  TEA5761 TUNER DRIVER
@@@ -22859,7 -22682,7 +22859,7 @@@ M:   Mauro Carvalho Chehab <mchehab@kerne
  L:    [email protected]
  S:    Odd fixes
  W:    https://linuxtv.org
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    drivers/media/tuners/tea5761.*
  
  TEA5767 TUNER DRIVER
@@@ -22867,7 -22690,7 +22867,7 @@@ M:   Mauro Carvalho Chehab <mchehab@kerne
  L:    [email protected]
  S:    Maintained
  W:    https://linuxtv.org
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    drivers/media/tuners/tea5767.*
  
  TEA6415C MEDIA DRIVER
@@@ -22875,7 -22698,7 +22875,7 @@@ M:   Hans Verkuil <[email protected]
  L:    [email protected]
  S:    Maintained
  W:    https://linuxtv.org
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    drivers/media/i2c/tea6415c*
  
  TEA6420 MEDIA DRIVER
@@@ -22883,7 -22706,7 +22883,7 @@@ M:   Hans Verkuil <[email protected]
  L:    [email protected]
  S:    Maintained
  W:    https://linuxtv.org
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    drivers/media/i2c/tea6420*
  
  TEAM DRIVER
@@@ -23069,7 -22892,7 +23069,7 @@@ F:   drivers/irqchip/irq-xtensa-
  
  TEXAS INSTRUMENTS ASoC DRIVERS
  M:    Peter Ujfalusi <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/sound/davinci-mcasp-audio.yaml
  F:    sound/soc/ti/
@@@ -23078,7 -22901,7 +23078,7 @@@ TEXAS INSTRUMENTS AUDIO (ASoC/HDA) DRIV
  M:    Shenghao Ding <[email protected]>
  M:    Kevin Lu <[email protected]>
  M:    Baojun Xu <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/sound/tas2552.txt
  F:    Documentation/devicetree/bindings/sound/ti,tas2562.yaml
@@@ -23119,12 -22942,6 +23119,12 @@@ F: include/linux/dma/k3-udma-glue.
  F:    include/linux/dma/ti-cppi5.h
  X:    drivers/dma/ti/cppi41.c
  
 +TEXAS INSTRUMENTS TPS25990 HARDWARE MONITOR DRIVER
 +M:    Jerome Brunet <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/hwmon/pmbus/ti,tps25990.yaml
 +
  TEXAS INSTRUMENTS TPS23861 PoE PSE DRIVER
  M:    Robert Marko <[email protected]>
  M:    Luka Perkov <[email protected]>
@@@ -23177,7 -22994,7 +23177,7 @@@ M:   Hans Verkuil <[email protected]
  L:    [email protected]
  S:    Maintained
  W:    https://linuxtv.org
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    drivers/media/radio/radio-raremono.c
  
  THERMAL
@@@ -23253,7 -23070,7 +23253,7 @@@ M:   Laurent Pinchart <laurent.pinchart@i
  M:    Paul Elder <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    Documentation/devicetree/bindings/media/i2c/thine,thp7312.yaml
  F:    Documentation/userspace-api/media/drivers/thp7312.rst
  F:    drivers/media/i2c/thp7312.c
@@@ -23432,7 -23249,7 +23432,7 @@@ F:   Documentation/devicetree/bindings/ne
  F:    drivers/net/ethernet/ti/icssg/*
  
  TI J721E CSI2RX DRIVER
 -M:    Jai Luthra <j[email protected]>
 +M:    Jai Luthra <j[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/media/ti,j721e-csi2rx-shim.yaml
@@@ -23452,7 -23269,7 +23452,7 @@@ F:   drivers/soc/ti/
  TI LM49xxx FAMILY ASoC CODEC DRIVERS
  M:    M R Swami Reddy <[email protected]>
  M:    Vishwas A Deshpande <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
  S:    Maintained
  F:    sound/soc/codecs/isabelle*
  F:    sound/soc/codecs/lm49453*
@@@ -23466,15 -23283,15 +23466,15 @@@ F:        Documentation/devicetree/bindings/ii
  F:    drivers/iio/adc/ti-lmp92064.c
  
  TI PCM3060 ASoC CODEC DRIVER
 -M:    Kirill Marinushkin <kmarinushkin@birdec.com>
 -L:    [email protected] (moderated for non-subscribers)
 +M:    Kirill Marinushkin <k.marinushkin@gmail.com>
 +L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/sound/pcm3060.txt
  F:    sound/soc/codecs/pcm3060*
  
  TI TAS571X FAMILY ASoC CODEC DRIVER
  M:    Kevin Cernekee <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
  S:    Odd Fixes
  F:    sound/soc/codecs/tas571x*
  
@@@ -23502,7 -23319,7 +23502,7 @@@ F:   drivers/iio/adc/ti-tsc2046.
  
  TI TWL4030 SERIES SOC CODEC DRIVER
  M:    Peter Ujfalusi <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
  S:    Maintained
  F:    sound/soc/codecs/twl4030*
  
@@@ -23810,9 -23627,10 +23810,9 @@@ F:  drivers/net/tun.
  
  TURBOCHANNEL SUBSYSTEM
  M:    "Maciej W. Rozycki" <[email protected]>
 -M:    Ralf Baechle <[email protected]>
  L:    [email protected]
  S:    Maintained
 -Q:    http://patchwork.linux-mips.org/project/linux-mips/list/
 +Q:    https://patchwork.kernel.org/project/linux-mips/list/
  F:    drivers/tc/
  F:    include/linux/tc.h
  
@@@ -23839,7 -23657,7 +23839,7 @@@ M:   Hans Verkuil <[email protected]
  L:    [email protected]
  S:    Odd Fixes
  W:    https://linuxtv.org
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    drivers/media/pci/tw68/
  
  TW686X VIDEO4LINUX DRIVER
@@@ -23847,7 -23665,7 +23847,7 @@@ M:   Ezequiel Garcia <ezequiel@vanguardia
  L:    [email protected]
  S:    Maintained
  W:    http://linuxtv.org
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    drivers/media/pci/tw686x/
  
  U-BOOT ENVIRONMENT VARIABLES
@@@ -23931,6 -23749,12 +23931,6 @@@ L:  [email protected]
  S:    Maintained
  F:    drivers/hid/hid-udraw-ps3.c
  
 -UFS FILESYSTEM
 -M:    Evgeniy Dushistov <[email protected]>
 -S:    Maintained
 -F:    Documentation/admin-guide/ufs.rst
 -F:    fs/ufs/
 -
  UHID USERSPACE HID IO DRIVER
  M:    David Rheinsberg <[email protected]>
  L:    [email protected]
@@@ -23949,7 -23773,6 +23949,7 @@@ UNICODE SUBSYSTE
  M:    Gabriel Krisman Bertazi <[email protected]>
  L:    [email protected]
  S:    Supported
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git
  F:    fs/unicode/
  
  UNIFDEF
@@@ -23993,7 -23816,9 +23993,9 @@@ F:   drivers/ufs/host/*dwc
  
  UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER EXYNOS HOOKS
  M:    Alim Akhtar <[email protected]>
+ R:    Peter Griffin <[email protected]>
  L:    [email protected]
+ L:    [email protected]
  S:    Maintained
  F:    drivers/ufs/host/ufs-exynos*
  
@@@ -24172,7 -23997,7 +24174,7 @@@ F:   drivers/usb/storage
  
  USB MIDI DRIVER
  M:    Clemens Ladisch <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git
  F:    sound/usb/midi.*
@@@ -24234,7 -24059,6 +24236,7 @@@ USB RAW GADGET DRIVE
  R:    Andrey Konovalov <[email protected]>
  L:    [email protected]
  S:    Maintained
 +B:    https://github.com/xairy/raw-gadget/issues
  F:    Documentation/usb/raw-gadget.rst
  F:    drivers/usb/gadget/legacy/raw_gadget.c
  F:    include/uapi/linux/usb/raw_gadget.h
@@@ -24328,11 -24152,10 +24330,11 @@@ F:        drivers/usb/host/uhci
  
  USB VIDEO CLASS
  M:    Laurent Pinchart <[email protected]>
 +M:    Hans de Goede <[email protected]>
  L:    [email protected]
  S:    Maintained
  W:    http://www.ideasonboard.org/uvc/
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    drivers/media/usb/uvc/
  F:    include/uapi/linux/uvcvideo.h
  
@@@ -24352,12 -24175,8 +24354,12 @@@ F: drivers/usb/host/xhci
  
  USER DATAGRAM PROTOCOL (UDP)
  M:    Willem de Bruijn <[email protected]>
 +L:    [email protected]
  S:    Maintained
  F:    include/linux/udp.h
 +F:    include/net/udp.h
 +F:    include/trace/events/udp.h
 +F:    include/uapi/linux/udp.h
  F:    net/ipv4/udp.c
  F:    net/ipv6/udp.c
  
@@@ -24384,7 -24203,6 +24386,7 @@@ F:   lib/iov_iter.
  
  USERSPACE DMA BUFFER DRIVER
  M:    Gerd Hoffmann <[email protected]>
 +M:    Vivek Kasireddy <[email protected]>
  L:    [email protected]
  S:    Maintained
  T:    git https://gitlab.freedesktop.org/drm/misc/kernel.git
@@@ -24439,7 -24257,7 +24441,7 @@@ V4L2 ASYNC AND FWNODE FRAMEWORK
  M:    Sakari Ailus <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    drivers/media/v4l2-core/v4l2-async.c
  F:    drivers/media/v4l2-core/v4l2-fwnode.c
  F:    include/media/v4l2-async.h
@@@ -24605,7 -24423,7 +24607,7 @@@ M:   Hans Verkuil <hverkuil-cisco@xs4all.
  L:    [email protected]
  S:    Maintained
  W:    https://linuxtv.org
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    drivers/media/test-drivers/vicodec/*
  
  VIDEO I2C POLLING DRIVER
@@@ -24633,7 -24451,7 +24635,7 @@@ M:   Daniel W. S. Almeida <dwlsalmeida@gm
  L:    [email protected]
  S:    Maintained
  W:    https://linuxtv.org
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    drivers/media/test-drivers/vidtv/*
  
  VIMC VIRTUAL MEDIA CONTROLLER DRIVER
@@@ -24642,7 -24460,7 +24644,7 @@@ R:   Kieran Bingham <kieran.bingham@ideas
  L:    [email protected]
  S:    Maintained
  W:    https://linuxtv.org
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    drivers/media/test-drivers/vimc/*
  
  VIRT LIB
@@@ -24839,7 -24657,7 +24841,7 @@@ VIRTIO SOUND DRIVE
  M:    Anton Yakovlev <[email protected]>
  M:    "Michael S. Tsirkin" <[email protected]>
  L:    [email protected]
 -L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
  S:    Maintained
  F:    include/uapi/linux/virtio_snd.h
  F:    sound/virtio/*
@@@ -24890,7 -24708,7 +24892,7 @@@ M:   Hans Verkuil <[email protected]
  L:    [email protected]
  S:    Maintained
  W:    https://linuxtv.org
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    drivers/media/test-drivers/vivid/*
  
  VM SOCKETS (AF_VSOCK)
@@@ -24908,10 -24726,9 +24910,10 @@@ F: tools/testing/vsock
  
  VMA
  M:    Andrew Morton <[email protected]>
 -R:    Liam R. Howlett <[email protected]>
 +M:    Liam R. Howlett <[email protected]>
 +M:    Lorenzo Stoakes <[email protected]>
  R:    Vlastimil Babka <[email protected]>
 -R:    Lorenzo Stoakes <lorenzo.stoakes@oracle.com>
 +R:    Jann Horn <jannh@google.com>
  L:    [email protected]
  S:    Maintained
  W:    https://www.linux-mm.org
@@@ -25444,7 -25261,7 +25446,7 @@@ M:   Mauro Carvalho Chehab <mchehab@kerne
  L:    [email protected]
  S:    Maintained
  W:    https://linuxtv.org
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    drivers/media/tuners/xc2028.*
  
  XDP (eXpress Data Path)
@@@ -25569,7 -25386,7 +25571,7 @@@ F:   include/xen/interface/io/usbif.
  XEN SOUND FRONTEND DRIVER
  M:    Oleksandr Andrushchenko <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
 -L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
  S:    Supported
  F:    sound/xen/*
  
@@@ -25585,7 -25402,7 +25587,7 @@@ F:   include/xen/arm/swiotlb-xen.
  F:    include/xen/swiotlb-xen.h
  
  XFS FILESYSTEM
 -M:    Chandan Babu R <[email protected]>
 +M:    Carlos Maiolino <[email protected]>
  R:    Darrick J. Wong <[email protected]>
  L:    [email protected]
  S:    Supported
@@@ -25668,7 -25485,7 +25670,7 @@@ XILINX VIDEO IP CORE
  M:    Laurent Pinchart <[email protected]>
  L:    [email protected]
  S:    Supported
 -T:    git git://linuxtv.org/media_tree.git
 +T:    git git://linuxtv.org/media.git
  F:    Documentation/devicetree/bindings/media/xilinx/
  F:    drivers/media/platform/xilinx/
  F:    include/uapi/linux/xilinx-v4l2-controls.h

diff --combined drivers/scsi/lpfc/lpfc_nvme.c
index fec23c7237304b471e58194726ff7932b0010385,6e0b27460c24bf5becc883c5a98c56fce25e1b40..49dd78ed8a9a105c774347b417c3783a6135c9c3
--- 1/drivers/scsi/lpfc/lpfc_nvme.c
--- 2/drivers/scsi/lpfc/lpfc_nvme.c
+++ b/drivers/scsi/lpfc/lpfc_nvme.c
@@@ -24,7 -24,7 +24,7 @@@
  #include <linux/slab.h>
  #include <linux/interrupt.h>
  #include <linux/delay.h>
 -#include <asm/unaligned.h>
 +#include <linux/unaligned.h>
  #include <linux/crc-t10dif.h>
  #include <net/checksum.h>
  
@@@ -1232,7 -1232,7 +1232,7 @@@ lpfc_nvme_prep_io_cmd(struct lpfc_vpor
  
                        /* Word 5 */
                        if ((phba->cfg_nvme_enable_fb) &&
-                           (pnode->nlp_flag & NLP_FIRSTBURST)) {
+                           test_bit(NLP_FIRSTBURST, &pnode->nlp_flag)) {
                                req_len = lpfc_ncmd->nvmeCmd->payload_length;
                                if (req_len < pnode->nvme_fb_size)
                                        wqe->fcp_iwrite.initial_xfer_len =
@@@ -2231,6 -2231,7 +2231,7 @@@ lpfc_nvme_lport_unreg_wait(struct lpfc_
        struct lpfc_hba  *phba = vport->phba;
        struct lpfc_sli4_hdw_queue *qp;
        int abts_scsi, abts_nvme;
+       u16 nvmels_cnt;
  
        /* Host transport has to clean up and confirm requiring an indefinite
         * wait. Print a message if a 10 second wait expires and renew the
@@@ -2243,6 -2244,7 +2244,7 @@@
                        pending = 0;
                        abts_scsi = 0;
                        abts_nvme = 0;
+                       nvmels_cnt = 0;
                        for (i = 0; i < phba->cfg_hdw_queue; i++) {
                                qp = &phba->sli4_hba.hdwq[i];
                                if (!vport->localport || !qp || !qp->io_wq)
@@@ -2255,6 -2257,11 +2257,11 @@@
                                abts_scsi += qp->abts_scsi_io_bufs;
                                abts_nvme += qp->abts_nvme_io_bufs;
                        }
+                       if (phba->sli4_hba.nvmels_wq) {
+                               pring = phba->sli4_hba.nvmels_wq->pring;
+                               if (pring)
+                                       nvmels_cnt = pring->txcmplq_cnt;
+                       }
                        if (!vport->localport ||
                            test_bit(HBA_PCI_ERR, &vport->phba->bit_flags) ||
                            phba->link_state == LPFC_HBA_ERROR ||
@@@ -2263,10 -2270,10 +2270,10 @@@
  
                        lpfc_printf_vlog(vport, KERN_ERR, LOG_TRACE_EVENT,
                                         "6176 Lport x%px Localport x%px wait "
-                                        "timed out. Pending %d [%d:%d]. "
+                                        "timed out. Pending %d [%d:%d:%d]. "
                                         "Renewing.\n",
                                         lport, vport->localport, pending,
-                                        abts_scsi, abts_nvme);
+                                        abts_scsi, abts_nvme, nvmels_cnt);
                        continue;
                }
                break;
@@@ -2644,14 -2651,11 +2651,11 @@@ lpfc_nvme_unregister_port(struct lpfc_v
                                 * reference. Check if another thread has set
                                 * NLP_DROPPED.
                                 */
-                               spin_lock_irq(&ndlp->lock);
-                               if (!(ndlp->nlp_flag & NLP_DROPPED)) {
-                                       ndlp->nlp_flag |= NLP_DROPPED;
-                                       spin_unlock_irq(&ndlp->lock);
+                               if (!test_and_set_bit(NLP_DROPPED,
+                                                     &ndlp->nlp_flag)) {
                                        lpfc_nlp_put(ndlp);
                                        return;
                                }
-                               spin_unlock_irq(&ndlp->lock);
                        }
                }
        }
@@@ -2841,3 -2845,43 +2845,43 @@@ lpfc_nvme_cancel_iocb(struct lpfc_hba *
        (pwqeIn->cmd_cmpl)(phba, pwqeIn, pwqeIn);
  #endif
  }
+ 
+ /**
+  * lpfc_nvmels_flush_cmd - Clean up outstanding nvmels commands for a port
+  * @phba: Pointer to HBA context object.
+  *
+  **/
+ void
+ lpfc_nvmels_flush_cmd(struct lpfc_hba *phba)
+ {
+ #if (IS_ENABLED(CONFIG_NVME_FC))
+       LIST_HEAD(cancel_list);
+       struct lpfc_sli_ring *pring = NULL;
+       struct lpfc_iocbq *piocb, *tmp_iocb;
+       unsigned long iflags;
+ 
+       if (phba->sli4_hba.nvmels_wq)
+               pring = phba->sli4_hba.nvmels_wq->pring;
+ 
+       if (unlikely(!pring))
+               return;
+ 
+       spin_lock_irqsave(&phba->hbalock, iflags);
+       spin_lock(&pring->ring_lock);
+       list_splice_init(&pring->txq, &cancel_list);
+       pring->txq_cnt = 0;
+       list_for_each_entry_safe(piocb, tmp_iocb, &pring->txcmplq, list) {
+               if (piocb->cmd_flag & LPFC_IO_NVME_LS) {
+                       list_move_tail(&piocb->list, &cancel_list);
+                       pring->txcmplq_cnt--;
+                       piocb->cmd_flag &= ~LPFC_IO_ON_TXCMPLQ;
+               }
+       }
+       spin_unlock(&pring->ring_lock);
+       spin_unlock_irqrestore(&phba->hbalock, iflags);
+ 
+       if (!list_empty(&cancel_list))
+               lpfc_sli_cancel_iocbs(phba, &cancel_list, IOSTAT_LOCAL_REJECT,
+                                     IOERR_SLI_DOWN);
+ #endif
+ }

diff --combined drivers/scsi/lpfc/lpfc_nvmet.c
index 55c3e2c2bf8f7ee54b856f8971060441f01c3601,3b29d57d77ac5b47c00dfcdfe8727d75e5731f55..e6c9112a886275278816efe0b1d5233ac95d42ec
--- 1/drivers/scsi/lpfc/lpfc_nvmet.c
--- 2/drivers/scsi/lpfc/lpfc_nvmet.c
+++ b/drivers/scsi/lpfc/lpfc_nvmet.c
@@@ -24,7 -24,7 +24,7 @@@
  #include <linux/slab.h>
  #include <linux/interrupt.h>
  #include <linux/delay.h>
 -#include <asm/unaligned.h>
 +#include <linux/unaligned.h>
  #include <linux/crc-t10dif.h>
  #include <net/checksum.h>
  
@@@ -2854,7 -2854,7 +2854,7 @@@ lpfc_nvmet_prep_fcp_wqe(struct lpfc_hb
                        /* In template ar=1 wqes=0 sup=0 irsp=0 irsplen=0 */
  
                        if (rsp->rsplen == LPFC_NVMET_SUCCESS_LEN) {
-                               if (ndlp->nlp_flag & NLP_SUPPRESS_RSP)
+                               if (test_bit(NLP_SUPPRESS_RSP, &ndlp->nlp_flag))
                                        bf_set(wqe_sup,
                                               &wqe->fcp_tsend.wqe_com, 1);
                        } else {

diff --combined drivers/scsi/lpfc/lpfc_scsi.c
index 11c974bffa72099436056418f7c2f32ca70e7c08,908b2f7dd70c9e14f60f7661fa1bc23169ba0cb3..905026a4782cf97c181c9fd5e56ecd5bf9662d10
--- 1/drivers/scsi/lpfc/lpfc_scsi.c
--- 2/drivers/scsi/lpfc/lpfc_scsi.c
+++ b/drivers/scsi/lpfc/lpfc_scsi.c
@@@ -25,7 -25,7 +25,7 @@@
  #include <linux/interrupt.h>
  #include <linux/export.h>
  #include <linux/delay.h>
 -#include <asm/unaligned.h>
 +#include <linux/unaligned.h>
  #include <linux/t10-pi.h>
  #include <linux/crc-t10dif.h>
  #include <linux/blk-cgroup.h>
@@@ -4629,7 -4629,7 +4629,7 @@@ static int lpfc_scsi_prep_cmnd_buf_s3(s
                        iocb_cmd->ulpCommand = CMD_FCP_IWRITE64_CR;
                        iocb_cmd->ulpPU = PARM_READ_CHECK;
                        if (vport->cfg_first_burst_size &&
-                           (pnode->nlp_flag & NLP_FIRSTBURST)) {
+                           test_bit(NLP_FIRSTBURST, &pnode->nlp_flag)) {
                                u32 xrdy_len;
  
                                fcpdl = scsi_bufflen(scsi_cmnd);
@@@ -5829,7 -5829,7 +5829,7 @@@ lpfc_send_taskmgmt(struct lpfc_vport *v
  
        lpfc_printf_vlog(vport, KERN_INFO, LOG_FCP,
                         "0702 Issue %s to TGT %d LUN %llu "
-                        "rpi x%x nlp_flag x%x Data: x%x x%x\n",
+                        "rpi x%x nlp_flag x%lx Data: x%x x%x\n",
                         lpfc_taskmgmt_name(task_mgmt_cmd), tgt_id, lun_id,
                         pnode->nlp_rpi, pnode->nlp_flag, iocbq->sli4_xritag,
                         iocbq->cmd_flag);
@@@ -6094,8 -6094,8 +6094,8 @@@ lpfc_target_reset_handler(struct scsi_c
                lpfc_printf_vlog(vport, KERN_ERR, LOG_TRACE_EVENT,
                        "0722 Target Reset rport failure: rdata x%px\n", rdata);
                if (pnode) {
+                       clear_bit(NLP_NPR_ADISC, &pnode->nlp_flag);
                        spin_lock_irqsave(&pnode->lock, flags);
-                       pnode->nlp_flag &= ~NLP_NPR_ADISC;
                        pnode->nlp_fcp_info &= ~NLP_FCP_2_DEVICE;
                        spin_unlock_irqrestore(&pnode->lock, flags);
                }
@@@ -6124,7 -6124,7 +6124,7 @@@
                    !pnode->logo_waitq) {
                        pnode->logo_waitq = &waitq;
                        pnode->nlp_fcp_info &= ~NLP_FCP_2_DEVICE;
-                       pnode->nlp_flag |= NLP_ISSUE_LOGO;
+                       set_bit(NLP_ISSUE_LOGO, &pnode->nlp_flag);
                        pnode->save_flags |= NLP_WAIT_FOR_LOGO;
                        spin_unlock_irqrestore(&pnode->lock, flags);
                        lpfc_unreg_rpi(vport, pnode);

diff --combined drivers/scsi/st.c
index beb88f25dbb9937336a49c4e27826d441bac8924,fe0618ac9769fe52e71e6c1a6f71a716a9409c44..e8ef27d7ef6181ea8f4b65bf6c689261f1333b03
--- 1/drivers/scsi/st.c
--- 2/drivers/scsi/st.c
+++ b/drivers/scsi/st.c
@@@ -46,7 -46,7 +46,7 @@@ static const char *verstr = "20160209"
  
  #include <linux/uaccess.h>
  #include <asm/dma.h>
 -#include <asm/unaligned.h>
 +#include <linux/unaligned.h>
  
  #include <scsi/scsi.h>
  #include <scsi/scsi_dbg.h>
@@@ -991,7 -991,10 +991,10 @@@ static int test_ready(struct scsi_tape 
                        scode = cmdstatp->sense_hdr.sense_key;
  
                        if (scode == UNIT_ATTENTION) { /* New media? */
-                               new_session = 1;
+                               if (cmdstatp->sense_hdr.asc == 0x28) { /* New media */
+                                       new_session = 1;
+                                       DEBC_printk(STp, "New tape session.");
+                               }
                                if (attentions < MAX_ATTENTIONS) {
                                        attentions++;
                                        continue;
@@@ -3506,6 -3509,7 +3509,7 @@@ static long st_ioctl(struct file *file
        int i, cmd_nr, cmd_type, bt;
        int retval = 0;
        unsigned int blk;
+       bool cmd_mtiocget;
        struct scsi_tape *STp = file->private_data;
        struct st_modedef *STm;
        struct st_partstat *STps;
@@@ -3619,6 -3623,7 +3623,7 @@@
                         */
                        if (mtc.mt_op != MTREW &&
                            mtc.mt_op != MTOFFL &&
+                           mtc.mt_op != MTLOAD &&
                            mtc.mt_op != MTRETEN &&
                            mtc.mt_op != MTERASE &&
                            mtc.mt_op != MTSEEK &&
@@@ -3732,17 -3737,28 +3737,28 @@@
                goto out;
        }
  
+       cmd_mtiocget = cmd_type == _IOC_TYPE(MTIOCGET) && cmd_nr == _IOC_NR(MTIOCGET);
+ 
        if ((i = flush_buffer(STp, 0)) < 0) {
-               retval = i;
-               goto out;
-       }
-       if (STp->can_partitions &&
-           (i = switch_partition(STp)) < 0) {
-               retval = i;
-               goto out;
+               if (cmd_mtiocget && STp->pos_unknown) {
+                       /* flush fails -> modify status accordingly */
+                       reset_state(STp);
+                       STp->pos_unknown = 1;
+               } else { /* return error */
+                       retval = i;
+                       goto out;
+               }
+       } else { /* flush_buffer succeeds */
+               if (STp->can_partitions) {
+                       i = switch_partition(STp);
+                       if (i < 0) {
+                               retval = i;
+                               goto out;
+                       }
+               }
        }
  
-       if (cmd_type == _IOC_TYPE(MTIOCGET) && cmd_nr == _IOC_NR(MTIOCGET)) {
+       if (cmd_mtiocget) {
                struct mtget mt_status;
  
                if (_IOC_SIZE(cmd_in) != sizeof(struct mtget)) {
@@@ -3756,7 -3772,7 +3772,7 @@@
                    ((STp->density << MT_ST_DENSITY_SHIFT) & MT_ST_DENSITY_MASK);
                mt_status.mt_blkno = STps->drv_block;
                mt_status.mt_fileno = STps->drv_file;
-               if (STp->block_size != 0) {
+               if (STp->block_size != 0 && mt_status.mt_blkno >= 0) {
                        if (STps->rw == ST_WRITING)
                                mt_status.mt_blkno +=
                                    (STp->buffer)->buffer_bytes / STp->block_size;

diff --combined drivers/target/target_core_pscsi.c
index 440e07b1d5cdb1326f23fc23467905f26ec37ab1,da7017113f92a622d2e8f421533a4213b8e08cae..287ac5b0495f9a99a60eae036936fd61fdf78b06
--- 1/drivers/target/target_core_pscsi.c
--- 2/drivers/target/target_core_pscsi.c
+++ b/drivers/target/target_core_pscsi.c
@@@ -20,7 -20,7 +20,7 @@@
  #include <linux/cdrom.h>
  #include <linux/ratelimit.h>
  #include <linux/module.h>
 -#include <asm/unaligned.h>
 +#include <linux/unaligned.h>
  
  #include <scsi/scsi_device.h>
  #include <scsi/scsi_host.h>
@@@ -369,7 -369,7 +369,7 @@@ static int pscsi_create_type_disk(struc
        bdev_file = bdev_file_open_by_path(dev->udev_path,
                                BLK_OPEN_WRITE | BLK_OPEN_READ, pdv, NULL);
        if (IS_ERR(bdev_file)) {
-               pr_err("pSCSI: bdev_open_by_path() failed\n");
+               pr_err("pSCSI: bdev_file_open_by_path() failed\n");
                scsi_device_put(sd);
                return PTR_ERR(bdev_file);
        }

diff --combined drivers/ufs/core/ufs-mcq.c
index dba935c712d64b895aa1d34288c9639825066516,24c10e62cef9ffe3f4fbced1e9178c510d289bb1..240ce135bbfbc3a9628ce3e43b0f356e2e13e9aa
--- 1/drivers/ufs/core/ufs-mcq.c
--- 2/drivers/ufs/core/ufs-mcq.c
+++ b/drivers/ufs/core/ufs-mcq.c
@@@ -7,7 -7,7 +7,7 @@@
   *    Can Guo <[email protected]>
   */
  
 -#include <asm/unaligned.h>
 +#include <linux/unaligned.h>
  #include <linux/dma-mapping.h>
  #include <linux/module.h>
  #include <linux/platform_device.h>
@@@ -417,13 -417,6 +417,6 @@@ void ufshcd_mcq_make_queues_operational
  }
  EXPORT_SYMBOL_GPL(ufshcd_mcq_make_queues_operational);
  
- void ufshcd_mcq_enable_esi(struct ufs_hba *hba)
- {
-       ufshcd_writel(hba, ufshcd_readl(hba, REG_UFS_MEM_CFG) | 0x2,
-                     REG_UFS_MEM_CFG);
- }
- EXPORT_SYMBOL_GPL(ufshcd_mcq_enable_esi);
- 
  void ufshcd_mcq_enable(struct ufs_hba *hba)
  {
        ufshcd_rmwl(hba, MCQ_MODE_SELECT, MCQ_MODE_SELECT, REG_UFS_MEM_CFG);
@@@ -437,6 -430,13 +430,13 @@@ void ufshcd_mcq_disable(struct ufs_hba 
        hba->mcq_enabled = false;
  }
  
+ void ufshcd_mcq_enable_esi(struct ufs_hba *hba)
+ {
+       ufshcd_writel(hba, ufshcd_readl(hba, REG_UFS_MEM_CFG) | 0x2,
+                     REG_UFS_MEM_CFG);
+ }
+ EXPORT_SYMBOL_GPL(ufshcd_mcq_enable_esi);
+ 
  void ufshcd_mcq_config_esi(struct ufs_hba *hba, struct msi_msg *msg)
  {
        ufshcd_writel(hba, msg->address_lo, REG_UFS_ESILBA);
@@@ -539,7 -539,7 +539,7 @@@ int ufshcd_mcq_sq_cleanup(struct ufs_hb
        struct scsi_cmnd *cmd = lrbp->cmd;
        struct ufs_hw_queue *hwq;
        void __iomem *reg, *opr_sqd_base;
-       u32 nexus, id, val, rtc;
+       u32 nexus, id, val;
        int err;
  
        if (hba->quirks & UFSHCD_QUIRK_MCQ_BROKEN_RTC)
@@@ -573,14 -573,18 +573,18 @@@
        writel(readl(opr_sqd_base + REG_SQRTC) | SQ_ICU,
                opr_sqd_base + REG_SQRTC);
  
-       /* Poll SQRTSy.CUS = 1. Return result from SQRTSy.RTC */
+       /* Wait until SQRTSy.CUS = 1. Report SQRTSy.RTC. */
        reg = opr_sqd_base + REG_SQRTS;
        err = read_poll_timeout(readl, val, val & SQ_CUS, 20,
                                MCQ_POLL_US, false, reg);
-       rtc = FIELD_GET(SQ_ICU_ERR_CODE_MASK, readl(reg));
-       if (err || rtc)
-               dev_err(hba->dev, "%s: failed. hwq=%d, tag=%d err=%d RTC=%d\n",
-                       __func__, id, task_tag, err, rtc);
+       if (err)
+               dev_err(hba->dev, "%s: failed. hwq=%d, tag=%d err=%d\n",
+                       __func__, id, task_tag, err);
+       else
+               dev_info(hba->dev,
+                        "%s, hwq %d: cleanup return code (RTC) %ld\n",
+                        __func__, id,
+                        FIELD_GET(SQ_ICU_ERR_CODE_MASK, readl(reg)));
  
        if (ufshcd_mcq_sq_start(hba, hwq))
                err = -ETIMEDOUT;

diff --combined drivers/ufs/core/ufshcd.c
index abbe7135a9778773f43510feaf06775f2287302e,8135a6dad7c6fad7942f04540d1949588228d8d9..6a26853330763fde7026208211eccdd13e735a3a
--- 1/drivers/ufs/core/ufshcd.c
--- 2/drivers/ufs/core/ufshcd.c
+++ b/drivers/ufs/core/ufshcd.c
@@@ -36,7 -36,7 +36,7 @@@
  #include "ufs-fault-injection.h"
  #include "ufs_bsg.h"
  #include "ufshcd-crypto.h"
 -#include <asm/unaligned.h>
 +#include <linux/unaligned.h>
  
  #define CREATE_TRACE_POINTS
  #include "ufs_trace.h"
@@@ -298,6 -298,7 +298,7 @@@ static int ufshcd_reset_and_restore(str
  static int ufshcd_eh_host_reset_handler(struct scsi_cmnd *cmd);
  static int ufshcd_clear_tm_cmd(struct ufs_hba *hba, int tag);
  static void ufshcd_hba_exit(struct ufs_hba *hba);
+ static int ufshcd_device_init(struct ufs_hba *hba, bool init_dev_params);
  static int ufshcd_probe_hba(struct ufs_hba *hba, bool init_dev_params);
  static int ufshcd_setup_clocks(struct ufs_hba *hba, bool on);
  static inline void ufshcd_add_delay_before_dme_cmd(struct ufs_hba *hba);
@@@ -349,18 -350,6 +350,6 @@@ static void ufshcd_configure_wb(struct 
                ufshcd_wb_toggle_buf_flush(hba, true);
  }
  
- static void ufshcd_scsi_unblock_requests(struct ufs_hba *hba)
- {
-       if (atomic_dec_and_test(&hba->scsi_block_reqs_cnt))
-               scsi_unblock_requests(hba->host);
- }
- 
- static void ufshcd_scsi_block_requests(struct ufs_hba *hba)
- {
-       if (atomic_inc_return(&hba->scsi_block_reqs_cnt) == 1)
-               scsi_block_requests(hba->host);
- }
- 
  static void ufshcd_add_cmd_upiu_trace(struct ufs_hba *hba, unsigned int tag,
                                      enum ufs_trace_str_t str_t)
  {
@@@ -739,25 -728,15 +728,15 @@@ EXPORT_SYMBOL_GPL(ufshcd_delay_us)
   * Return: -ETIMEDOUT on error, zero on success.
   */
  static int ufshcd_wait_for_register(struct ufs_hba *hba, u32 reg, u32 mask,
-                               u32 val, unsigned long interval_us,
-                               unsigned long timeout_ms)
+                                   u32 val, unsigned long interval_us,
+                                   unsigned long timeout_ms)
  {
-       int err = 0;
-       unsigned long timeout = jiffies + msecs_to_jiffies(timeout_ms);
- 
-       /* ignore bits that we don't intend to wait on */
-       val = val & mask;
+       u32 v;
  
-       while ((ufshcd_readl(hba, reg) & mask) != val) {
-               usleep_range(interval_us, interval_us + 50);
-               if (time_after(jiffies, timeout)) {
-                       if ((ufshcd_readl(hba, reg) & mask) != val)
-                               err = -ETIMEDOUT;
-                       break;
-               }
-       }
+       val &= mask; /* ignore bits that we don't intend to wait on */
  
-       return err;
+       return read_poll_timeout(ufshcd_readl, v, (v & mask) == val,
+                                interval_us, timeout_ms * 1000, false, hba, reg);
  }
  
  /**
@@@ -1255,11 -1234,13 +1234,13 @@@ static bool ufshcd_is_devfreq_scaling_r
  static u32 ufshcd_pending_cmds(struct ufs_hba *hba)
  {
        const struct scsi_device *sdev;
+       unsigned long flags;
        u32 pending = 0;
  
-       lockdep_assert_held(hba->host->host_lock);
+       spin_lock_irqsave(hba->host->host_lock, flags);
        __shost_for_each_device(sdev, hba->host)
                pending += sbitmap_weight(&sdev->budget_map);
+       spin_unlock_irqrestore(hba->host->host_lock, flags);
  
        return pending;
  }
@@@ -1273,7 -1254,6 +1254,6 @@@
  static int ufshcd_wait_for_doorbell_clr(struct ufs_hba *hba,
                                        u64 wait_timeout_us)
  {
-       unsigned long flags;
        int ret = 0;
        u32 tm_doorbell;
        u32 tr_pending;
@@@ -1281,7 -1261,6 +1261,6 @@@
        ktime_t start;
  
        ufshcd_hold(hba);
-       spin_lock_irqsave(hba->host->host_lock, flags);
        /*
         * Wait for all the outstanding tasks/transfer requests.
         * Verify by checking the doorbell registers are clear.
@@@ -1302,7 -1281,6 +1281,6 @@@
                        break;
                }
  
-               spin_unlock_irqrestore(hba->host->host_lock, flags);
                io_schedule_timeout(msecs_to_jiffies(20));
                if (ktime_to_us(ktime_sub(ktime_get(), start)) >
                    wait_timeout_us) {
@@@ -1314,7 -1292,6 +1292,6 @@@
                         */
                        do_last_check = true;
                }
-               spin_lock_irqsave(hba->host->host_lock, flags);
        } while (tm_doorbell || tr_pending);
  
        if (timeout) {
@@@ -1324,7 -1301,6 +1301,6 @@@
                ret = -EBUSY;
        }
  out:
-       spin_unlock_irqrestore(hba->host->host_lock, flags);
        ufshcd_release(hba);
        return ret;
  }
@@@ -2411,8 -2387,6 +2387,6 @@@ static inline int ufshcd_hba_capabiliti
        int err;
  
        hba->capabilities = ufshcd_readl(hba, REG_CONTROLLER_CAPABILITIES);
-       if (hba->quirks & UFSHCD_QUIRK_BROKEN_64BIT_ADDRESS)
-               hba->capabilities &= ~MASK_64_ADDRESSING_SUPPORT;
  
        /* nutrs and nutmrs are 0 based values */
        hba->nutrs = (hba->capabilities & MASK_TRANSFER_REQUESTS_SLOTS_SDB) + 1;
@@@ -2551,13 -2525,11 +2525,11 @@@ ufshcd_wait_for_uic_cmd(struct ufs_hba 
   * __ufshcd_send_uic_cmd - Send UIC commands and retrieve the result
   * @hba: per adapter instance
   * @uic_cmd: UIC command
-  * @completion: initialize the completion only if this is set to true
   *
   * Return: 0 only if success.
   */
  static int
- __ufshcd_send_uic_cmd(struct ufs_hba *hba, struct uic_command *uic_cmd,
-                     bool completion)
+ __ufshcd_send_uic_cmd(struct ufs_hba *hba, struct uic_command *uic_cmd)
  {
        lockdep_assert_held(&hba->uic_cmd_mutex);
  
@@@ -2567,8 -2539,7 +2539,7 @@@
                return -EIO;
        }
  
-       if (completion)
-               init_completion(&uic_cmd->done);
+       init_completion(&uic_cmd->done);
  
        uic_cmd->cmd_active = 1;
        ufshcd_dispatch_uic_cmd(hba, uic_cmd);
@@@ -2594,7 -2565,7 +2565,7 @@@ int ufshcd_send_uic_cmd(struct ufs_hba 
        mutex_lock(&hba->uic_cmd_mutex);
        ufshcd_add_delay_before_dme_cmd(hba);
  
-       ret = __ufshcd_send_uic_cmd(hba, uic_cmd, true);
+       ret = __ufshcd_send_uic_cmd(hba, uic_cmd);
        if (!ret)
                ret = ufshcd_wait_for_uic_cmd(hba, uic_cmd);
  
@@@ -2775,7 -2746,6 +2746,6 @@@ void ufshcd_prepare_utp_scsi_cmd_upiu(s
        ucd_req_ptr->sc.exp_data_transfer_len = cpu_to_be32(cmd->sdb.length);
  
        cdb_len = min_t(unsigned short, cmd->cmd_len, UFS_CDB_SIZE);
-       memset(ucd_req_ptr->sc.cdb, 0, UFS_CDB_SIZE);
        memcpy(ucd_req_ptr->sc.cdb, cmd->cmnd, cdb_len);
  
        memset(lrbp->ucd_rsp_ptr, 0, sizeof(struct utp_upiu_rsp));
@@@ -2878,6 -2848,26 +2848,26 @@@ static void ufshcd_comp_scsi_upiu(struc
        ufshcd_prepare_utp_scsi_cmd_upiu(lrbp, upiu_flags);
  }
  
+ static void __ufshcd_setup_cmd(struct ufshcd_lrb *lrbp, struct scsi_cmnd *cmd, u8 lun, int tag)
+ {
+       memset(lrbp->ucd_req_ptr, 0, sizeof(*lrbp->ucd_req_ptr));
+ 
+       lrbp->cmd = cmd;
+       lrbp->task_tag = tag;
+       lrbp->lun = lun;
+       ufshcd_prepare_lrbp_crypto(cmd ? scsi_cmd_to_rq(cmd) : NULL, lrbp);
+ }
+ 
+ static void ufshcd_setup_scsi_cmd(struct ufs_hba *hba, struct ufshcd_lrb *lrbp,
+                                 struct scsi_cmnd *cmd, u8 lun, int tag)
+ {
+       __ufshcd_setup_cmd(lrbp, cmd, lun, tag);
+       lrbp->intr_cmd = !ufshcd_is_intr_aggr_allowed(hba);
+       lrbp->req_abort_skip = false;
+ 
+       ufshcd_comp_scsi_upiu(hba, lrbp);
+ }
+ 
  /**
   * ufshcd_upiu_wlun_to_scsi_wlun - maps UPIU W-LUN id to SCSI W-LUN ID
   * @upiu_wlun_id: UPIU W-LUN id
@@@ -3010,16 -3000,8 +3000,8 @@@ static int ufshcd_queuecommand(struct S
        ufshcd_hold(hba);
  
        lrbp = &hba->lrb[tag];
-       lrbp->cmd = cmd;
-       lrbp->task_tag = tag;
-       lrbp->lun = ufshcd_scsi_to_upiu_lun(cmd->device->lun);
-       lrbp->intr_cmd = !ufshcd_is_intr_aggr_allowed(hba);
  
-       ufshcd_prepare_lrbp_crypto(scsi_cmd_to_rq(cmd), lrbp);
- 
-       lrbp->req_abort_skip = false;
- 
-       ufshcd_comp_scsi_upiu(hba, lrbp);
+       ufshcd_setup_scsi_cmd(hba, lrbp, cmd, ufshcd_scsi_to_upiu_lun(cmd->device->lun), tag);
  
        err = ufshcd_map_sg(hba, lrbp);
        if (err) {
@@@ -3047,11 -3029,8 +3029,8 @@@ out
  static void ufshcd_setup_dev_cmd(struct ufs_hba *hba, struct ufshcd_lrb *lrbp,
                             enum dev_cmd_type cmd_type, u8 lun, int tag)
  {
-       lrbp->cmd = NULL;
-       lrbp->task_tag = tag;
-       lrbp->lun = lun;
+       __ufshcd_setup_cmd(lrbp, NULL, lun, tag);
        lrbp->intr_cmd = true; /* No interrupt aggregation */
-       ufshcd_prepare_lrbp_crypto(NULL, lrbp);
        hba->dev_cmd.type = cmd_type;
  }
  
@@@ -3083,7 -3062,6 +3062,6 @@@ bool ufshcd_cmd_inflight(struct scsi_cm
  static int ufshcd_clear_cmd(struct ufs_hba *hba, u32 task_tag)
  {
        u32 mask;
-       unsigned long flags;
        int err;
  
        if (hba->mcq_enabled) {
@@@ -3103,9 -3081,7 +3081,7 @@@
        mask = 1U << task_tag;
  
        /* clear outstanding transaction before retry */
-       spin_lock_irqsave(hba->host->host_lock, flags);
        ufshcd_utrl_clear(hba, mask);
-       spin_unlock_irqrestore(hba->host->host_lock, flags);
  
        /*
         * wait for h/w to clear corresponding bit in door-bell.
@@@ -4288,7 -4264,7 +4264,7 @@@ static int ufshcd_uic_pwr_ctrl(struct u
                reenable_intr = true;
        }
        spin_unlock_irqrestore(hba->host->host_lock, flags);
-       ret = __ufshcd_send_uic_cmd(hba, cmd, false);
+       ret = __ufshcd_send_uic_cmd(hba, cmd);
        if (ret) {
                dev_err(hba->dev,
                        "pwr ctrl cmd 0x%x with mode 0x%x uic error %d\n",
@@@ -4539,6 -4515,14 +4515,14 @@@ static int ufshcd_get_max_pwr_mode(stru
                return -EINVAL;
        }
  
+       if (pwr_info->lane_rx != pwr_info->lane_tx) {
+               dev_err(hba->dev, "%s: asymmetric connected lanes. rx=%d, tx=%d\n",
+                       __func__,
+                               pwr_info->lane_rx,
+                               pwr_info->lane_tx);
+               return -EINVAL;
+       }
+ 
        /*
         * First, get the maximum gears of HS speed.
         * If a zero value, it means there is no HSGEAR capability.
@@@ -4822,51 -4806,44 +4806,44 @@@ EXPORT_SYMBOL_GPL(ufshcd_hba_stop)
   */
  static int ufshcd_hba_execute_hce(struct ufs_hba *hba)
  {
-       int retry_outer = 3;
-       int retry_inner;
+       int retry;
  
- start:
-       if (ufshcd_is_hba_active(hba))
-               /* change controller state to "reset state" */
-               ufshcd_hba_stop(hba);
+       for (retry = 3; retry > 0; retry--) {
+               if (ufshcd_is_hba_active(hba))
+                       /* change controller state to "reset state" */
+                       ufshcd_hba_stop(hba);
  
-       /* UniPro link is disabled at this point */
-       ufshcd_set_link_off(hba);
+               /* UniPro link is disabled at this point */
+               ufshcd_set_link_off(hba);
  
-       ufshcd_vops_hce_enable_notify(hba, PRE_CHANGE);
+               ufshcd_vops_hce_enable_notify(hba, PRE_CHANGE);
  
-       /* start controller initialization sequence */
-       ufshcd_hba_start(hba);
+               /* start controller initialization sequence */
+               ufshcd_hba_start(hba);
  
-       /*
-        * To initialize a UFS host controller HCE bit must be set to 1.
-        * During initialization the HCE bit value changes from 1->0->1.
-        * When the host controller completes initialization sequence
-        * it sets the value of HCE bit to 1. The same HCE bit is read back
-        * to check if the controller has completed initialization sequence.
-        * So without this delay the value HCE = 1, set in the previous
-        * instruction might be read back.
-        * This delay can be changed based on the controller.
-        */
-       ufshcd_delay_us(hba->vps->hba_enable_delay_us, 100);
+               /*
+                * To initialize a UFS host controller HCE bit must be set to 1.
+                * During initialization the HCE bit value changes from 1->0->1.
+                * When the host controller completes initialization sequence
+                * it sets the value of HCE bit to 1. The same HCE bit is read back
+                * to check if the controller has completed initialization sequence.
+                * So without this delay the value HCE = 1, set in the previous
+                * instruction might be read back.
+                * This delay can be changed based on the controller.
+                */
+               ufshcd_delay_us(hba->vps->hba_enable_delay_us, 100);
  
-       /* wait for the host controller to complete initialization */
-       retry_inner = 50;
-       while (!ufshcd_is_hba_active(hba)) {
-               if (retry_inner) {
-                       retry_inner--;
-               } else {
-                       dev_err(hba->dev,
-                               "Controller enable failed\n");
-                       if (retry_outer) {
-                               retry_outer--;
-                               goto start;
-                       }
-                       return -EIO;
-               }
-               usleep_range(1000, 1100);
+               /* wait for the host controller to complete initialization */
+               if (!ufshcd_wait_for_register(hba, REG_CONTROLLER_ENABLE, CONTROLLER_ENABLE,
+                                             CONTROLLER_ENABLE, 1000, 50))
+                       break;
+ 
+               dev_err(hba->dev, "Enabling the controller failed\n");
        }
  
+       if (!retry)
+               return -EIO;
+ 
        /* enable UIC related interrupts */
        ufshcd_enable_intr(hba, UFSHCD_UIC_MASK);
  
@@@ -5258,6 -5235,9 +5235,9 @@@ static int ufshcd_device_configure(stru
         */
        sdev->silence_suspend = 1;
  
+       if (hba->vops && hba->vops->config_scsi_dev)
+               hba->vops->config_scsi_dev(sdev);
+ 
        ufshcd_crypto_register(hba, q);
  
        return 0;
@@@ -5478,32 -5458,37 +5458,37 @@@ static bool ufshcd_is_auto_hibern8_erro
  static irqreturn_t ufshcd_uic_cmd_compl(struct ufs_hba *hba, u32 intr_status)
  {
        irqreturn_t retval = IRQ_NONE;
+       struct uic_command *cmd;
  
        spin_lock(hba->host->host_lock);
+       cmd = hba->active_uic_cmd;
+       if (WARN_ON_ONCE(!cmd))
+               goto unlock;
+ 
        if (ufshcd_is_auto_hibern8_error(hba, intr_status))
                hba->errors |= (UFSHCD_UIC_HIBERN8_MASK & intr_status);
  
-       if ((intr_status & UIC_COMMAND_COMPL) && hba->active_uic_cmd) {
-               hba->active_uic_cmd->argument2 |=
-                       ufshcd_get_uic_cmd_result(hba);
-               hba->active_uic_cmd->argument3 =
-                       ufshcd_get_dme_attr_val(hba);
+       if (intr_status & UIC_COMMAND_COMPL) {
+               cmd->argument2 |= ufshcd_get_uic_cmd_result(hba);
+               cmd->argument3 = ufshcd_get_dme_attr_val(hba);
                if (!hba->uic_async_done)
-                       hba->active_uic_cmd->cmd_active = 0;
-               complete(&hba->active_uic_cmd->done);
+                       cmd->cmd_active = 0;
+               complete(&cmd->done);
                retval = IRQ_HANDLED;
        }
  
-       if ((intr_status & UFSHCD_UIC_PWR_MASK) && hba->uic_async_done) {
-               hba->active_uic_cmd->cmd_active = 0;
+       if (intr_status & UFSHCD_UIC_PWR_MASK && hba->uic_async_done) {
+               cmd->cmd_active = 0;
                complete(hba->uic_async_done);
                retval = IRQ_HANDLED;
        }
  
        if (retval == IRQ_HANDLED)
-               ufshcd_add_uic_command_trace(hba, hba->active_uic_cmd,
-                                            UFS_CMD_COMP);
+               ufshcd_add_uic_command_trace(hba, cmd, UFS_CMD_COMP);
+ 
+ unlock:
        spin_unlock(hba->host->host_lock);
+ 
        return retval;
  }
  
@@@ -6196,12 -6181,11 +6181,11 @@@ static void ufshcd_exception_event_hand
        u32 status = 0;
        hba = container_of(work, struct ufs_hba, eeh_work);
  
-       ufshcd_scsi_block_requests(hba);
        err = ufshcd_get_ee_status(hba, &status);
        if (err) {
                dev_err(hba->dev, "%s: failed to get exception status %d\n",
                                __func__, err);
-               goto out;
+               return;
        }
  
        trace_ufshcd_exception_event(dev_name(hba->dev), status);
@@@ -6213,8 -6197,6 +6197,6 @@@
                ufshcd_temp_exception_event_handler(hba, status);
  
        ufs_debugfs_exception_event(hba, status);
- out:
-       ufshcd_scsi_unblock_requests(hba);
  }
  
  /* Complete requests that have door-bell cleared */
@@@ -6380,15 -6362,14 +6362,14 @@@ static void ufshcd_err_handling_prepare
                        ufshcd_suspend_clkscaling(hba);
                ufshcd_clk_scaling_allow(hba, false);
        }
-       ufshcd_scsi_block_requests(hba);
        /* Wait for ongoing ufshcd_queuecommand() calls to finish. */
-       blk_mq_wait_quiesce_done(&hba->host->tag_set);
+       blk_mq_quiesce_tagset(&hba->host->tag_set);
        cancel_work_sync(&hba->eeh_work);
  }
  
  static void ufshcd_err_handling_unprepare(struct ufs_hba *hba)
  {
-       ufshcd_scsi_unblock_requests(hba);
+       blk_mq_unquiesce_tagset(&hba->host->tag_set);
        ufshcd_release(hba);
        if (ufshcd_is_clkscaling_supported(hba))
                ufshcd_clk_scaling_suspend(hba, false);
@@@ -7002,14 -6983,11 +6983,11 @@@ static int ufshcd_clear_tm_cmd(struct u
  {
        int err = 0;
        u32 mask = 1 << tag;
-       unsigned long flags;
  
        if (!test_bit(tag, &hba->outstanding_tasks))
                goto out;
  
-       spin_lock_irqsave(hba->host->host_lock, flags);
        ufshcd_utmrl_clear(hba, tag);
-       spin_unlock_irqrestore(hba->host->host_lock, flags);
  
        /* poll for max. 1 sec to clear door bell register by h/w */
        err = ufshcd_wait_for_register(hba,
@@@ -7052,12 -7030,13 +7030,13 @@@ static int __ufshcd_issue_tm_cmd(struc
        memcpy(hba->utmrdl_base_addr + task_tag, treq, sizeof(*treq));
        ufshcd_vops_setup_task_mgmt(hba, task_tag, tm_function);
  
-       /* send command to the controller */
        __set_bit(task_tag, &hba->outstanding_tasks);
-       ufshcd_writel(hba, 1 << task_tag, REG_UTP_TASK_REQ_DOOR_BELL);
  
        spin_unlock_irqrestore(host->host_lock, flags);
  
+       /* send command to the controller */
+       ufshcd_writel(hba, 1 << task_tag, REG_UTP_TASK_REQ_DOOR_BELL);
+ 
        ufshcd_add_tm_upiu_trace(hba, task_tag, UFS_TM_SEND);
  
        /* wait until the task management command is completed */
@@@ -7473,10 -7452,9 +7452,9 @@@ static void ufshcd_set_req_abort_skip(s
  int ufshcd_try_to_abort_task(struct ufs_hba *hba, int tag)
  {
        struct ufshcd_lrb *lrbp = &hba->lrb[tag];
-       int err = 0;
+       int err;
        int poll_cnt;
        u8 resp = 0xF;
-       u32 reg;
  
        for (poll_cnt = 100; poll_cnt; poll_cnt--) {
                err = ufshcd_issue_tm_cmd(hba, lrbp->lun, lrbp->task_tag,
@@@ -7491,46 -7469,27 +7469,27 @@@
                         * cmd not pending in the device, check if it is
                         * in transition.
                         */
-                       dev_err(hba->dev, "%s: cmd at tag %d not pending in the device.\n",
+                       dev_info(
+                               hba->dev,
+                               "%s: cmd with tag %d not pending in the device.\n",
                                __func__, tag);
-                       if (hba->mcq_enabled) {
-                               /* MCQ mode */
-                               if (ufshcd_cmd_inflight(lrbp->cmd)) {
-                                       /* sleep for max. 200us same delay as in SDB mode */
-                                       usleep_range(100, 200);
-                                       continue;
-                               }
-                               /* command completed already */
-                               dev_err(hba->dev, "%s: cmd at tag=%d is cleared.\n",
-                                       __func__, tag);
-                               goto out;
-                       }
- 
-                       /* Single Doorbell Mode */
-                       reg = ufshcd_readl(hba, REG_UTP_TRANSFER_REQ_DOOR_BELL);
-                       if (reg & (1 << tag)) {
-                               /* sleep for max. 200us to stabilize */
-                               usleep_range(100, 200);
-                               continue;
+                       if (!ufshcd_cmd_inflight(lrbp->cmd)) {
+                               dev_info(hba->dev,
+                                        "%s: cmd with tag=%d completed.\n",
+                                        __func__, tag);
+                               return 0;
                        }
-                       /* command completed already */
-                       dev_err(hba->dev, "%s: cmd at tag %d successfully cleared from DB.\n",
-                               __func__, tag);
-                       goto out;
+                       usleep_range(100, 200);
                } else {
                        dev_err(hba->dev,
                                "%s: no response from device. tag = %d, err %d\n",
                                __func__, tag, err);
-                       if (!err)
-                               err = resp; /* service response error */
-                       goto out;
+                       return err ? : resp;
                }
        }
  
-       if (!poll_cnt) {
-               err = -EBUSY;
-               goto out;
-       }
+       if (!poll_cnt)
+               return -EBUSY;
  
        err = ufshcd_issue_tm_cmd(hba, lrbp->lun, lrbp->task_tag,
                        UFS_ABORT_TASK, &resp);
@@@ -7540,7 -7499,7 +7499,7 @@@
                        dev_err(hba->dev, "%s: issued. tag = %d, err %d\n",
                                __func__, tag, err);
                }
-               goto out;
+               return err;
        }
  
        err = ufshcd_clear_cmd(hba, tag);
@@@ -7548,7 -7507,6 +7507,6 @@@
                dev_err(hba->dev, "%s: Failed clearing cmd at tag %d, err %d\n",
                        __func__, tag, err);
  
- out:
        return err;
  }
  
@@@ -7671,6 -7629,29 +7629,29 @@@ release
        return err;
  }
  
+ /**
+  * ufshcd_process_probe_result - Process the ufshcd_probe_hba() result.
+  * @hba: UFS host controller instance.
+  * @probe_start: time when the ufshcd_probe_hba() call started.
+  * @ret: ufshcd_probe_hba() return value.
+  */
+ static void ufshcd_process_probe_result(struct ufs_hba *hba,
+                                       ktime_t probe_start, int ret)
+ {
+       unsigned long flags;
+ 
+       spin_lock_irqsave(hba->host->host_lock, flags);
+       if (ret)
+               hba->ufshcd_state = UFSHCD_STATE_ERROR;
+       else if (hba->ufshcd_state == UFSHCD_STATE_RESET)
+               hba->ufshcd_state = UFSHCD_STATE_OPERATIONAL;
+       spin_unlock_irqrestore(hba->host->host_lock, flags);
+ 
+       trace_ufshcd_init(dev_name(hba->dev), ret,
+                         ktime_to_us(ktime_sub(ktime_get(), probe_start)),
+                         hba->curr_dev_pwr_mode, hba->uic_link_state);
+ }
+ 
  /**
   * ufshcd_host_reset_and_restore - reset and restore host controller
   * @hba: per-adapter instance
@@@ -7700,8 -7681,14 +7681,14 @@@ static int ufshcd_host_reset_and_restor
        err = ufshcd_hba_enable(hba);
  
        /* Establish the link again and restore the device */
-       if (!err)
-               err = ufshcd_probe_hba(hba, false);
+       if (!err) {
+               ktime_t probe_start = ktime_get();
+ 
+               err = ufshcd_device_init(hba, /*init_dev_params=*/false);
+               if (!err)
+                       err = ufshcd_probe_hba(hba, false);
+               ufshcd_process_probe_result(hba, probe_start, err);
+       }
  
        if (err)
                dev_err(hba->dev, "%s: Host init failed %d\n", __func__, err);
@@@ -8727,10 -8714,43 +8714,43 @@@ static void ufshcd_config_mcq(struct uf
                 hba->nutrs);
  }
  
+ static int ufshcd_post_device_init(struct ufs_hba *hba)
+ {
+       int ret;
+ 
+       ufshcd_tune_unipro_params(hba);
+ 
+       /* UFS device is also active now */
+       ufshcd_set_ufs_dev_active(hba);
+       ufshcd_force_reset_auto_bkops(hba);
+ 
+       ufshcd_set_timestamp_attr(hba);
+ 
+       if (!hba->max_pwr_info.is_valid)
+               return 0;
+ 
+       /*
+        * Set the right value to bRefClkFreq before attempting to
+        * switch to HS gears.
+        */
+       if (hba->dev_ref_clk_freq != REF_CLK_FREQ_INVAL)
+               ufshcd_set_dev_ref_clk(hba);
+       /* Gear up to HS gear. */
+       ret = ufshcd_config_pwr_mode(hba, &hba->max_pwr_info.info);
+       if (ret) {
+               dev_err(hba->dev, "%s: Failed setting power mode, err = %d\n",
+                       __func__, ret);
+               return ret;
+       }
+ 
+       return 0;
+ }
+ 
  static int ufshcd_device_init(struct ufs_hba *hba, bool init_dev_params)
  {
        int ret;
-       struct Scsi_Host *host = hba->host;
+ 
+       WARN_ON_ONCE(!hba->scsi_host_added);
  
        hba->ufshcd_state = UFSHCD_STATE_RESET;
  
@@@ -8771,56 -8791,14 +8791,14 @@@
                ret = ufshcd_device_params_init(hba);
                if (ret)
                        return ret;
-               if (is_mcq_supported(hba) && !hba->scsi_host_added) {
-                       ufshcd_mcq_enable(hba);
-                       ret = ufshcd_alloc_mcq(hba);
-                       if (!ret) {
-                               ufshcd_config_mcq(hba);
-                       } else {
-                               /* Continue with SDB mode */
-                               ufshcd_mcq_disable(hba);
-                               use_mcq_mode = false;
-                               dev_err(hba->dev, "MCQ mode is disabled, err=%d\n",
-                                        ret);
-                       }
-                       ret = scsi_add_host(host, hba->dev);
-                       if (ret) {
-                               dev_err(hba->dev, "scsi_add_host failed\n");
-                               return ret;
-                       }
-                       hba->scsi_host_added = true;
-               } else if (is_mcq_supported(hba)) {
-                       /* UFSHCD_QUIRK_REINIT_AFTER_MAX_GEAR_SWITCH is set */
+               if (is_mcq_supported(hba) &&
+                   hba->quirks & UFSHCD_QUIRK_REINIT_AFTER_MAX_GEAR_SWITCH) {
                        ufshcd_config_mcq(hba);
                        ufshcd_mcq_enable(hba);
                }
        }
  
-       ufshcd_tune_unipro_params(hba);
- 
-       /* UFS device is also active now */
-       ufshcd_set_ufs_dev_active(hba);
-       ufshcd_force_reset_auto_bkops(hba);
- 
-       ufshcd_set_timestamp_attr(hba);
- 
-       /* Gear up to HS gear if supported */
-       if (hba->max_pwr_info.is_valid) {
-               /*
-                * Set the right value to bRefClkFreq before attempting to
-                * switch to HS gears.
-                */
-               if (hba->dev_ref_clk_freq != REF_CLK_FREQ_INVAL)
-                       ufshcd_set_dev_ref_clk(hba);
-               ret = ufshcd_config_pwr_mode(hba, &hba->max_pwr_info.info);
-               if (ret) {
-                       dev_err(hba->dev, "%s: Failed setting power mode, err = %d\n",
-                                       __func__, ret);
-                       return ret;
-               }
-       }
- 
-       return 0;
+       return ufshcd_post_device_init(hba);
  }
  
  /**
@@@ -8834,14 -8812,8 +8812,8 @@@
   */
  static int ufshcd_probe_hba(struct ufs_hba *hba, bool init_dev_params)
  {
-       ktime_t start = ktime_get();
-       unsigned long flags;
        int ret;
  
-       ret = ufshcd_device_init(hba, init_dev_params);
-       if (ret)
-               goto out;
- 
        if (!hba->pm_op_in_progress &&
            (hba->quirks & UFSHCD_QUIRK_REINIT_AFTER_MAX_GEAR_SWITCH)) {
                /* Reset the device and controller before doing reinit */
@@@ -8854,13 -8826,13 +8826,13 @@@
                        dev_err(hba->dev, "Host controller enable failed\n");
                        ufshcd_print_evt_hist(hba);
                        ufshcd_print_host_state(hba);
-                       goto out;
+                       return ret;
                }
  
                /* Reinit the device */
                ret = ufshcd_device_init(hba, init_dev_params);
                if (ret)
-                       goto out;
+                       return ret;
        }
  
        ufshcd_print_pwr_info(hba);
@@@ -8880,18 -8852,7 +8852,7 @@@
                ufshcd_write_ee_control(hba);
        ufshcd_configure_auto_hibern8(hba);
  
- out:
-       spin_lock_irqsave(hba->host->host_lock, flags);
-       if (ret)
-               hba->ufshcd_state = UFSHCD_STATE_ERROR;
-       else if (hba->ufshcd_state == UFSHCD_STATE_RESET)
-               hba->ufshcd_state = UFSHCD_STATE_OPERATIONAL;
-       spin_unlock_irqrestore(hba->host->host_lock, flags);
- 
-       trace_ufshcd_init(dev_name(hba->dev), ret,
-               ktime_to_us(ktime_sub(ktime_get(), start)),
-               hba->curr_dev_pwr_mode, hba->uic_link_state);
-       return ret;
+       return 0;
  }
  
  /**
@@@ -8902,11 -8863,14 +8863,14 @@@
  static void ufshcd_async_scan(void *data, async_cookie_t cookie)
  {
        struct ufs_hba *hba = (struct ufs_hba *)data;
+       ktime_t probe_start;
        int ret;
  
        down(&hba->host_sem);
        /* Initialize hba, detect and initialize UFS device */
+       probe_start = ktime_get();
        ret = ufshcd_probe_hba(hba, true);
+       ufshcd_process_probe_result(hba, probe_start, ret);
        up(&hba->host_sem);
        if (ret)
                goto out;
@@@ -10309,6 -10273,8 +10273,8 @@@ EXPORT_SYMBOL_GPL(ufshcd_dealloc_host)
   */
  static int ufshcd_set_dma_mask(struct ufs_hba *hba)
  {
+       if (hba->vops && hba->vops->set_dma_mask)
+               return hba->vops->set_dma_mask(hba);
        if (hba->capabilities & MASK_64_ADDRESSING_SUPPORT) {
                if (!dma_set_mask_and_coherent(hba->dev, DMA_BIT_MASK(64)))
                        return 0;
@@@ -10372,6 -10338,74 +10338,74 @@@ static const struct blk_mq_ops ufshcd_t
        .queue_rq = ufshcd_queue_tmf,
  };
  
+ static int ufshcd_add_scsi_host(struct ufs_hba *hba)
+ {
+       int err;
+ 
+       if (is_mcq_supported(hba)) {
+               ufshcd_mcq_enable(hba);
+               err = ufshcd_alloc_mcq(hba);
+               if (!err) {
+                       ufshcd_config_mcq(hba);
+               } else {
+                       /* Continue with SDB mode */
+                       ufshcd_mcq_disable(hba);
+                       use_mcq_mode = false;
+                       dev_err(hba->dev, "MCQ mode is disabled, err=%d\n",
+                               err);
+               }
+       }
+       if (!is_mcq_supported(hba) && !hba->lsdb_sup) {
+               dev_err(hba->dev,
+                       "%s: failed to initialize (legacy doorbell mode not supported)\n",
+                       __func__);
+               return -EINVAL;
+       }
+ 
+       err = scsi_add_host(hba->host, hba->dev);
+       if (err) {
+               dev_err(hba->dev, "scsi_add_host failed\n");
+               return err;
+       }
+       hba->scsi_host_added = true;
+ 
+       hba->tmf_tag_set = (struct blk_mq_tag_set) {
+               .nr_hw_queues   = 1,
+               .queue_depth    = hba->nutmrs,
+               .ops            = &ufshcd_tmf_ops,
+               .flags          = BLK_MQ_F_NO_SCHED,
+       };
+       err = blk_mq_alloc_tag_set(&hba->tmf_tag_set);
+       if (err < 0)
+               goto remove_scsi_host;
+       hba->tmf_queue = blk_mq_alloc_queue(&hba->tmf_tag_set, NULL, NULL);
+       if (IS_ERR(hba->tmf_queue)) {
+               err = PTR_ERR(hba->tmf_queue);
+               goto free_tmf_tag_set;
+       }
+       hba->tmf_rqs = devm_kcalloc(hba->dev, hba->nutmrs,
+                                   sizeof(*hba->tmf_rqs), GFP_KERNEL);
+       if (!hba->tmf_rqs) {
+               err = -ENOMEM;
+               goto free_tmf_queue;
+       }
+ 
+       return 0;
+ 
+ free_tmf_queue:
+       blk_mq_destroy_queue(hba->tmf_queue);
+       blk_put_queue(hba->tmf_queue);
+ 
+ free_tmf_tag_set:
+       blk_mq_free_tag_set(&hba->tmf_tag_set);
+ 
+ remove_scsi_host:
+       if (hba->scsi_host_added)
+               scsi_remove_host(hba->host);
+ 
+       return err;
+ }
+ 
  /**
   * ufshcd_init - Driver initialization routine
   * @hba: per-adapter instance
@@@ -10503,42 -10537,6 +10537,6 @@@ int ufshcd_init(struct ufs_hba *hba, vo
                hba->is_irq_enabled = true;
        }
  
-       if (!is_mcq_supported(hba)) {
-               if (!hba->lsdb_sup) {
-                       dev_err(hba->dev, "%s: failed to initialize (legacy doorbell mode not supported)\n",
-                               __func__);
-                       err = -EINVAL;
-                       goto out_disable;
-               }
-               err = scsi_add_host(host, hba->dev);
-               if (err) {
-                       dev_err(hba->dev, "scsi_add_host failed\n");
-                       goto out_disable;
-               }
-               hba->scsi_host_added = true;
-       }
- 
-       hba->tmf_tag_set = (struct blk_mq_tag_set) {
-               .nr_hw_queues   = 1,
-               .queue_depth    = hba->nutmrs,
-               .ops            = &ufshcd_tmf_ops,
-               .flags          = BLK_MQ_F_NO_SCHED,
-       };
-       err = blk_mq_alloc_tag_set(&hba->tmf_tag_set);
-       if (err < 0)
-               goto out_remove_scsi_host;
-       hba->tmf_queue = blk_mq_alloc_queue(&hba->tmf_tag_set, NULL, NULL);
-       if (IS_ERR(hba->tmf_queue)) {
-               err = PTR_ERR(hba->tmf_queue);
-               goto free_tmf_tag_set;
-       }
-       hba->tmf_rqs = devm_kcalloc(hba->dev, hba->nutmrs,
-                                   sizeof(*hba->tmf_rqs), GFP_KERNEL);
-       if (!hba->tmf_rqs) {
-               err = -ENOMEM;
-               goto free_tmf_queue;
-       }
- 
        /* Reset the attached device */
        ufshcd_device_reset(hba);
  
@@@ -10550,7 -10548,7 +10548,7 @@@
                dev_err(hba->dev, "Host controller enable failed\n");
                ufshcd_print_evt_hist(hba);
                ufshcd_print_host_state(hba);
-               goto free_tmf_queue;
+               goto out_disable;
        }
  
        /*
@@@ -10576,7 -10574,7 +10574,7 @@@
  
        /* Hold auto suspend until async scan completes */
        pm_runtime_get_sync(dev);
-       atomic_set(&hba->scsi_block_reqs_cnt, 0);
+ 
        /*
         * We are assuming that device wasn't put in sleep/power-down
         * state exclusively during the boot stage before kernel.
@@@ -10585,6 -10583,49 +10583,49 @@@
         */
        ufshcd_set_ufs_dev_active(hba);
  
+       /* Initialize hba, detect and initialize UFS device */
+       ktime_t probe_start = ktime_get();
+ 
+       hba->ufshcd_state = UFSHCD_STATE_RESET;
+ 
+       err = ufshcd_link_startup(hba);
+       if (err)
+               goto out_disable;
+ 
+       if (hba->quirks & UFSHCD_QUIRK_SKIP_PH_CONFIGURATION)
+               goto initialized;
+ 
+       /* Debug counters initialization */
+       ufshcd_clear_dbg_ufs_stats(hba);
+ 
+       /* UniPro link is active now */
+       ufshcd_set_link_active(hba);
+ 
+       /* Verify device initialization by sending NOP OUT UPIU */
+       err = ufshcd_verify_dev_init(hba);
+       if (err)
+               goto out_disable;
+ 
+       /* Initiate UFS initialization, and waiting until completion */
+       err = ufshcd_complete_dev_init(hba);
+       if (err)
+               goto out_disable;
+ 
+       err = ufshcd_device_params_init(hba);
+       if (err)
+               goto out_disable;
+ 
+       err = ufshcd_post_device_init(hba);
+ 
+ initialized:
+       ufshcd_process_probe_result(hba, probe_start, err);
+       if (err)
+               goto out_disable;
+ 
+       err = ufshcd_add_scsi_host(hba);
+       if (err)
+               goto out_disable;
+ 
        async_schedule(ufshcd_async_scan, hba);
        ufs_sysfs_add_nodes(hba->dev);
  
@@@ -10592,14 -10633,6 +10633,6 @@@
        ufshcd_pm_qos_init(hba);
        return 0;
  
- free_tmf_queue:
-       blk_mq_destroy_queue(hba->tmf_queue);
-       blk_put_queue(hba->tmf_queue);
- free_tmf_tag_set:
-       blk_mq_free_tag_set(&hba->tmf_tag_set);
- out_remove_scsi_host:
-       if (hba->scsi_host_added)
-               scsi_remove_host(hba->host);
  out_disable:
        hba->is_irq_enabled = false;
        ufshcd_hba_exit(hba);

diff --combined drivers/ufs/host/ufs-exynos.c
index 5867e6338562333e57b5c555f9ef265988931ce5,91827b3e582bb92dcf0125fd0d27047a9baef214..6548f7a8562fb83b822087fd60373ec533f087ad
--- 1/drivers/ufs/host/ufs-exynos.c
--- 2/drivers/ufs/host/ufs-exynos.c
+++ b/drivers/ufs/host/ufs-exynos.c
@@@ -8,7 -8,7 +8,7 @@@
   *
   */
  
 -#include <asm/unaligned.h>
 +#include <linux/unaligned.h>
  #include <crypto/aes.h>
  #include <linux/arm-smccc.h>
  #include <linux/clk.h>
@@@ -48,6 -48,8 +48,8 @@@
  #define HCI_UNIPRO_APB_CLK_CTRL       0x68
  #define UNIPRO_APB_CLK(v, x)  (((v) & ~0xF) | ((x) & 0xF))
  #define HCI_AXIDMA_RWDATA_BURST_LEN   0x6C
+ #define WLU_EN                        BIT(31)
+ #define WLU_BURST_LEN(x)      ((x) << 27 | ((x) & 0xF))
  #define HCI_GPIO_OUT          0x70
  #define HCI_ERR_EN_PA_LAYER   0x78
  #define HCI_ERR_EN_DL_LAYER   0x7C
@@@ -74,6 -76,10 +76,10 @@@
  #define CLK_CTRL_EN_MASK      (REFCLK_CTRL_EN |\
                                 UNIPRO_PCLK_CTRL_EN |\
                                 UNIPRO_MCLK_CTRL_EN)
+ 
+ #define HCI_IOP_ACG_DISABLE   0x100
+ #define HCI_IOP_ACG_DISABLE_EN        BIT(0)
+ 
  /* Device fatal error */
  #define DFES_ERR_EN           BIT(31)
  #define DFES_DEF_L2_ERRS      (UIC_DATA_LINK_LAYER_ERROR_RX_BUF_OF |\
@@@ -198,15 -204,8 +204,8 @@@ static inline void exynos_ufs_ungate_cl
        exynos_ufs_ctrl_clkstop(ufs, false);
  }
  
- static int exynos7_ufs_drv_init(struct device *dev, struct exynos_ufs *ufs)
- {
-       return 0;
- }
- 
- static int exynosauto_ufs_drv_init(struct device *dev, struct exynos_ufs *ufs)
+ static int exynos_ufs_shareability(struct exynos_ufs *ufs)
  {
-       struct exynos_ufs_uic_attr *attr = ufs->drv_data->uic_attr;
- 
        /* IO Coherency setting */
        if (ufs->sysreg) {
                return regmap_update_bits(ufs->sysreg,
@@@ -214,11 -213,32 +213,32 @@@
                                          UFS_SHARABLE, UFS_SHARABLE);
        }
  
-       attr->tx_dif_p_nsec = 3200000;
- 
        return 0;
  }
  
+ static int gs101_ufs_drv_init(struct exynos_ufs *ufs)
+ {
+       struct ufs_hba *hba = ufs->hba;
+       u32 reg;
+ 
+       /* Enable WriteBooster */
+       hba->caps |= UFSHCD_CAP_WB_EN;
+ 
+       /* Enable clock gating and hibern8 */
+       hba->caps |= UFSHCD_CAP_CLK_GATING | UFSHCD_CAP_HIBERN8_WITH_CLK_GATING;
+ 
+       /* set ACG to be controlled by UFS_ACG_DISABLE */
+       reg = hci_readl(ufs, HCI_IOP_ACG_DISABLE);
+       hci_writel(ufs, reg & (~HCI_IOP_ACG_DISABLE_EN), HCI_IOP_ACG_DISABLE);
+ 
+       return exynos_ufs_shareability(ufs);
+ }
+ 
+ static int exynosauto_ufs_drv_init(struct exynos_ufs *ufs)
+ {
+       return exynos_ufs_shareability(ufs);
+ }
+ 
  static int exynosauto_ufs_post_hce_enable(struct exynos_ufs *ufs)
  {
        struct ufs_hba *hba = ufs->hba;
@@@ -546,6 -566,9 +566,9 @@@ static void exynos_ufs_specify_phy_time
        struct exynos_ufs_uic_attr *attr = ufs->drv_data->uic_attr;
        struct ufs_phy_time_cfg *t_cfg = &ufs->t_cfg;
  
+       if (ufs->opts & EXYNOS_UFS_OPT_SKIP_CONFIG_PHY_ATTR)
+               return;
+ 
        t_cfg->tx_linereset_p =
                exynos_ufs_calc_time_cntr(ufs, attr->tx_dif_p_nsec);
        t_cfg->tx_linereset_n =
@@@ -724,6 -747,9 +747,9 @@@ static void exynos_ufs_config_smu(struc
  {
        u32 reg, val;
  
+       if (ufs->opts & EXYNOS_UFS_OPT_UFSPR_SECURE)
+               return;
+ 
        exynos_ufs_disable_auto_ctrl_hcc_save(ufs, &val);
  
        /* make encryption disabled by default */
@@@ -771,6 -797,21 +797,21 @@@ static void exynos_ufs_config_sync_patt
        exynos_ufs_disable_ov_tm(hba);
  }
  
+ #define UFS_HW_VER_MAJOR_MASK   GENMASK(15, 8)
+ 
+ static u32 exynos_ufs_get_hs_gear(struct ufs_hba *hba)
+ {
+       u8 major;
+ 
+       major = FIELD_GET(UFS_HW_VER_MAJOR_MASK, hba->ufs_version);
+ 
+       if (major >= 3)
+               return UFS_HS_G4;
+ 
+       /* Default is HS-G3 */
+       return UFS_HS_G3;
+ }
+ 
  static int exynos_ufs_pre_pwr_mode(struct ufs_hba *hba,
                                struct ufs_pa_layer_attr *dev_max_params,
                                struct ufs_pa_layer_attr *dev_req_params)
@@@ -788,6 -829,10 +829,10 @@@
  
        ufshcd_init_host_params(&host_params);
  
+       /* This driver only support symmetric gear setting e.g. hs_tx_gear == hs_rx_gear */
+       host_params.hs_tx_gear = exynos_ufs_get_hs_gear(hba);
+       host_params.hs_rx_gear = exynos_ufs_get_hs_gear(hba);
+ 
        ret = ufshcd_negotiate_pwr_params(&host_params, dev_max_params, dev_req_params);
        if (ret) {
                pr_err("%s: failed to determine capabilities\n", __func__);
@@@ -1429,7 -1474,7 +1474,7 @@@ static int exynos_ufs_init(struct ufs_h
        exynos_ufs_fmp_init(hba, ufs);
  
        if (ufs->drv_data->drv_init) {
-               ret = ufs->drv_data->drv_init(dev, ufs);
+               ret = ufs->drv_data->drv_init(ufs);
                if (ret) {
                        dev_err(dev, "failed to init drv-data\n");
                        goto out;
@@@ -1440,8 -1485,8 +1485,8 @@@
        if (ret)
                goto out;
        exynos_ufs_specify_phy_time_attr(ufs);
-       if (!(ufs->opts & EXYNOS_UFS_OPT_UFSPR_SECURE))
-               exynos_ufs_config_smu(ufs);
+ 
+       exynos_ufs_config_smu(ufs);
  
        hba->host->dma_alignment = DATA_UNIT_SIZE - 1;
        return 0;
@@@ -1484,12 -1529,12 +1529,12 @@@ static void exynos_ufs_dev_hw_reset(str
        hci_writel(ufs, 1 << 0, HCI_GPIO_OUT);
  }
  
- static void exynos_ufs_pre_hibern8(struct ufs_hba *hba, u8 enter)
+ static void exynos_ufs_pre_hibern8(struct ufs_hba *hba, enum uic_cmd_dme cmd)
  {
        struct exynos_ufs *ufs = ufshcd_get_variant(hba);
        struct exynos_ufs_uic_attr *attr = ufs->drv_data->uic_attr;
  
-       if (!enter) {
+       if (cmd == UIC_CMD_DME_HIBER_EXIT) {
                if (ufs->opts & EXYNOS_UFS_OPT_BROKEN_AUTO_CLK_CTRL)
                        exynos_ufs_disable_auto_ctrl_hcc(ufs);
                exynos_ufs_ungate_clks(ufs);
@@@ -1517,30 -1562,11 +1562,11 @@@
        }
  }
  
- static void exynos_ufs_post_hibern8(struct ufs_hba *hba, u8 enter)
+ static void exynos_ufs_post_hibern8(struct ufs_hba *hba, enum uic_cmd_dme cmd)
  {
        struct exynos_ufs *ufs = ufshcd_get_variant(hba);
  
-       if (!enter) {
-               u32 cur_mode = 0;
-               u32 pwrmode;
- 
-               if (ufshcd_is_hs_mode(&ufs->dev_req_params))
-                       pwrmode = FAST_MODE;
-               else
-                       pwrmode = SLOW_MODE;
- 
-               ufshcd_dme_get(hba, UIC_ARG_MIB(PA_PWRMODE), &cur_mode);
-               if (cur_mode != (pwrmode << 4 | pwrmode)) {
-                       dev_warn(hba->dev, "%s: power mode change\n", __func__);
-                       hba->pwr_info.pwr_rx = (cur_mode >> 4) & 0xf;
-                       hba->pwr_info.pwr_tx = cur_mode & 0xf;
-                       ufshcd_config_pwr_mode(hba, &hba->max_pwr_info.info);
-               }
- 
-               if (!(ufs->opts & EXYNOS_UFS_OPT_SKIP_CONNECTION_ESTAB))
-                       exynos_ufs_establish_connt(ufs);
-       } else {
+       if (cmd == UIC_CMD_DME_HIBER_ENTER) {
                ufs->entry_hibern8_t = ktime_get();
                exynos_ufs_gate_clks(ufs);
                if (ufs->opts & EXYNOS_UFS_OPT_BROKEN_AUTO_CLK_CTRL)
@@@ -1627,15 -1653,15 +1653,15 @@@ static int exynos_ufs_pwr_change_notify
  }
  
  static void exynos_ufs_hibern8_notify(struct ufs_hba *hba,
-                                    enum uic_cmd_dme enter,
+                                    enum uic_cmd_dme cmd,
                                     enum ufs_notify_change_status notify)
  {
        switch ((u8)notify) {
        case PRE_CHANGE:
-               exynos_ufs_pre_hibern8(hba, enter);
+               exynos_ufs_pre_hibern8(hba, cmd);
                break;
        case POST_CHANGE:
-               exynos_ufs_post_hibern8(hba, enter);
+               exynos_ufs_post_hibern8(hba, cmd);
                break;
        }
  }
@@@ -1891,6 -1917,12 +1917,12 @@@ static int gs101_ufs_post_link(struct e
  {
        struct ufs_hba *hba = ufs->hba;
  
+       /*
+        * Enable Write Line Unique. This field has to be 0x3
+        * to support Write Line Unique transaction on gs101.
+        */
+       hci_writel(ufs, WLU_EN | WLU_BURST_LEN(3), HCI_AXIDMA_RWDATA_BURST_LEN);
+ 
        exynos_ufs_enable_dbg_mode(hba);
        ufshcd_dme_set(hba, UIC_ARG_MIB(PA_SAVECONFIGTIME), 0x3e8);
        exynos_ufs_disable_dbg_mode(hba);
@@@ -2036,7 -2068,6 +2068,6 @@@ static const struct exynos_ufs_drv_dat
                                  EXYNOS_UFS_OPT_BROKEN_RX_SEL_IDX |
                                  EXYNOS_UFS_OPT_SKIP_CONNECTION_ESTAB |
                                  EXYNOS_UFS_OPT_USE_SW_HIBERN8_TIMER,
-       .drv_init               = exynos7_ufs_drv_init,
        .pre_link               = exynos7_ufs_pre_link,
        .post_link              = exynos7_ufs_post_link,
        .pre_pwr_change         = exynos7_ufs_pre_pwr_change,
@@@ -2045,26 -2076,6 +2076,6 @@@
  
  static struct exynos_ufs_uic_attr gs101_uic_attr = {
        .tx_trailingclks                = 0xff,
-       .tx_dif_p_nsec                  = 3000000,      /* unit: ns */
-       .tx_dif_n_nsec                  = 1000000,      /* unit: ns */
-       .tx_high_z_cnt_nsec             = 20000,        /* unit: ns */
-       .tx_base_unit_nsec              = 100000,       /* unit: ns */
-       .tx_gran_unit_nsec              = 4000,         /* unit: ns */
-       .tx_sleep_cnt                   = 1000,         /* unit: ns */
-       .tx_min_activatetime            = 0xa,
-       .rx_filler_enable               = 0x2,
-       .rx_dif_p_nsec                  = 1000000,      /* unit: ns */
-       .rx_hibern8_wait_nsec           = 4000000,      /* unit: ns */
-       .rx_base_unit_nsec              = 100000,       /* unit: ns */
-       .rx_gran_unit_nsec              = 4000,         /* unit: ns */
-       .rx_sleep_cnt                   = 1280,         /* unit: ns */
-       .rx_stall_cnt                   = 320,          /* unit: ns */
-       .rx_hs_g1_sync_len_cap          = SYNC_LEN_COARSE(0xf),
-       .rx_hs_g2_sync_len_cap          = SYNC_LEN_COARSE(0xf),
-       .rx_hs_g3_sync_len_cap          = SYNC_LEN_COARSE(0xf),
-       .rx_hs_g1_prep_sync_len_cap     = PREP_LEN(0xf),
-       .rx_hs_g2_prep_sync_len_cap     = PREP_LEN(0xf),
-       .rx_hs_g3_prep_sync_len_cap     = PREP_LEN(0xf),
        .pa_dbg_opt_suite1_val          = 0x90913C1C,
        .pa_dbg_opt_suite1_off          = PA_GS101_DBG_OPTION_SUITE1,
        .pa_dbg_opt_suite2_val          = 0xE01C115F,
@@@ -2122,11 -2133,10 +2133,10 @@@ static const struct exynos_ufs_drv_dat
                                  UFSHCD_QUIRK_BROKEN_OCS_FATAL_ERROR |
                                  UFSHCI_QUIRK_SKIP_MANUAL_WB_FLUSH_CTRL |
                                  UFSHCD_QUIRK_SKIP_DEF_UNIPRO_TIMEOUT_SETTING,
-       .opts                   = EXYNOS_UFS_OPT_BROKEN_AUTO_CLK_CTRL |
-                                 EXYNOS_UFS_OPT_SKIP_CONFIG_PHY_ATTR |
+       .opts                   = EXYNOS_UFS_OPT_SKIP_CONFIG_PHY_ATTR |
                                  EXYNOS_UFS_OPT_UFSPR_SECURE |
                                  EXYNOS_UFS_OPT_TIMER_TICK_SELECT,
-       .drv_init               = exynosauto_ufs_drv_init,
+       .drv_init               = gs101_ufs_drv_init,
        .pre_link               = gs101_ufs_pre_link,
        .post_link              = gs101_ufs_post_link,
        .pre_pwr_change         = gs101_ufs_pre_pwr_change,