Merge tag 'char-misc-5.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

Pull char/misc driver updates from Greg KH:
 "Here is the big set of char/misc/other driver patches for 5.7-rc1.

  Lots of things in here, and it's later than expected due to some
  reverts to resolve some reported issues. All is now clean with no
  reported problems in linux-next.

  Included in here is:
   - interconnect updates
   - mei driver updates
   - uio updates
   - nvmem driver updates
   - soundwire updates
   - binderfs updates
   - coresight updates
   - habanalabs updates
   - mhi new bus type and core
   - extcon driver updates
   - some Kconfig cleanups
   - other small misc driver cleanups and updates

  As mentioned, all have been in linux-next for a while, and with the
  last two reverts, all is calm and good"

* tag 'char-misc-5.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (174 commits)
  Revert "driver core: platform: Initialize dma_parms for platform devices"
  Revert "amba: Initialize dma_parms for amba devices"
  amba: Initialize dma_parms for amba devices
  driver core: platform: Initialize dma_parms for platform devices
  bus: mhi: core: Drop the references to mhi_dev in mhi_destroy_device()
  bus: mhi: core: Initialize bhie field in mhi_cntrl for RDDM capture
  bus: mhi: core: Add support for reading MHI info from device
  misc: rtsx: set correct pcr_ops for rts522A
  speakup: misc: Use dynamic minor numbers for speakup devices
  mei: me: add cedar fork device ids
  coresight: do not use the BIT() macro in the UAPI header
  Documentation: provide IBM contacts for embargoed hardware
  nvmem: core: remove nvmem_sysfs_get_groups()
  nvmem: core: use is_bin_visible for permissions
  nvmem: core: use device_register and device_unregister
  nvmem: core: add root_only member to nvmem device struct
  extcon: axp288: Add wakeup support
  extcon: Mark extcon_get_edev_name() function as exported symbol
  extcon: palmas: Hide error messages if gpio returns -EPROBE_DEFER
  dt-bindings: extcon: usbc-cros-ec: convert extcon-usbc-cros-ec.txt to yaml format
  ...

diff --combined Documentation/index.rst
index 01795a40da295bef6542b07c9e1a784f7911aa22,edc9b211bbff263ef6faa115ad9a4f2dde69e645..9599c0f3eea8c9f316f3ee5f18818d9b62dc333e
--- 1/Documentation/index.rst
--- 2/Documentation/index.rst
+++ b/Documentation/index.rst
@@@ -99,7 -99,6 +99,7 @@@ needed)
     accounting/index
     block/index
     cdrom/index
 +   cpu-freq/index
     ide/index
     fb/index
     fpga/index
@@@ -131,9 -130,10 +131,10 @@@
     bpf/index
     usb/index
     PCI/index
 +   scsi/index
     misc-devices/index
 -   mic/index
     scheduler/index
+    mhi/index
  
  Architecture-agnostic documentation
  -----------------------------------

diff --combined MAINTAINERS
index eeff5556075973dfef52b22b43025f60b9a4e9c3,023a35950eb3eced050d31ec7734cee00bac154d..901a6f806887ed571bc85ec10c62b661ddec1783
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -176,7 -176,7 +176,7 @@@ L: [email protected]
  S:    Maintained
  F:    net/6lowpan/
  F:    include/net/6lowpan.h
 -F:    Documentation/networking/6lowpan.txt
 +F:    Documentation/networking/6lowpan.rst
  
  6PACK NETWORK DRIVER FOR AX.25
  M:    Andreas Koensgen <[email protected]>
@@@ -214,7 -214,7 +214,7 @@@ Q: http://patchwork.kernel.org/project/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git
  T:    git git://github.com/martinetd/linux.git
  S:    Maintained
 -F:    Documentation/filesystems/9p.txt
 +F:    Documentation/filesystems/9p.rst
  F:    fs/9p/
  F:    net/9p/
  F:    include/net/9p/
@@@ -236,7 -236,7 +236,7 @@@ M: Adaptec OEM Raid Solutions <aacraid@
  L:    [email protected]
  W:    http://www.adaptec.com/
  S:    Supported
 -F:    Documentation/scsi/aacraid.txt
 +F:    Documentation/scsi/aacraid.rst
  F:    drivers/scsi/aacraid/
  
  ABI/API
@@@ -303,8 -303,8 +303,8 @@@ F: drivers/net/ethernet/alteon/acenic
  ACER ASPIRE ONE TEMPERATURE AND FAN DRIVER
  M:    Peter Kaestle <[email protected]>
  L:    [email protected]
 -W:    http://piie.net/?section=acerhdf
  S:    Maintained
 +W:    http://piie.net/?section=acerhdf
  F:    drivers/platform/x86/acerhdf.c
  
  ACER WMI LAPTOP EXTRAS
@@@ -540,7 -540,7 +540,7 @@@ M: Matthew Wilcox <[email protected]
  M:    Hannes Reinecke <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/scsi/advansys.txt
 +F:    Documentation/scsi/advansys.rst
  F:    drivers/scsi/advansys.c
  
  ADXL34X THREE-AXIS DIGITAL ACCELEROMETER DRIVER (ADXL345/ADXL346)
@@@ -584,7 -584,7 +584,7 @@@ AFFS FILE SYSTE
  M:    David Sterba <[email protected]>
  L:    [email protected]
  S:    Odd Fixes
 -F:    Documentation/filesystems/affs.txt
 +F:    Documentation/filesystems/affs.rst
  F:    fs/affs/
  
  AFS FILESYSTEM
@@@ -593,7 -593,7 +593,7 @@@ L: [email protected]
  S:    Supported
  F:    fs/afs/
  F:    include/trace/events/afs.h
 -F:    Documentation/filesystems/afs.txt
 +F:    Documentation/filesystems/afs.rst
  W:    https://www.infradead.org/~dhowells/kafs/
  
  AGPGART DRIVER
@@@ -931,14 -931,6 +931,14 @@@ S:       Supporte
  F:    drivers/iio/adc/ad7124.c
  F:    Documentation/devicetree/bindings/iio/adc/adi,ad7124.yaml
  
 +ANALOG DEVICES INC AD7192 DRIVER
 +M:    Alexandru Tachici <[email protected]>
 +L:    [email protected]
 +W:    http://ez.analog.com/community/linux-device-drivers
 +S:    Supported
 +F:    drivers/iio/adc/ad7192.c
 +F:    Documentation/devicetree/bindings/iio/adc/adi,ad7192.yaml
 +
  ANALOG DEVICES INC AD7292 DRIVER
  M:    Marcelo Schmitt <[email protected]>
  L:    [email protected]
@@@ -1089,15 -1081,6 +1089,15 @@@ F:    drivers/iio/adc/ltc249
  X:    drivers/iio/*/adjd*
  F:    drivers/staging/iio/*/ad*
  
 +ANALOG DEVICES INC HMC425A DRIVER
 +M:    Beniamin Bia <[email protected]>
 +M:    Michael Hennerich <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +W:    http://ez.analog.com/community/linux-device-drivers
 +F:    Documentation/devicetree/bindings/iio/amplifiers/adi,hmc425a.yaml
 +F:    drivers/iio/amplifiers/hmc425a.c
 +
  ANALOGBITS PLL LIBRARIES
  M:    Paul Walmsley <[email protected]>
  S:    Supported
@@@ -1693,12 -1676,15 +1693,15 @@@ F:   arch/arm/mach-ep93xx/micro9.
  ARM/CORESIGHT FRAMEWORK AND DRIVERS
  M:    Mathieu Poirier <[email protected]>
  R:    Suzuki K Poulose <[email protected]>
+ R:    Mike Leach <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    drivers/hwtracing/coresight/*
+ F:    include/dt-bindings/arm/coresight-cti-dt.h
  F:    Documentation/trace/coresight/*
  F:    Documentation/devicetree/bindings/arm/coresight.txt
  F:    Documentation/devicetree/bindings/arm/coresight-cpu-debug.txt
+ F:    Documentation/devicetree/bindings/arm/coresight-cti.yaml
  F:    Documentation/ABI/testing/sysfs-bus-coresight-devices-*
  F:    tools/perf/arch/arm/util/pmu.c
  F:    tools/perf/arch/arm/util/auxtrace.c
@@@ -1945,7 -1931,7 +1948,7 @@@ F:      Documentation/devicetree/bindings/i2
  F:    arch/arm/boot/dts/lpc43*
  F:    drivers/i2c/busses/i2c-lpc2k.c
  F:    drivers/memory/pl172.c
 -F:    drivers/mtd/spi-nor/nxp-spifi.c
 +F:    drivers/mtd/spi-nor/controllers/nxp-spifi.c
  F:    drivers/rtc/rtc-lpc24xx.c
  N:    lpc18xx
  
@@@ -2291,9 -2277,8 +2294,9 @@@ L:      [email protected]
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git
  S:    Maintained
 -F:    Documentation/devicetree/bindings/i2c/i2c-rk3x.txt
 +F:    Documentation/devicetree/bindings/i2c/i2c-rk3x.yaml
  F:    Documentation/devicetree/bindings/mmc/rockchip-dw-mshc.yaml
 +F:    Documentation/devicetree/bindings/spi/spi-rockchip.yaml
  F:    arch/arm/boot/dts/rk3*
  F:    arch/arm/boot/dts/rv1108*
  F:    arch/arm/mach-rockchip/
@@@ -2564,9 -2549,9 +2567,9 @@@ M:      Masahiro Yamada <yamada.masahiro@soc
  L:    [email protected] (moderated for non-subscribers)
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier.git
  S:    Maintained
 -F:    Documentation/devicetree/bindings/arm/socionext/uniphier.txt
 -F:    Documentation/devicetree/bindings/gpio/gpio-uniphier.txt
 -F:    Documentation/devicetree/bindings/pinctrl/socionext,uniphier-pinctrl.txt
 +F:    Documentation/devicetree/bindings/arm/socionext/uniphier.yaml
 +F:    Documentation/devicetree/bindings/gpio/socionext,uniphier-gpio.yaml
 +F:    Documentation/devicetree/bindings/pinctrl/socionext,uniphier-pinctrl.yaml
  F:    arch/arm/boot/dts/uniphier*
  F:    arch/arm/include/asm/hardware/cache-uniphier.h
  F:    arch/arm/mach-uniphier/
@@@ -2743,8 -2728,8 +2746,8 @@@ L:      [email protected] (moder
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected]
  S:    Maintained
 -F:    drivers/pinctrl/aspeed/
  F:    Documentation/devicetree/bindings/pinctrl/aspeed,*
 +F:    drivers/pinctrl/aspeed/
  
  ASPEED SCU INTERRUPT CONTROLLER DRIVER
  M:    Eddie James <[email protected]>
@@@ -2766,8 -2751,8 +2769,8 @@@ ASUS NOTEBOOKS AND EEEPC ACPI/WMI EXTRA
  M:    Corentin Chary <[email protected]>
  L:    [email protected]
  L:    [email protected]
 -W:    http://acpi4asus.sf.net
  S:    Maintained
 +W:    http://acpi4asus.sf.net
  F:    drivers/platform/x86/asus*.c
  F:    drivers/platform/x86/eeepc*.c
  
@@@ -2975,14 -2960,6 +2978,14 @@@ S:    Maintaine
  F:    Documentation/devicetree/bindings/sound/axentia,*
  F:    sound/soc/atmel/tse850-pcm5142.c
  
 +AXI-FAN-CONTROL HARDWARE MONITOR DRIVER
 +M:    Nuno Sá <[email protected]>
 +W:    http://ez.analog.com/community/linux-device-drivers
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/hwmon/axi-fan-control.c
 +F:    Documentation/devicetree/bindings/hwmon/adi,axi-fan-control.yaml
 +
  AXXIA I2C CONTROLLER
  M:    Krzysztof Adamski <[email protected]>
  L:    [email protected]
@@@ -3089,7 -3066,7 +3092,7 @@@ M:      Luis de Bethencourt <[email protected]
  M:    Salah Triki <[email protected]>
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/luisbg/linux-befs.git
 -F:    Documentation/filesystems/befs.txt
 +F:    Documentation/filesystems/befs.rst
  F:    fs/befs/
  
  BFQ I/O SCHEDULER
@@@ -3103,7 -3080,7 +3106,7 @@@ F:      Documentation/block/bfq-iosched.rs
  BFS FILE SYSTEM
  M:    "Tigran A. Aivazian" <[email protected]>
  S:    Maintained
 -F:    Documentation/filesystems/bfs.txt
 +F:    Documentation/filesystems/bfs.rst
  F:    fs/bfs/
  F:    include/uapi/linux/bfs_fs.h
  
@@@ -3173,8 -3150,6 +3176,8 @@@ R:      Martin KaFai Lau <[email protected]
  R:    Song Liu <[email protected]>
  R:    Yonghong Song <[email protected]>
  R:    Andrii Nakryiko <[email protected]>
 +R:    John Fastabend <[email protected]>
 +R:    KP Singh <[email protected]>
  L:    [email protected]
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git
@@@ -3241,22 -3216,11 +3244,22 @@@ L:   [email protected]
  S:    Maintained
  F:    arch/powerpc/net/
  
 -BPF JIT for RISC-V (RV64G)
 +BPF JIT for RISC-V (32-bit)
 +M:    Luke Nelson <[email protected]>
 +M:    Xi Wang <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    arch/riscv/net/
 +X:    arch/riscv/net/bpf_jit_comp64.c
 +
 +BPF JIT for RISC-V (64-bit)
  M:    Björn Töpel <[email protected]>
  L:    [email protected]
 +L:    [email protected]
  S:    Maintained
  F:    arch/riscv/net/
 +X:    arch/riscv/net/bpf_jit_comp32.c
  
  BPF JIT for S390
  M:    Ilya Leoshkevich <[email protected]>
@@@ -3470,7 -3434,7 +3473,7 @@@ L:      [email protected]
  L:    [email protected]
  S:    Supported
  F:    drivers/i2c/busses/i2c-brcmstb.c
 -F:    Documentation/devicetree/bindings/i2c/i2c-brcmstb.txt
 +F:    Documentation/devicetree/bindings/i2c/brcm,brcmstb-i2c.yaml
  
  BROADCOM BRCMSTB USB2 and USB3 PHY DRIVER
  M:    Al Cooper <[email protected]>
@@@ -3649,7 -3613,7 +3652,7 @@@ W:      http://btrfs.wiki.kernel.org
  Q:    http://patchwork.kernel.org/project/linux-btrfs/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git
  S:    Maintained
 -F:    Documentation/filesystems/btrfs.txt
 +F:    Documentation/filesystems/btrfs.rst
  F:    fs/btrfs/
  F:    include/linux/btrfs*
  F:    include/uapi/linux/btrfs*
@@@ -3946,7 -3910,7 +3949,7 @@@ W:      http://ceph.com
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client.git
  T:    git git://github.com/ceph/ceph-client.git
  S:    Supported
 -F:    Documentation/filesystems/ceph.txt
 +F:    Documentation/filesystems/ceph.rst
  F:    fs/ceph/
  
  CERTIFICATE HANDLING
@@@ -3959,6 -3923,11 +3962,6 @@@ F:     certs
  F:    scripts/sign-file.c
  F:    scripts/extract-cert.c
  
 -CERTIFIED WIRELESS USB (WUSB) SUBSYSTEM
 -L:    [email protected]
 -S:    Obsolete
 -F:    drivers/staging/wusbcore/
 -
  CFAG12864B LCD DRIVER
  M:    Miguel Ojeda Sandonis <[email protected]>
  S:    Maintained
@@@ -4055,8 -4024,8 +4058,8 @@@ F:      Documentation/devicetree/bindings/so
  F:    sound/soc/codecs/cros_ec_codec.*
  
  CIRRUS LOGIC AUDIO CODEC DRIVERS
 -M:    Brian Austin <brian.austi[email protected]>
 -M:    Paul Handrigan <Paul.Handrigan@cirrus.com>
 +M:    James Schulman <james.schulma[email protected]>
 +M:    David Rhodes <david.rhodes@cirrus.com>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    sound/soc/codecs/cs*
@@@ -4152,7 -4121,6 +4155,7 @@@ B:      https://github.com/ClangBuiltLinux/l
  C:    irc://chat.freenode.net/clangbuiltlinux
  S:    Supported
  K:    \b(?i:clang|llvm)\b
 +F:    Documentation/kbuild/llvm.rst
  
  CLEANCACHE API
  M:    Konrad Rzeszutek Wilk <[email protected]>
@@@ -4458,7 -4426,7 +4461,7 @@@ F:      include/linux/cpuidle.
  CRAMFS FILESYSTEM
  M:    Nicolas Pitre <[email protected]>
  S:    Maintained
 -F:    Documentation/filesystems/cramfs.txt
 +F:    Documentation/filesystems/cramfs.rst
  F:    fs/cramfs/
  
  CREATIVE SB0540
@@@ -4577,9 -4545,7 +4580,9 @@@ S:      Supporte
  F:    drivers/scsi/cxgbi/cxgb3i
  
  CXGB4 CRYPTO DRIVER (chcr)
 -M:    Atul Gupta <[email protected]>
 +M:    Ayush Sawal <[email protected]>
 +M:    Vinay Kumar Yadav <[email protected]>
 +M:    Rohit Maheshwari <[email protected]>
  L:    [email protected]
  W:    http://www.chelsio.com
  S:    Supported
@@@ -4718,7 -4684,7 +4721,7 @@@ L:      [email protected]
  W:    http://twibble.org/dist/dc395x/
  W:    http://lists.twibble.org/mailman/listinfo/dc395x/
  S:    Maintained
 -F:    Documentation/scsi/dc395x.txt
 +F:    Documentation/scsi/dc395x.rst
  F:    drivers/scsi/dc395x.*
  
  DCCP PROTOCOL
@@@ -4760,6 -4726,26 +4763,6 @@@ S:     Maintaine
  F:    drivers/media/platform/sunxi/sun8i-di/
  F:    Documentation/devicetree/bindings/media/allwinner,sun8i-h3-deinterlace.yaml
  
 -DELL SMBIOS DRIVER
 -M:    Pali Rohár <[email protected]>
 -M:    Mario Limonciello <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/platform/x86/dell-smbios.*
 -
 -DELL SMBIOS SMM DRIVER
 -M:    Mario Limonciello <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/platform/x86/dell-smbios-smm.c
 -
 -DELL SMBIOS WMI DRIVER
 -M:    Mario Limonciello <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/platform/x86/dell-smbios-wmi.c
 -F:    tools/wmi/dell-smbios-example.c
 -
  DEFZA FDDI NETWORK DRIVER
  M:    "Maciej W. Rozycki" <[email protected]>
  S:    Maintained
@@@ -4782,37 -4768,17 +4785,37 @@@ M:   Pali Rohár <[email protected]
  S:    Maintained
  F:    drivers/platform/x86/dell-rbtn.*
  
 +DELL LAPTOP SMM DRIVER
 +M:    Pali Rohár <[email protected]>
 +S:    Maintained
 +F:    drivers/hwmon/dell-smm-hwmon.c
 +F:    include/uapi/linux/i8k.h
 +
  DELL REMOTE BIOS UPDATE DRIVER
  M:    Stuart Hayes <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/platform/x86/dell_rbu.c
  
 -DELL LAPTOP SMM DRIVER
 +DELL SMBIOS DRIVER
  M:    Pali Rohár <[email protected]>
 +M:    Mario Limonciello <[email protected]>
 +L:    [email protected]
  S:    Maintained
 -F:    drivers/hwmon/dell-smm-hwmon.c
 -F:    include/uapi/linux/i8k.h
 +F:    drivers/platform/x86/dell-smbios.*
 +
 +DELL SMBIOS SMM DRIVER
 +M:    Mario Limonciello <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/platform/x86/dell-smbios-smm.c
 +
 +DELL SMBIOS WMI DRIVER
 +M:    Mario Limonciello <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/platform/x86/dell-smbios-wmi.c
 +F:    tools/wmi/dell-smbios-example.c
  
  DELL SYSTEMS MANAGEMENT BASE DRIVER (dcdbas)
  M:    Stuart Hayes <[email protected]>
@@@ -4821,17 -4787,17 +4824,17 @@@ S:   Maintaine
  F:    Documentation/driver-api/dcdbas.rst
  F:    drivers/platform/x86/dcdbas.*
  
 +DELL WMI DESCRIPTOR DRIVER
 +M:    Mario Limonciello <[email protected]>
 +S:    Maintained
 +F:    drivers/platform/x86/dell-wmi-descriptor.c
 +
  DELL WMI NOTIFICATIONS DRIVER
  M:    Matthew Garrett <[email protected]>
  M:    Pali Rohár <[email protected]>
  S:    Maintained
  F:    drivers/platform/x86/dell-wmi.c
  
 -DELL WMI DESCRIPTOR DRIVER
 -M:    Mario Limonciello <[email protected]>
 -S:    Maintained
 -F:    drivers/platform/x86/dell-wmi-descriptor.c
 -
  DELTA ST MEDIA DRIVER
  M:    Hugues Fruchet <[email protected]>
  L:    [email protected]
@@@ -4958,7 -4924,6 +4961,7 @@@ F:      drivers/leds/leds-da90??.
  F:    drivers/mfd/da903x.c
  F:    drivers/mfd/da90??-*.c
  F:    drivers/mfd/da91??-*.c
 +F:    drivers/pinctrl/pinctrl-da90??.c
  F:    drivers/power/supply/da9052-battery.c
  F:    drivers/power/supply/da91??-*.c
  F:    drivers/regulator/da903x.c
@@@ -5059,7 -5024,7 +5062,7 @@@ L:      [email protected]
  L:    [email protected] (moderated for non-subscribers)
  F:    drivers/dma-buf/
  F:    include/linux/dma-buf*
 -F:    include/linux/reservation.h
 +F:    include/linux/dma-resv.h
  F:    include/linux/*fence.h
  F:    Documentation/driver-api/dma-buf.rst
  K:    dma_(buf|fence|resv)
@@@ -5239,7 -5204,7 +5242,7 @@@ M:      Greg Kroah-Hartman <gregkh@linuxfoun
  R:    "Rafael J. Wysocki" <[email protected]>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git
  S:    Supported
 -F:    Documentation/kobject.txt
 +F:    Documentation/core-api/kobject.rst
  F:    drivers/base/
  F:    fs/debugfs/
  F:    fs/sysfs/
@@@ -5300,12 -5265,6 +5303,12 @@@ T:    git git://anongit.freedesktop.org/dr
  S:    Maintained
  F:    drivers/gpu/drm/tve200/
  
 +DRM DRIVER FOR FEIXIN K101 IM2BA02 MIPI-DSI LCD PANELS
 +M:    Icenowy Zheng <[email protected]>
 +S:    Maintained
 +F:    drivers/gpu/drm/panel/panel-feixin-k101-im2ba02.c
 +F:    Documentation/devicetree/bindings/display/panel/feixin,k101-im2ba02.yaml
 +
  DRM DRIVER FOR FEIYANG FY07024DI26A30-D MIPI-DSI LCD PANELS
  M:    Jagan Teki <[email protected]>
  S:    Maintained
@@@ -5325,13 -5284,6 +5328,13 @@@ S:    Maintaine
  F:    drivers/gpu/drm/tiny/ili9225.c
  F:    Documentation/devicetree/bindings/display/ilitek,ili9225.txt
  
 +DRM DRIVER FOR ILITEK ILI9486 PANELS
 +M:    Kamlesh Gurudasani <[email protected]>
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
 +S:    Maintained
 +F:    drivers/gpu/drm/tiny/ili9486.c
 +F:    Documentation/devicetree/bindings/display/ilitek,ili9486.yaml
 +
  DRM DRIVER FOR HX8357D PANELS
  M:    Eric Anholt <[email protected]>
  T:    git git://anongit.freedesktop.org/drm/drm-misc
@@@ -5373,13 -5325,6 +5376,13 @@@ F:    drivers/gpu/drm/msm
  F:    include/uapi/drm/msm_drm.h
  F:    Documentation/devicetree/bindings/display/msm/
  
 +DRM DRIVER FOR NOVATEK NT35510 PANELS
 +M:    Linus Walleij <[email protected]>
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
 +S:    Maintained
 +F:    drivers/gpu/drm/panel/panel-novatek-nt35510.c
 +F:    Documentation/devicetree/bindings/display/panel/novatek,nt35510.yaml
 +
  DRM DRIVER FOR NVIDIA GEFORCE/QUADRO GPUS
  M:    Ben Skeggs <[email protected]>
  L:    [email protected]
@@@ -5467,7 -5412,7 +5470,7 @@@ M:      David Lechner <[email protected]
  T:    git git://anongit.freedesktop.org/drm/drm-misc
  S:    Maintained
  F:    drivers/gpu/drm/tiny/st7735r.c
 -F:    Documentation/devicetree/bindings/display/sitronix,st7735r.txt
 +F:    Documentation/devicetree/bindings/display/sitronix,st7735r.yaml
  
  DRM DRIVER FOR SONY ACX424AKP PANELS
  M:    Linus Walleij <[email protected]>
@@@ -5547,7 -5492,6 +5550,7 @@@ F:      include/linux/vga
  DRM DRIVERS AND MISC GPU PATCHES
  M:    Maarten Lankhorst <[email protected]>
  M:    Maxime Ripard <[email protected]>
 +M:    Thomas Zimmermann <[email protected]>
  W:    https://01.org/linuxgraphics/gfx-docs/maintainer-tools/drm-misc.html
  S:    Maintained
  T:    git git://anongit.freedesktop.org/drm/drm-misc
@@@ -5627,6 -5571,7 +5630,6 @@@ S:      Supporte
  F:    drivers/gpu/drm/fsl-dcu/
  F:    Documentation/devicetree/bindings/display/fsl,dcu.txt
  F:    Documentation/devicetree/bindings/display/fsl,tcon.txt
 -F:    Documentation/devicetree/bindings/display/panel/nec,nl4827hc19-05b.txt
  T:    git git://anongit.freedesktop.org/drm/drm-misc
  
  DRM DRIVERS FOR FREESCALE IMX
@@@ -5645,13 -5590,12 +5648,13 @@@ S:   Maintaine
  F:    drivers/gpu/drm/gma500/
  
  DRM DRIVERS FOR HISILICON
 -M:    Xinliang Liu <[email protected]>
 +M:    Xinliang Liu <[email protected]>
  M:    Rongrong Zou <[email protected]>
 +R:    John Stultz <[email protected]>
  R:    Xinwei Kong <[email protected]>
  R:    Chen Feng <[email protected]>
  L:    [email protected]
 -T:    git git://github.com/xin3liang/linux.git
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
  S:    Maintained
  F:    drivers/gpu/drm/hisilicon/
  F:    Documentation/devicetree/bindings/display/hisilicon/
@@@ -5666,7 -5610,7 +5669,7 @@@ F:      include/uapi/drm/lima_drm.
  T:    git git://anongit.freedesktop.org/drm/drm-misc
  
  DRM DRIVERS FOR MEDIATEK
 -M:    CK Hu <[email protected]>
 +M:    Chun-Kuang Hu <[email protected]>
  M:    Philipp Zabel <[email protected]>
  L:    [email protected]
  S:    Supported
@@@ -5743,17 -5687,6 +5746,17 @@@ S:    Maintaine
  F:    drivers/gpu/drm/omapdrm/
  F:    Documentation/devicetree/bindings/display/ti/
  
 +DRM DRIVERS FOR TI KEYSTONE
 +M:    Jyri Sarha <[email protected]>
 +M:    Tomi Valkeinen <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/gpu/drm/tidss/
 +F:    Documentation/devicetree/bindings/display/ti/ti,k2g-dss.yaml
 +F:    Documentation/devicetree/bindings/display/ti/ti,am65x-dss.yaml
 +F:    Documentation/devicetree/bindings/display/ti/ti,j721e-dss.yaml
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
 +
  DRM DRIVERS FOR V3D
  M:    Eric Anholt <[email protected]>
  S:    Supported
@@@ -5780,7 -5713,7 +5783,7 @@@ L:      [email protected]
  S:    Maintained
  F:    drivers/gpu/drm/etnaviv/
  F:    include/uapi/drm/etnaviv_drm.h
 -F:    Documentation/devicetree/bindings/display/etnaviv/
 +F:    Documentation/devicetree/bindings/gpu/vivante,gc.yaml
  
  DRM DRIVERS FOR ZTE ZX
  M:    Shawn Guo <[email protected]>
@@@ -6008,7 -5941,7 +6011,7 @@@ W:      http://ecryptfs.or
  W:    https://launchpad.net/ecryptfs
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git
  S:    Odd Fixes
 -F:    Documentation/filesystems/ecryptfs.txt
 +F:    Documentation/filesystems/ecryptfs.rst
  F:    fs/ecryptfs/
  
  EDAC-AMD64
@@@ -6068,12 -6001,6 +6071,12 @@@ F:    Documentation/driver-api/edac.rs
  F:    drivers/edac/
  F:    include/linux/edac.h
  
 +EDAC-DMC520
 +M:    Lei Wang <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/edac/dmc520_edac.c
 +
  EDAC-E752X
  M:    Mark Gross <[email protected]>
  L:    [email protected]
@@@ -6324,12 -6251,12 +6327,12 @@@ F:   drivers/video/fbdev/s1d13xxxfb.
  F:    include/video/s1d13xxxfb.h
  
  EROFS FILE SYSTEM
 -M:    Gao Xiang <[email protected]>
 +M:    Gao Xiang <[email protected]>
  M:    Chao Yu <[email protected]>
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git
 -F:    Documentation/filesystems/erofs.txt
 +F:    Documentation/filesystems/erofs.rst
  F:    fs/erofs/
  F:    include/trace/events/erofs.h
  
@@@ -6380,11 -6307,17 +6383,11 @@@ F:   include/trace/events/mdio.
  F:    include/uapi/linux/mdio.h
  F:    include/uapi/linux/mii.h
  
 -EXFAT FILE SYSTEM
 -M:    Valdis Kletnieks <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/staging/exfat/
 -
  EXT2 FILE SYSTEM
  M:    Jan Kara <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/filesystems/ext2.txt
 +F:    Documentation/filesystems/ext2.rst
  F:    fs/ext2/
  F:    include/linux/ext2*
  
@@@ -6412,6 -6345,7 +6415,6 @@@ T:      git git://git.kernel.org/pub/scm/lin
  S:    Maintained
  F:    Documentation/admin-guide/efi-stub.rst
  F:    arch/*/kernel/efi.c
 -F:    arch/x86/boot/compressed/eboot.[ch]
  F:    arch/*/include/asm/efi.h
  F:    arch/x86/platform/efi/
  F:    drivers/firmware/efi/
@@@ -6457,7 -6391,7 +6460,7 @@@ L:      [email protected]
  W:    https://f2fs.wiki.kernel.org/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git
  S:    Maintained
 -F:    Documentation/filesystems/f2fs.txt
 +F:    Documentation/filesystems/f2fs.rst
  F:    Documentation/ABI/testing/sysfs-fs-f2fs
  F:    fs/f2fs/
  F:    include/linux/f2fs_fs.h
@@@ -6927,13 -6861,6 +6930,13 @@@ S:    Maintaine
  F:    drivers/i2c/busses/i2c-fsi.c
  F:    Documentation/devicetree/bindings/i2c/i2c-fsi.txt
  
 +FSI-ATTACHED SPI DRIVER
 +M:    Eddie James <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/spi/spi-fsi.c
 +F:    Documentation/devicetree/bindings/fsi/ibm,fsi2spi.yaml
 +
  FSNOTIFY: FILESYSTEM NOTIFICATION INFRASTRUCTURE
  M:    Jan Kara <[email protected]>
  R:    Amir Goldstein <[email protected]>
@@@ -7009,7 -6936,7 +7012,7 @@@ S:      Maintaine
  F:    scripts/gcc-plugins/
  F:    scripts/gcc-plugin.sh
  F:    scripts/Makefile.gcc-plugins
 -F:    Documentation/core-api/gcc-plugins.rst
 +F:    Documentation/kbuild/gcc-plugins.rst
  
  GASKET DRIVER FRAMEWORK
  M:    Rob Springer <[email protected]>
@@@ -7423,8 -7350,8 +7426,8 @@@ F:      drivers/media/usb/hackrf
  HARD DRIVE ACTIVE PROTECTION SYSTEM (HDAPS) DRIVER
  M:    Frank Seidel <[email protected]>
  L:    [email protected]
 -W:    http://www.kernel.org/pub/linux/kernel/people/fseidel/hdaps/
  S:    Maintained
 +W:    http://www.kernel.org/pub/linux/kernel/people/fseidel/hdaps/
  F:    drivers/platform/x86/hdaps.c
  
  HARDWARE MONITORING
@@@ -7491,7 -7418,7 +7494,7 @@@ M:      Don Brace <[email protected]
  L:    [email protected]
  L:    [email protected]
  S:    Supported
 -F:    Documentation/scsi/hpsa.txt
 +F:    Documentation/scsi/hpsa.rst
  F:    drivers/scsi/hpsa*.[ch]
  F:    include/linux/cciss*.h
  F:    include/uapi/linux/cciss*.h
@@@ -7506,13 -7433,13 +7509,13 @@@ F:   drivers/infiniband/hw/hfi
  HFS FILESYSTEM
  L:    [email protected]
  S:    Orphan
 -F:    Documentation/filesystems/hfs.txt
 +F:    Documentation/filesystems/hfs.rst
  F:    fs/hfs/
  
  HFSPLUS FILESYSTEM
  L:    [email protected]
  S:    Orphan
 -F:    Documentation/filesystems/hfsplus.txt
 +F:    Documentation/filesystems/hfsplus.rst
  F:    fs/hfsplus/
  
  HGA FRAMEBUFFER DRIVER
@@@ -7580,7 -7507,7 +7583,7 @@@ HIGHPOINT ROCKETRAID 3xxx RAID DRIVE
  M:    HighPoint Linux Team <[email protected]>
  W:    http://www.highpoint-tech.com
  S:    Supported
 -F:    Documentation/scsi/hptiop.txt
 +F:    Documentation/scsi/hptiop.rst
  F:    drivers/scsi/hptiop.c
  
  HIPPI
@@@ -7592,12 -7519,6 +7595,12 @@@ F:    include/uapi/linux/if_hippi.
  F:    net/802/hippi.c
  F:    drivers/net/hippi/
  
 +HISILICON DMA DRIVER
 +M:    Zhou Wang <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/dma/hisi_dma.c
 +
  HISILICON SECURITY ENGINE V2 DRIVER (SEC2)
  M:    Zaibo Xu <[email protected]>
  L:    [email protected]
@@@ -7655,8 -7576,7 +7658,8 @@@ F:      Documentation/admin-guide/perf/hisi-
  
  HISILICON ROCE DRIVER
  M:    Lijun Ou <[email protected]>
 -M:    Wei Hu(Xavier) <[email protected]>
 +M:    Wei Hu(Xavier) <[email protected]>
 +M:    Weihang Li <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/infiniband/hw/hns/
@@@ -7851,10 -7771,6 +7854,10 @@@ F:    Documentation/ABI/testing/debugfs-hy
  
  HYPERBUS SUPPORT
  M:    Vignesh Raghavendra <[email protected]>
 +L:    [email protected]
 +Q:    http://patchwork.ozlabs.org/project/linux-mtd/list/
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git cfi/next
 +C:    irc://irc.oftc.net/mtd
  S:    Supported
  F:    drivers/mtd/hyperbus/
  F:    include/linux/mtd/hyperbus.h
@@@ -8031,7 -7947,6 +8034,7 @@@ L:      [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git
  S:    Maintained
  F:    arch/ia64/
 +F:    Documentation/ia64/
  
  IBM Power 842 compression accelerator
  M:    Haren Myneni <[email protected]>
@@@ -8171,15 -8086,15 +8174,15 @@@ F:   drivers/ide/ide-cd
  IDEAPAD LAPTOP EXTRAS DRIVER
  M:    Ike Panhc <[email protected]>
  L:    [email protected]
 -W:    http://launchpad.net/ideapad-laptop
  S:    Maintained
 +W:    http://launchpad.net/ideapad-laptop
  F:    drivers/platform/x86/ideapad-laptop.c
  
  IDEAPAD LAPTOP SLIDEBAR DRIVER
  M:    Andrey Moiseev <[email protected]>
  L:    [email protected]
 -W:    https://github.com/o2genum/ideapad-slidebar
  S:    Maintained
 +W:    https://github.com/o2genum/ideapad-slidebar
  F:    drivers/input/misc/ideapad_slidebar.c
  
  IDT VersaClock 5 CLOCK DRIVER
@@@ -8395,7 -8310,7 +8398,7 @@@ M:      Jan Kara <[email protected]
  R:    Amir Goldstein <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/filesystems/inotify.txt
 +F:    Documentation/filesystems/inotify.rst
  F:    fs/notify/inotify/
  F:    include/linux/inotify.h
  F:    include/uapi/linux/inotify.h
@@@ -8564,6 -8479,7 +8567,6 @@@ L:      [email protected]
  S:    Supported
  F:    drivers/dma/idxd/*
  F:    include/uapi/linux/idxd.h
 -F:    include/linux/idxd.h
  
  INTEL IDLE DRIVER
  M:    Jacob Pan <[email protected]>
@@@ -8645,8 -8561,8 +8648,8 @@@ F:      samples/mei/
  INTEL MENLOW THERMAL DRIVER
  M:    Sujith Thomas <[email protected]>
  L:    [email protected]
 -W:    https://01.org/linux-acpi
  S:    Supported
 +W:    https://01.org/linux-acpi
  F:    drivers/platform/x86/intel_menlow.c
  
  INTEL MIC DRIVERS (mic)
@@@ -8655,15 -8571,15 +8658,15 @@@ M:   Ashutosh Dixit <ashutosh.dixit@intel
  S:    Supported
  W:    https://github.com/sudeepdutt/mic
  W:    http://software.intel.com/en-us/mic-developer
 +F:    Documentation/misc-devices/mic/
 +F:    drivers/dma/mic_x100_dma.c
 +F:    drivers/dma/mic_x100_dma.h
 +F:    drivers/misc/mic/
  F:    include/linux/mic_bus.h
  F:    include/linux/scif.h
  F:    include/uapi/linux/mic_common.h
  F:    include/uapi/linux/mic_ioctl.h
  F:    include/uapi/linux/scif_ioctl.h
 -F:    drivers/misc/mic/
 -F:    drivers/dma/mic_x100_dma.c
 -F:    drivers/dma/mic_x100_dma.h
 -F:    Documentation/mic/
  
  INTEL PMC CORE DRIVER
  M:    Rajneesh Bhardwaj <[email protected]>
@@@ -8676,10 -8592,10 +8679,10 @@@ INTEL PMC/P-Unit IPC DRIVE
  M:    Zha Qipeng<[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/platform/x86/intel_pmc_ipc.c
 -F:    drivers/platform/x86/intel_punit_ipc.c
  F:    arch/x86/include/asm/intel_pmc_ipc.h
  F:    arch/x86/include/asm/intel_punit_ipc.h
 +F:    drivers/platform/x86/intel_pmc_ipc.c
 +F:    drivers/platform/x86/intel_punit_ipc.c
  
  INTEL PMIC GPIO DRIVERS
  M:    Andy Shevchenko <[email protected]>
@@@ -8724,8 -8640,8 +8727,8 @@@ M:      Srinivas Pandruvada <srinivas.pandru
  L:    [email protected]
  S:    Maintained
  F:    drivers/platform/x86/intel_speed_select_if/
 -F:    tools/power/x86/intel-speed-select/
  F:    include/uapi/linux/isst_if.h
 +F:    tools/power/x86/intel-speed-select/
  
  INTEL STRATIX10 FIRMWARE DRIVERS
  M:    Richard Gong <[email protected]>
@@@ -8770,7 -8686,7 +8773,7 @@@ M:      Emmanuel Grumbach <emmanuel.grumbach
  M:    Luca Coelho <[email protected]>
  M:    Intel Linux Wireless <[email protected]>
  L:    [email protected]
 -W:    http://intellinuxwireless.org
 +W:    https://wireless.wiki.kernel.org/en/users/drivers/iwlwifi
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi.git
  S:    Supported
  F:    drivers/net/wireless/intel/iwlwifi/
@@@ -9249,7 -9165,7 +9252,7 @@@ F:      virt/kvm/
  F:    tools/kvm/
  F:    tools/testing/selftests/kvm/
  
 -KERNEL VIRTUAL MACHINE FOR ARM/ARM64 (KVM/arm, KVM/arm64)
 +KERNEL VIRTUAL MACHINE FOR ARM64 (KVM/arm64)
  M:    Marc Zyngier <[email protected]>
  R:    James Morse <[email protected]>
  R:    Julien Thierry <[email protected]>
@@@ -9258,6 -9174,9 +9261,6 @@@ L:      [email protected]
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git
  S:    Maintained
 -F:    arch/arm/include/uapi/asm/kvm*
 -F:    arch/arm/include/asm/kvm*
 -F:    arch/arm/kvm/
  F:    arch/arm64/include/uapi/asm/kvm*
  F:    arch/arm64/include/asm/kvm*
  F:    arch/arm64/kvm/
@@@ -9292,7 -9211,6 +9295,7 @@@ L:      [email protected]
  W:    http://www.ibm.com/developerworks/linux/linux390/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git
  S:    Supported
 +F:    Documentation/virt/kvm/s390*
  F:    arch/s390/include/uapi/asm/kvm*
  F:    arch/s390/include/asm/gmap.h
  F:    arch/s390/include/asm/kvm*
@@@ -9359,8 -9277,8 +9362,8 @@@ L:      [email protected]
  S:    Supported
  F:    Documentation/security/keys/trusted-encrypted.rst
  F:    include/keys/trusted-type.h
 -F:    security/keys/trusted.c
 -F:    include/keys/trusted.h
 +F:    include/keys/trusted_tpm.h
 +F:    security/keys/trusted-keys/
  
  KEYS/KEYRINGS
  M:    David Howells <[email protected]>
@@@ -9435,8 -9353,6 +9438,8 @@@ F:      include/net/l3mdev.
  L7 BPF FRAMEWORK
  M:    John Fastabend <[email protected]>
  M:    Daniel Borkmann <[email protected]>
 +M:    Jakub Sitnicki <[email protected]>
 +M:    Lorenz Bauer <[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
@@@ -9444,7 -9360,6 +9447,7 @@@ F:      include/linux/skmsg.
  F:    net/core/skmsg.c
  F:    net/core/sock_map.c
  F:    net/ipv4/tcp_bpf.c
 +F:    net/ipv4/udp_bpf.c
  
  LANTIQ / INTEL Ethernet drivers
  M:    Hauke Mehrtens <[email protected]>
@@@ -9473,7 -9388,7 +9476,7 @@@ LASI 53c700 driver for PARIS
  M:    "James E.J. Bottomley" <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/scsi/53c700.txt
 +F:    Documentation/scsi/53c700.rst
  F:    drivers/scsi/53c700*
  
  LEAKING_ADDRESSES
@@@ -10103,7 -10018,6 +10106,7 @@@ F:   Documentation/devicetree/bindings/ph
  MARVELL CRYPTO DRIVER
  M:    Boris Brezillon <[email protected]>
  M:    Arnaud Ebalard <[email protected]>
 +M:    Srujana Challa <[email protected]>
  F:    drivers/crypto/marvell/
  S:    Maintained
  L:    [email protected]
@@@ -10176,13 -10090,6 +10179,13 @@@ M: Nicolas Pitre <[email protected]
  S:    Odd Fixes
  F:    drivers/mmc/host/mvsdio.*
  
 +MARVELL USB MDIO CONTROLLER DRIVER
 +M:    Tobias Waldekranz <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/net/phy/mdio-mvusb.c
 +F:    Documentation/devicetree/bindings/net/marvell,mvusb.yaml
 +
  MARVELL XENON MMC/SD/SDIO HOST CONTROLLER DRIVER
  M:    Hu Ziji <[email protected]>
  L:    [email protected]
@@@ -10325,18 -10232,11 +10328,18 @@@ M:        Dan Murphy <[email protected]
  M:    Sriram Dash <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/devicetree/bindings/net/can/m_can.txt
 +F:    Documentation/devicetree/bindings/net/can/bosch,m_can.yaml
  F:    drivers/net/can/m_can/m_can.c
  F:    drivers/net/can/m_can/m_can.h
  F:    drivers/net/can/m_can/m_can_platform.c
  
 +MCP2221A MICROCHIP USB-HID TO I2C BRIDGE DRIVER
 +M:    Rishi Gupta <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/hid/hid-mcp2221.c
 +
  MCP4018 AND MCP4531 MICROCHIP DIGITAL POTENTIOMETER DRIVERS
  M:    Peter Rosin <[email protected]>
  L:    [email protected]
@@@ -10536,7 -10436,7 +10539,7 @@@ L:   [email protected]
  T:    git git://linuxtv.org/media_tree.git
  S:    Supported
  F:    Documentation/devicetree/bindings/media/renesas,csi2.yaml
 -F:    Documentation/devicetree/bindings/media/renesas,vin.txt
 +F:    Documentation/devicetree/bindings/media/renesas,vin.yaml
  F:    drivers/media/platform/rcar-vin/
  
  MEDIA DRIVERS FOR RENESAS - VSP1
@@@ -10741,7 -10641,7 +10744,7 @@@ L:   [email protected]
  L:    [email protected]
  W:    http://www.avagotech.com/support/
  S:    Maintained
 -F:    Documentation/scsi/megaraid.txt
 +F:    Documentation/scsi/megaraid.rst
  F:    drivers/scsi/megaraid.*
  F:    drivers/scsi/megaraid/
  
@@@ -10993,6 -10893,16 +10996,16 @@@ M: Vladimir Vid <[email protected]
  S:    Maintained
  F:    arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts
  
+ MHI BUS
+ M:    Manivannan Sadhasivam <[email protected]>
+ M:    Hemant Kumar <[email protected]>
+ L:    [email protected]
+ S:    Maintained
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git
+ F:    Documentation/mhi/
+ F:    drivers/bus/mhi/
+ F:    include/linux/mhi.h
+ 
  MICROBLAZE ARCHITECTURE
  M:    Michal Simek <[email protected]>
  W:    http://www.monstr.eu/fdt/
@@@ -11046,7 -10956,6 +11059,7 @@@ F:   drivers/media/platform/atmel/atmel-i
  F:    drivers/media/platform/atmel/atmel-isc-base.c
  F:    drivers/media/platform/atmel/atmel-isc-regs.h
  F:    Documentation/devicetree/bindings/media/atmel-isc.txt
 +F:    include/linux/atmel-isc-media.h
  
  MICROCHIP ISI DRIVER
  M:    Eugen Hristev <[email protected]>
@@@ -11195,7 -11104,7 +11208,7 @@@ F:   drivers/scsi/smartpqi/Kconfi
  F:    drivers/scsi/smartpqi/Makefile
  F:    include/linux/cciss*.h
  F:    include/uapi/linux/cciss*.h
 -F:    Documentation/scsi/smartpqi.txt
 +F:    Documentation/scsi/smartpqi.rst
  
  MICROSEMI ETHERNET SWITCH DRIVER
  M:    Alexandre Belloni <[email protected]>
@@@ -11272,7 -11181,6 +11285,7 @@@ S:   Maintaine
  F:    arch/mips/loongson64/
  F:    arch/mips/include/asm/mach-loongson64/
  F:    drivers/platform/mips/cpu_hwmon.c
 +F:    drivers/irqchip/irq-loongson*
  F:    drivers/*/*loongson3*
  F:    drivers/*/*/*loongson3*
  
@@@ -11361,8 -11269,7 +11374,8 @@@ F:   drivers/tty/mxser.
  MONOLITHIC POWER SYSTEM PMIC DRIVER
  M:    Saravanan Sekar <[email protected]>
  S:    Maintained
 -F:    Documentation/devicetree/bindings/regulator/mpq7920.yaml
 +F:    Documentation/devicetree/bindings/regulator/mps,mp*.yaml
 +F:    drivers/regulator/mp5416.c
  F:    drivers/regulator/mpq7920.c
  F:    drivers/regulator/mpq7920.h
  
@@@ -11556,7 -11463,6 +11569,7 @@@ L:   [email protected]
  W:    http://www.linux-mtd.infradead.org/
  Q:    http://patchwork.ozlabs.org/project/linux-mtd/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/next
 +C:    irc://irc.oftc.net/mtd
  S:    Maintained
  F:    drivers/mtd/nand/
  F:    include/linux/mtd/*nand*.h
@@@ -11577,7 -11483,7 +11590,7 @@@ M:   Finn Thain <[email protected].
  M:    Michael Schmitz <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/scsi/g_NCR5380.txt
 +F:    Documentation/scsi/g_NCR5380.rst
  F:    drivers/scsi/NCR5380.*
  F:    drivers/scsi/arm/cumana_1.c
  F:    drivers/scsi/arm/oak.c
@@@ -11807,7 -11713,6 +11820,7 @@@ W:   https://github.com/multipath-tcp/mpt
  B:    https://github.com/multipath-tcp/mptcp_net-next/issues
  S:    Maintained
  F:    include/net/mptcp.h
 +F:    include/uapi/linux/mptcp.h
  F:    net/mptcp/
  F:    tools/testing/selftests/net/mptcp/
  
@@@ -11896,7 -11801,7 +11909,7 @@@ W:   https://nilfs.sourceforge.io
  W:    https://nilfs.osdn.jp/
  T:    git git://github.com/konis/nilfs2.git
  S:    Supported
 -F:    Documentation/filesystems/nilfs2.txt
 +F:    Documentation/filesystems/nilfs2.rst
  F:    fs/nilfs2/
  F:    include/trace/events/nilfs2.h
  F:    include/uapi/linux/nilfs2_api.h
@@@ -11906,7 -11811,7 +11919,7 @@@ NINJA SCSI-3 / NINJA SCSI-32Bi (16bit/C
  M:    YOKOTA Hiroshi <[email protected]>
  W:    http://www.netlab.is.tsukuba.ac.jp/~yokota/izumi/ninja/
  S:    Maintained
 -F:    Documentation/scsi/NinjaSCSI.txt
 +F:    Documentation/scsi/NinjaSCSI.rst
  F:    drivers/scsi/pcmcia/nsp_*
  
  NINJA SCSI-32Bi/UDE PCI/CARDBUS SCSI HOST ADAPTER DRIVER
@@@ -11914,7 -11819,7 +11927,7 @@@ M:   GOTO Masanori <[email protected]
  M:    YOKOTA Hiroshi <[email protected]>
  W:    http://www.netlab.is.tsukuba.ac.jp/~yokota/izumi/ninja/
  S:    Maintained
 -F:    Documentation/scsi/NinjaSCSI.txt
 +F:    Documentation/scsi/NinjaSCSI.rst
  F:    drivers/scsi/nsp32*
  
  NIOS2 ARCHITECTURE
@@@ -11966,7 -11871,6 +11979,7 @@@ F:   scripts/nsdep
  F:    Documentation/core-api/symbol-namespaces.rst
  
  NTB AMD DRIVER
 +M:    Sanjay R Mehta <[email protected]>
  M:    Shyam Sundar S K <[email protected]>
  L:    [email protected]
  S:    Supported
@@@ -12006,7 -11910,7 +12019,7 @@@ L:   [email protected]
  W:    http://www.tuxera.com/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/aia21/ntfs.git
  S:    Supported
 -F:    Documentation/filesystems/ntfs.txt
 +F:    Documentation/filesystems/ntfs.rst
  F:    fs/ntfs/
  
  NUBUS SUBSYSTEM
@@@ -12352,7 -12256,7 +12365,7 @@@ OMFS FILESYSTE
  M:    Bob Copeland <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/filesystems/omfs.txt
 +F:    Documentation/filesystems/omfs.rst
  F:    fs/omfs/
  
  OMNIKEY CARDMAN 4000 DRIVER
@@@ -12524,6 -12428,7 +12537,6 @@@ F:   Documentation/ABI/testing/sysfs-firm
  
  OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS
  M:    Rob Herring <[email protected]>
 -M:    Mark Rutland <[email protected]>
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git
  Q:    http://patchwork.ozlabs.org/project/devicetree-bindings/list/
@@@ -12600,8 -12505,8 +12613,8 @@@ M:   Joseph Qi <[email protected]
  L:    [email protected] (moderated for non-subscribers)
  W:    http://ocfs2.wiki.kernel.org
  S:    Supported
 -F:    Documentation/filesystems/ocfs2.txt
 -F:    Documentation/filesystems/dlmfs.txt
 +F:    Documentation/filesystems/ocfs2.rst
 +F:    Documentation/filesystems/dlmfs.rst
  F:    fs/ocfs2/
  
  ORANGEFS FILESYSTEM
@@@ -12611,7 -12516,7 +12624,7 @@@ L:   [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux.git
  S:    Supported
  F:    fs/orangefs/
 -F:    Documentation/filesystems/orangefs.txt
 +F:    Documentation/filesystems/orangefs.rst
  
  ORINOCO DRIVER
  L:    [email protected]
@@@ -13272,13 -13177,21 +13285,13 @@@ K:        \b(clone_args|kernel_clone_args)\
  PIN CONTROL SUBSYSTEM
  M:    Linus Walleij <[email protected]>
  L:    [email protected]
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git
  S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git
  F:    Documentation/devicetree/bindings/pinctrl/
  F:    Documentation/driver-api/pinctl.rst
  F:    drivers/pinctrl/
  F:    include/linux/pinctrl/
  
 -PIN CONTROLLER - MICROCHIP AT91
 -M:    Ludovic Desroches <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -L:    [email protected]
 -S:    Supported
 -F:    drivers/pinctrl/pinctrl-at91*
 -F:    drivers/gpio/gpio-sama5d2-piobu.c
 -
  PIN CONTROLLER - FREESCALE
  M:    Dong Aisheng <[email protected]>
  M:    Fabio Estevam <[email protected]>
@@@ -13287,14 -13200,14 +13300,14 @@@ M:        Stefan Agner <[email protected]
  R:    Pengutronix Kernel Team <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/pinctrl/freescale/
  F:    Documentation/devicetree/bindings/pinctrl/fsl,*
 +F:    drivers/pinctrl/freescale/
  
  PIN CONTROLLER - INTEL
  M:    Mika Westerberg <[email protected]>
  M:    Andy Shevchenko <[email protected]>
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git
  S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git
  F:    drivers/pinctrl/intel/
  
  PIN CONTROLLER - MEDIATEK
@@@ -13305,26 -13218,18 +13318,26 @@@ F:        Documentation/devicetree/bindings/pi
  F:    Documentation/devicetree/bindings/pinctrl/pinctrl-mt7622.txt
  F:    drivers/pinctrl/mediatek/
  
 +PIN CONTROLLER - MICROCHIP AT91
 +M:    Ludovic Desroches <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/gpio/gpio-sama5d2-piobu.c
 +F:    drivers/pinctrl/pinctrl-at91*
 +
  PIN CONTROLLER - QUALCOMM
  M:    Bjorn Andersson <[email protected]>
 -S:    Maintained
  L:    [email protected]
 +S:    Maintained
  F:    Documentation/devicetree/bindings/pinctrl/qcom,*.txt
  F:    drivers/pinctrl/qcom/
  
  PIN CONTROLLER - RENESAS
  M:    Geert Uytterhoeven <[email protected]>
  L:    [email protected]
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git sh-pfc
  S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git sh-pfc
  F:    drivers/pinctrl/pinctrl-rz*
  F:    drivers/pinctrl/sh-pfc/
  
@@@ -13334,12 -13239,12 +13347,12 @@@ M:        Krzysztof Kozlowski <[email protected]
  M:    Sylwester Nawrocki <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected] (moderated for non-subscribers)
 -Q:    https://patchwork.kernel.org/project/linux-samsung-soc/list/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git
  S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git
 +Q:    https://patchwork.kernel.org/project/linux-samsung-soc/list/
 +F:    Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt
  F:    drivers/pinctrl/samsung/
  F:    include/dt-bindings/pinctrl/samsung.h
 -F:    Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt
  
  PIN CONTROLLER - SINGLE
  M:    Tony Lindgren <[email protected]>
@@@ -13352,8 -13257,8 +13365,8 @@@ F:   drivers/pinctrl/pinctrl-single.
  PIN CONTROLLER - ST SPEAR
  M:    Viresh Kumar <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
 -W:    http://www.st.com/spear
  S:    Maintained
 +W:    http://www.st.com/spear
  F:    drivers/pinctrl/spear/
  
  PISTACHIO SOC SUPPORT
@@@ -13453,9 -13358,7 +13466,9 @@@ F:   Documentation/devicetree/bindings/ii
  
  PNP SUPPORT
  M:    "Rafael J. Wysocki" <[email protected]>
 +L:    [email protected]
  S:    Maintained
 +F:    include/linux/pnp.h
  F:    drivers/pnp/
  
  POSIX CLOCKS and TIMERS
@@@ -13575,7 -13478,7 +13588,7 @@@ S:   Maintaine
  F:    fs/proc/
  F:    include/linux/proc_fs.h
  F:    tools/testing/selftests/proc/
 -F:    Documentation/filesystems/proc.txt
 +F:    Documentation/filesystems/proc.rst
  
  PROC SYSCTL
  M:    Luis Chamberlain <[email protected]>
@@@ -13625,12 -13528,6 +13638,12 @@@ F: net/psampl
  F:    include/net/psample.h
  F:    include/uapi/linux/psample.h
  
 +PRESSURE STALL INFORMATION (PSI)
 +M:    Johannes Weiner <[email protected]>
 +S:    Maintained
 +F:    kernel/sched/psi.c
 +F:    include/linux/psi*
 +
  PSTORE FILESYSTEM
  M:    Kees Cook <[email protected]>
  M:    Anton Vorontsov <[email protected]>
@@@ -13775,12 -13672,6 +13788,12 @@@ L: [email protected] (moderat
  S:    Supported
  F:    sound/soc/qcom/
  
 +QCOM IPA DRIVER
 +M:    Alex Elder <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/net/ipa/
 +
  QEMU MACHINE EMULATOR AND VIRTUALIZER SUPPORT
  M:    Gabriel Somlo <[email protected]>
  M:    "Michael S. Tsirkin" <[email protected]>
@@@ -14016,7 -13907,6 +14029,7 @@@ L:   [email protected]
  T:    git git://linuxtv.org/media_tree.git
  S:    Maintained
  F:    drivers/media/platform/qcom/venus/
 +F:    Documentation/devicetree/bindings/media/*venus*
  
  QUALCOMM WCN36XX WIRELESS DRIVER
  M:    Kalle Valo <[email protected]>
@@@ -14192,7 -14082,6 +14205,7 @@@ S:   Supporte
  F:    arch/x86/kernel/cpu/resctrl/
  F:    arch/x86/include/asm/resctrl_sched.h
  F:    Documentation/x86/resctrl*
 +F:    tools/testing/selftests/resctrl/
  
  READ-COPY UPDATE (RCU)
  M:    "Paul E. McKenney" <[email protected]>
@@@ -14432,12 -14321,9 +14445,12 @@@ F: Documentation/devicetree/bindings/me
  
  HANTRO VPU CODEC DRIVER
  M:    Ezequiel Garcia <[email protected]>
 +M:    Philipp Zabel <[email protected]>
  L:    [email protected]
 +L:    [email protected]
  S:    Maintained
  F:    drivers/staging/media/hantro/
 +F:    Documentation/devicetree/bindings/media/nxp,imx8mq-vpu.yaml
  F:    Documentation/devicetree/bindings/media/rockchip-vpu.txt
  
  ROCKER DRIVER
@@@ -14484,14 -14370,6 +14497,14 @@@ F: include/net/rose.
  F:    include/uapi/linux/rose.h
  F:    net/rose/
  
 +ROTATION DRIVER FOR ALLWINNER A83T
 +M:    Jernej Skrabec <[email protected]>
 +L:    [email protected]
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    drivers/media/platform/sunxi/sun8i-rotate/
 +F:    Documentation/devicetree/bindings/media/allwinner,sun8i-a83t-de2-rotate.yaml
 +
  RTL2830 MEDIA DRIVER
  M:    Antti Palosaari <[email protected]>
  L:    [email protected]
@@@ -14928,7 -14806,7 +14941,7 @@@ M:   Doug Gilbert <[email protected]
  L:    [email protected]
  W:    http://sg.danny.cz/sg
  S:    Maintained
 -F:    Documentation/scsi/scsi-generic.txt
 +F:    Documentation/scsi/scsi-generic.rst
  F:    drivers/scsi/sg.c
  F:    include/scsi/sg.h
  
@@@ -14948,7 -14826,7 +14961,7 @@@ SCSI TAPE DRIVE
  M:    Kai Mäkisara <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/scsi/st.txt
 +F:    Documentation/scsi/st.rst
  F:    drivers/scsi/st.*
  F:    drivers/scsi/st_*.h
  
@@@ -15105,7 -14983,7 +15118,7 @@@ X:   security/selinux
  
  SELINUX SECURITY MODULE
  M:    Paul Moore <[email protected]>
 -M:    Stephen Smalley <s[email protected]>
 +M:    Stephen Smalley <s[email protected]>
  M:    Eric Paris <[email protected]>
  L:    [email protected]
  W:    https://selinuxproject.org
@@@ -15117,7 -14995,6 +15130,7 @@@ F:   security/selinux
  F:    scripts/selinux/
  F:    Documentation/admin-guide/LSM/SELinux.rst
  F:    Documentation/ABI/obsolete/sysfs-selinux-disable
 +F:    Documentation/ABI/obsolete/sysfs-selinux-checkreqprot
  
  SENSABLE PHANTOM
  M:    Jiri Slaby <[email protected]>
@@@ -15135,7 -15012,7 +15148,7 @@@ SERIAL DEVICE BU
  M:    Rob Herring <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/devicetree/bindings/serial/slave-device.txt
 +F:    Documentation/devicetree/bindings/serial/serial.yaml
  F:    drivers/tty/serdev/
  F:    include/linux/serdev.h
  
@@@ -15175,6 -15052,14 +15188,6 @@@ M:  Dimitri Sivanich <[email protected]
  S:    Maintained
  F:    drivers/misc/sgi-gru/
  
 -SGI SN-IA64 (Altix) SERIAL CONSOLE DRIVER
 -M:    Pat Gefre <[email protected]>
 -L:    [email protected]
 -S:    Supported
 -F:    Documentation/ia64/serial.rst
 -F:    drivers/tty/serial/ioc?_serial.c
 -F:    include/linux/ioc?.h
 -
  SGI XP/XPC/XPNET DRIVER
  M:    Cliff Whickman <[email protected]>
  M:    Robin Holt <[email protected]>
@@@ -15189,14 -15074,6 +15202,14 @@@ W: http://www.ibm.com/developerworks/li
  S:    Supported
  F:    net/smc/
  
 +SHARP GP2AP002A00F/GP2AP002S00F SENSOR DRIVER
 +M:    Linus Walleij <[email protected]>
 +L:    [email protected]
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git
 +S:    Maintained
 +F:    drivers/iio/light/gp2ap002.c
 +F:    Documentation/devicetree/bindings/iio/light/sharp,gp2ap002.yaml
 +
  SHARP RJ54N1CB0C SENSOR DRIVER
  M:    Jacopo Mondi <[email protected]>
  L:    [email protected]
@@@ -15463,10 -15340,11 +15476,10 @@@ S:        Odd Fixe
  F:    drivers/net/ethernet/smsc/smc91x.*
  
  SMIA AND SMIA++ IMAGE SENSOR DRIVER
 -M:    Sakari Ailus <sakari.ailus@iki.fi>
 +M:    Sakari Ailus <sakari.ailus@linux.intel.com>
  L:    [email protected]
  S:    Maintained
  F:    drivers/media/i2c/smiapp/
 -F:    include/media/i2c/smiapp.h
  F:    drivers/media/i2c/smiapp-pll.c
  F:    drivers/media/i2c/smiapp-pll.h
  F:    include/uapi/linux/smiapp.h
@@@ -15551,9 -15429,11 +15564,9 @@@ F:  drivers/infiniband/sw/siw
  F:    include/uapi/rdma/siw-abi.h
  
  SOFT-ROCE DRIVER (rxe)
 -M:    Moni Shoua <monis@mellanox.com>
 +M:    Zhu Yanjun <yanjunz@mellanox.com>
  L:    [email protected]
  S:    Supported
 -W:    https://github.com/SoftRoCE/rxe-dev/wiki/rxe-dev:-Home
 -Q:    http://patchwork.kernel.org/project/linux-rdma/list/
  F:    drivers/infiniband/sw/rxe/
  F:    include/uapi/rdma/rdma_user_rxe.h
  
@@@ -15645,14 -15525,6 +15658,14 @@@ S: Maintaine
  F:    drivers/media/i2c/imx214.c
  F:    Documentation/devicetree/bindings/media/i2c/sony,imx214.txt
  
 +SONY IMX219 SENSOR DRIVER
 +M:    Dave Stevenson <[email protected]>
 +L:    [email protected]
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    drivers/media/i2c/imx219.c
 +F:    Documentation/devicetree/bindings/media/i2c/imx219.yaml
 +
  SONY IMX258 SENSOR DRIVER
  M:    Sakari Ailus <[email protected]>
  L:    [email protected]
@@@ -15703,8 -15575,8 +15716,8 @@@ F:   include/linux/memstick.
  SONY VAIO CONTROL DEVICE DRIVER
  M:    Mattia Dongili <[email protected]>
  L:    [email protected]
 -W:    http://www.linux.it/~malattia/wiki/index.php/Sony_drivers
  S:    Maintained
 +W:    http://www.linux.it/~malattia/wiki/index.php/Sony_drivers
  F:    Documentation/admin-guide/laptops/sony-laptop.rst
  F:    drivers/char/sonypi.c
  F:    drivers/platform/x86/sony-laptop.c
@@@ -15754,17 -15626,6 +15767,17 @@@ F: sound/soc
  F:    include/dt-bindings/sound/
  F:    include/sound/soc*
  
 +SOUND - SOUND OPEN FIRMWARE (SOF) DRIVERS
 +M:    Pierre-Louis Bossart <[email protected]>
 +M:    Liam Girdwood <[email protected]>
 +M:    Ranjani Sridharan <[email protected]>
 +M:    Kai Vehmanen <[email protected]>
 +M:    Daniel Baluta <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +W:    https://github.com/thesofproject/linux/
 +S:    Supported
 +F:    sound/soc/sof/
 +
  SOUNDWIRE SUBSYSTEM
  M:    Vinod Koul <[email protected]>
  M:    Sanyog Kale <[email protected]>
@@@ -15839,7 -15700,6 +15852,7 @@@ L:   [email protected]
  W:    http://www.linux-mtd.infradead.org/
  Q:    http://patchwork.ozlabs.org/project/linux-mtd/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git spi-nor/next
 +C:    irc://irc.oftc.net/mtd
  S:    Maintained
  F:    drivers/mtd/spi-nor/
  F:    include/linux/mtd/spi-nor.h
@@@ -15887,7 -15747,7 +15900,7 @@@ L:   [email protected]
  W:    http://squashfs.org.uk
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-next.git
  S:    Maintained
 -F:    Documentation/filesystems/squashfs.txt
 +F:    Documentation/filesystems/squashfs.rst
  F:    fs/squashfs/
  
  SRM (Alpha) environment access
@@@ -16073,6 -15933,7 +16086,6 @@@ F:   drivers/pwm/pwm-stm32
  F:    include/linux/*/stm32-*tim*
  F:    Documentation/ABI/testing/*timer-stm32
  F:    Documentation/devicetree/bindings/*/*stm32-*timer*
 -F:    Documentation/devicetree/bindings/pwm/pwm-stm32*
  
  STMMAC ETHERNET DRIVER
  M:    Giuseppe Cavallaro <[email protected]>
@@@ -16262,13 -16123,6 +16275,13 @@@ L: [email protected]
  S:    Supported
  F:    drivers/net/ethernet/synopsys/
  
 +SYNOPSYS DESIGNWARE ETHERNET XPCS DRIVER
 +M:    Jose Abreu <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/net/phy/mdio-xpcs.c
 +F:    include/linux/mdio-xpcs.h
 +
  SYNOPSYS DESIGNWARE I2C DRIVER
  M:    Jarkko Nikula <[email protected]>
  R:    Andy Shevchenko <[email protected]>
@@@ -16338,7 -16192,7 +16351,7 @@@ F:   drivers/platform/x86/system76_acpi.
  SYSV FILESYSTEM
  M:    Christoph Hellwig <[email protected]>
  S:    Maintained
 -F:    Documentation/filesystems/sysv-fs.txt
 +F:    Documentation/filesystems/sysv-fs.rst
  F:    fs/sysv/
  F:    include/linux/sysv_fs.h
  
@@@ -16697,10 -16551,10 +16710,10 @@@ THINKPAD ACPI EXTRAS DRIVE
  M:    Henrique de Moraes Holschuh <[email protected]>
  L:    [email protected]
  L:    [email protected]
 +S:    Maintained
  W:    http://ibm-acpi.sourceforge.net
  W:    http://thinkwiki.org/wiki/Ibm-acpi
  T:    git git://repo.or.cz/linux-2.6/linux-acpi-2.6/ibm-acpi-2.6.git
 -S:    Maintained
  F:    drivers/platform/x86/thinkpad_acpi.c
  
  THUNDERBOLT DRIVER
@@@ -16904,12 -16758,12 +16917,12 @@@ F:        sound/soc/codecs/twl4030
  TI VPE/CAL DRIVERS
  M:    Benoit Parrot <[email protected]>
  L:    [email protected]
 +S:    Maintained
  W:    http://linuxtv.org/
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 -S:    Maintained
 -F:    drivers/media/platform/ti-vpe/
 +F:    Documentation/devicetree/bindings/media/ti,cal.yaml
  F:    Documentation/devicetree/bindings/media/ti,vpe.yaml
 -      Documentation/devicetree/bindings/media/ti,cal.yaml
 +F:    drivers/media/platform/ti-vpe/
  
  TI WILINK WIRELESS DRIVERS
  L:    [email protected]
@@@ -17196,18 -17050,6 +17209,18 @@@ W: http://linuxtv.or
  S:    Maintained
  F:    drivers/media/pci/tw686x/
  
 +UACCE ACCELERATOR FRAMEWORK
 +M:    Zhangfei Gao <[email protected]>
 +M:    Zhou Wang <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/ABI/testing/sysfs-driver-uacce
 +F:    Documentation/misc-devices/uacce.rst
 +F:    drivers/misc/uacce/
 +F:    include/linux/uacce.h
 +F:    include/uapi/misc/uacce/
 +
  UBI FILE SYSTEM (UBIFS)
  M:    Richard Weinberger <[email protected]>
  L:    [email protected]
@@@ -17215,7 -17057,7 +17228,7 @@@ T:   git git://git.kernel.org/pub/scm/lin
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git fixes
  W:    http://www.linux-mtd.infradead.org/doc/ubifs.html
  S:    Supported
 -F:    Documentation/filesystems/ubifs.txt
 +F:    Documentation/filesystems/ubifs.rst
  F:    fs/ubifs/
  
  UCLINUX (M68KNOMMU AND COLDFIRE)
@@@ -17234,7 -17076,7 +17247,7 @@@ F:   arch/m68k/include/asm/*_no.
  UDF FILESYSTEM
  M:    Jan Kara <[email protected]>
  S:    Maintained
 -F:    Documentation/filesystems/udf.txt
 +F:    Documentation/filesystems/udf.rst
  F:    fs/udf/
  
  UDRAW TABLET
@@@ -17263,6 -17105,11 +17276,6 @@@ S:  Maintaine
  F:    drivers/usb/common/ulpi.c
  F:    include/linux/ulpi/
  
 -ULTRA-WIDEBAND (UWB) SUBSYSTEM
 -L:    [email protected]
 -S:    Obsolete
 -F:    drivers/staging/uwb/
 -
  UNICODE SUBSYSTEM
  M:    Gabriel Krisman Bertazi <[email protected]>
  L:    [email protected]
@@@ -17304,7 -17151,7 +17317,7 @@@ R:   Alim Akhtar <[email protected]
  R:    Avri Altman <[email protected]>
  L:    [email protected]
  S:    Supported
 -F:    Documentation/scsi/ufs.txt
 +F:    Documentation/scsi/ufs.rst
  F:    drivers/scsi/ufs/
  
  UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER DWC HOOKS
@@@ -17346,12 -17193,6 +17359,12 @@@ S: Maintaine
  F:    Documentation/usb/acm.rst
  F:    drivers/usb/class/cdc-acm.*
  
 +USB APPLE MFI FASTCHARGE DRIVER
 +M:    Bastien Nocera <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/usb/misc/apple-mfi-fastcharge.c
 +
  USB AR5523 WIRELESS DRIVER
  M:    Pontus Fuchs <[email protected]>
  L:    [email protected]
@@@ -17614,7 -17455,7 +17627,7 @@@ L:   [email protected]
  T:    git git://linuxtv.org/media_tree.git
  W:    https://linuxtv.org
  S:    Odd Fixes
 -F:    drivers/media/usb/usbvision/
 +F:    drivers/staging/media/usbvision/
  
  USB WEBCAM GADGET
  M:    Laurent Pinchart <[email protected]>
@@@ -18023,13 -17864,6 +18036,13 @@@ S: Supporte
  F:    arch/x86/kernel/cpu/vmware.c
  F:    arch/x86/include/asm/vmware.h
  
 +VMWARE VIRTUAL PTP CLOCK DRIVER
 +M:    Vivek Thampi <[email protected]>
 +M:    "VMware, Inc." <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/ptp/ptp_vmw.c
 +
  VMWARE PVRDMA DRIVER
  M:    Adit Ranadive <[email protected]>
  M:    VMware PV-Drivers <[email protected]>
@@@ -18364,10 -18198,10 +18377,10 @@@ X86 PLATFORM DRIVER
  M:    Darren Hart <[email protected]>
  M:    Andy Shevchenko <[email protected]>
  L:    [email protected]
 -T:    git git://git.infradead.org/linux-platform-drivers-x86.git
  S:    Odd Fixes
 -F:    drivers/platform/x86/
 +T:    git git://git.infradead.org/linux-platform-drivers-x86.git
  F:    drivers/platform/olpc/
 +F:    drivers/platform/x86/
  
  X86 PLATFORM DRIVERS - ARCH
  R:    Darren Hart <[email protected]>
@@@ -18681,7 -18515,7 +18694,7 @@@ L:   [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git
  S:    Maintained
  F:    fs/zonefs/
 -F:    Documentation/filesystems/zonefs.txt
 +F:    Documentation/filesystems/zonefs.rst
  
  ZPOOL COMPRESSED PAGE STORAGE API
  M:    Dan Streetman <[email protected]>

diff --combined arch/alpha/configs/defconfig
index 3a132c91d45bc1665eb638117838d38aac0c1411,e10c1be3c0d1c024cf96b0567e1e0259098a4492..6293675db1644a231fe2f4c22d3b9da94152efde
--- 1/arch/alpha/configs/defconfig
--- 2/arch/alpha/configs/defconfig
+++ b/arch/alpha/configs/defconfig
@@@ -36,6 -36,7 +36,6 @@@ CONFIG_BLK_DEV_CY82C693=
  CONFIG_SCSI=y
  CONFIG_BLK_DEV_SD=y
  CONFIG_BLK_DEV_SR=y
 -CONFIG_BLK_DEV_SR_VENDOR=y
  CONFIG_SCSI_AIC7XXX=m
  CONFIG_AIC7XXX_CMDS_PER_DEVICE=253
  # CONFIG_AIC7XXX_DEBUG_ENABLE is not set
@@@ -52,7 -53,8 +52,8 @@@ CONFIG_NET_PCI=
  CONFIG_YELLOWFIN=y
  CONFIG_SERIAL_8250=y
  CONFIG_SERIAL_8250_CONSOLE=y
- CONFIG_RTC=y
+ CONFIG_RTC_CLASS=y
+ CONFIG_RTC_DRV_CMOS=y
  CONFIG_EXT2_FS=y
  CONFIG_REISERFS_FS=m
  CONFIG_ISO9660_FS=y

diff --combined arch/ia64/configs/zx1_defconfig
index d42f79a33e912a9ceef9e45e6131fc0dcc11a5b1,70788a500448129336e829b46528e0b7ecdee854..261e98e1f5fe6f9754b1ea4228c323facf4f8db1
--- 1/arch/ia64/configs/zx1_defconfig
--- 2/arch/ia64/configs/zx1_defconfig
+++ b/arch/ia64/configs/zx1_defconfig
@@@ -35,6 -35,7 +35,6 @@@ CONFIG_BLK_DEV_SD=
  CONFIG_CHR_DEV_ST=y
  CONFIG_CHR_DEV_OSST=y
  CONFIG_BLK_DEV_SR=y
 -CONFIG_BLK_DEV_SR_VENDOR=y
  CONFIG_CHR_DEV_SG=y
  CONFIG_SCSI_CONSTANTS=y
  CONFIG_SCSI_LOGGING=y
@@@ -68,7 -69,8 +68,8 @@@ CONFIG_SERIAL_8250_NR_UARTS=
  CONFIG_SERIAL_8250_EXTENDED=y
  CONFIG_SERIAL_8250_SHARE_IRQ=y
  # CONFIG_HW_RANDOM is not set
- CONFIG_EFI_RTC=y
+ CONFIG_RTC_CLASS=y
+ CONFIG_RTC_DRV_EFI=y
  CONFIG_I2C_CHARDEV=y
  CONFIG_AGP=y
  CONFIG_AGP_HP_ZX1=y

diff --combined drivers/extcon/extcon-axp288.c
index 34b7afffac28d847894d8ae9da7b673280c866b7,710a3bb66e958ba7f4c7eb26850ffd83d9fecbc7..525345367260a855c597bf8db455ca95e8e04294
--- 1/drivers/extcon/extcon-axp288.c
--- 2/drivers/extcon/extcon-axp288.c
+++ b/drivers/extcon/extcon-axp288.c
@@@ -107,7 -107,7 +107,7 @@@ struct axp288_extcon_info 
  };
  
  static const struct x86_cpu_id cherry_trail_cpu_ids[] = {
 -      { X86_VENDOR_INTEL, 6, INTEL_FAM6_ATOM_AIRMONT, X86_FEATURE_ANY },
 +      X86_MATCH_INTEL_FAM6_MODEL(ATOM_AIRMONT,        NULL),
        {}
  };
  
@@@ -443,9 -443,40 +443,40 @@@ static int axp288_extcon_probe(struct p
        /* Start charger cable type detection */
        axp288_extcon_enable(info);
  
+       device_init_wakeup(dev, true);
+       platform_set_drvdata(pdev, info);
+ 
+       return 0;
+ }
+ 
+ static int __maybe_unused axp288_extcon_suspend(struct device *dev)
+ {
+       struct axp288_extcon_info *info = dev_get_drvdata(dev);
+ 
+       if (device_may_wakeup(dev))
+               enable_irq_wake(info->irq[VBUS_RISING_IRQ]);
+ 
        return 0;
  }
  
+ static int __maybe_unused axp288_extcon_resume(struct device *dev)
+ {
+       struct axp288_extcon_info *info = dev_get_drvdata(dev);
+ 
+       /*
+        * Wakeup when a charger is connected to do charger-type
+        * connection and generate an extcon event which makes the
+        * axp288 charger driver set the input current limit.
+        */
+       if (device_may_wakeup(dev))
+               disable_irq_wake(info->irq[VBUS_RISING_IRQ]);
+ 
+       return 0;
+ }
+ 
+ static SIMPLE_DEV_PM_OPS(axp288_extcon_pm_ops, axp288_extcon_suspend,
+                        axp288_extcon_resume);
+ 
  static const struct platform_device_id axp288_extcon_table[] = {
        { .name = "axp288_extcon" },
        {},
@@@ -457,6 -488,7 +488,7 @@@ static struct platform_driver axp288_ex
        .id_table = axp288_extcon_table,
        .driver = {
                .name = "axp288_extcon",
+               .pm = &axp288_extcon_pm_ops,
        },
  };
  

diff --combined drivers/soundwire/qcom.c
index 440effed6df6dd08dbbfe6c5d7119b82d428d2ba,1ab3ec799c230c393f6397c45ac057832a7b2914..d6c9ad231873522cfe8e6cec88f1ee9539e81d7f
--- 1/drivers/soundwire/qcom.c
--- 2/drivers/soundwire/qcom.c
+++ b/drivers/soundwire/qcom.c
@@@ -588,13 -588,19 +588,20 @@@ static int qcom_swrm_set_sdw_stream(str
        return 0;
  }
  
+ static void *qcom_swrm_get_sdw_stream(struct snd_soc_dai *dai, int direction)
+ {
+       struct qcom_swrm_ctrl *ctrl = dev_get_drvdata(dai->dev);
+ 
+       return ctrl->sruntime[dai->id];
+ }
+ 
  static int qcom_swrm_startup(struct snd_pcm_substream *substream,
                             struct snd_soc_dai *dai)
  {
        struct qcom_swrm_ctrl *ctrl = dev_get_drvdata(dai->dev);
        struct snd_soc_pcm_runtime *rtd = substream->private_data;
        struct sdw_stream_runtime *sruntime;
 +      struct snd_soc_dai *codec_dai;
        int ret, i;
  
        sruntime = sdw_alloc_stream(dai->name);
@@@ -603,12 -609,12 +610,12 @@@
  
        ctrl->sruntime[dai->id] = sruntime;
  
 -      for (i = 0; i < rtd->num_codecs; i++) {
 -              ret = snd_soc_dai_set_sdw_stream(rtd->codec_dais[i], sruntime,
 +      for_each_rtd_codec_dais(rtd, i, codec_dai) {
 +              ret = snd_soc_dai_set_sdw_stream(codec_dai, sruntime,
                                                 substream->stream);
                if (ret < 0 && ret != -ENOTSUPP) {
                        dev_err(dai->dev, "Failed to set sdw stream on %s",
 -                              rtd->codec_dais[i]->name);
 +                              codec_dai->name);
                        sdw_release_stream(sruntime);
                        return ret;
                }
@@@ -632,6 -638,7 +639,7 @@@ static const struct snd_soc_dai_ops qco
        .startup = qcom_swrm_startup,
        .shutdown = qcom_swrm_shutdown,
        .set_sdw_stream = qcom_swrm_set_sdw_stream,
+       .get_sdw_stream = qcom_swrm_get_sdw_stream,
  };
  
  static const struct snd_soc_component_driver qcom_swrm_dai_component = {

diff --combined drivers/staging/speakup/speakup_soft.c
index 28cedaec6d8a25a3173f32ccbf34d25f7af4602b,eed246fe092d1f3bcac052e7790d91a81135ad4b..f591ec0955826e608903757bc0de63821a55b62a
--- 1/drivers/staging/speakup/speakup_soft.c
--- 2/drivers/staging/speakup/speakup_soft.c
+++ b/drivers/staging/speakup/speakup_soft.c
@@@ -10,7 -10,7 +10,7 @@@
   */
  
  #include <linux/unistd.h>
- #include <linux/miscdevice.h> /* for misc_register, and SYNTH_MINOR */
+ #include <linux/miscdevice.h> /* for misc_register, and MISC_DYNAMIC_MINOR */
  #include <linux/poll.h>               /* for poll_wait() */
  
  /* schedule(), signal_pending(), TASK_INTERRUPTIBLE */
@@@ -20,8 -20,6 +20,6 @@@
  #include "speakup.h"
  
  #define DRV_VERSION "2.6"
- #define SOFTSYNTH_MINOR 26 /* might as well give it one more than /dev/synth */
- #define SOFTSYNTHU_MINOR 27 /* might as well give it one more than /dev/synth */
  #define PROCSPEECH 0x0d
  #define CLEAR_SYNTH 0x18
  
@@@ -375,7 -373,7 +373,7 @@@ static int softsynth_probe(struct spk_s
        if (misc_registered != 0)
                return 0;
        memset(&synth_device, 0, sizeof(synth_device));
-       synth_device.minor = SOFTSYNTH_MINOR;
+       synth_device.minor = MISC_DYNAMIC_MINOR;
        synth_device.name = "softsynth";
        synth_device.fops = &softsynth_fops;
        if (misc_register(&synth_device)) {
@@@ -384,17 -382,19 +382,19 @@@
        }
  
        memset(&synthu_device, 0, sizeof(synthu_device));
-       synthu_device.minor = SOFTSYNTHU_MINOR;
+       synthu_device.minor = MISC_DYNAMIC_MINOR;
        synthu_device.name = "softsynthu";
        synthu_device.fops = &softsynthu_fops;
        if (misc_register(&synthu_device)) {
 -              pr_warn("Couldn't initialize miscdevice /dev/softsynth.\n");
 +              pr_warn("Couldn't initialize miscdevice /dev/softsynthu.\n");
                return -ENODEV;
        }
  
        misc_registered = 1;
-       pr_info("initialized device: /dev/softsynth, node (MAJOR 10, MINOR 26)\n");
-       pr_info("initialized device: /dev/softsynthu, node (MAJOR 10, MINOR 27)\n");
+       pr_info("initialized device: /dev/softsynth, node (MAJOR 10, MINOR %d)\n",
+               synth_device.minor);
+       pr_info("initialized device: /dev/softsynthu, node (MAJOR 10, MINOR %d)\n",
+               synthu_device.minor);
        return 0;
  }
  

diff --combined drivers/tty/serial/Kconfig
index d6644f3d81fc18864cc27450a550748735f9e4f5,a19c9d7fff2e7cc54802592764996838a02e98d2..0aea76cd67ff2e72aaea9d339180badaa2f39d4b
--- 1/drivers/tty/serial/Kconfig
--- 2/drivers/tty/serial/Kconfig
+++ b/drivers/tty/serial/Kconfig
@@@ -3,8 -3,6 +3,6 @@@
  # Serial device configuration
  #
  
- if TTY
- 
  menu "Serial drivers"
        depends on HAS_IOMEM
  
@@@ -260,6 -258,15 +258,6 @@@ config SERIAL_SAMSUNG_UART
        help
          Select the number of available UART ports for the Samsung S3C
          serial driver
 -      
 -config SERIAL_SAMSUNG_DEBUG
 -      bool "Samsung SoC serial debug"
 -      depends on SERIAL_SAMSUNG && DEBUG_LL
 -      help
 -        Add support for debugging the serial driver. Since this is
 -        generally being used as a console, we use our own output
 -        routines that go via the low-level debug printascii()
 -        function.
  
  config SERIAL_SAMSUNG_CONSOLE
        bool "Support for console on Samsung SoC serial port"
@@@ -1102,7 -1109,7 +1100,7 @@@ config SERIAL_SC16IS7XX_SP
        help
          Enable SC16IS7xx driver on SPI bus,
          If required say y, and say n to spi if not required,
 -        This is additional support to exsisting driver.
 +        This is additional support to existing driver.
          You must select at least one bus for the driver to be built.
  
  config SERIAL_TIMBERDALE
@@@ -1270,7 -1277,6 +1268,7 @@@ config SERIAL_AR933
        tristate "AR933X serial port support"
        depends on HAVE_CLK && ATH79
        select SERIAL_CORE
 +      select SERIAL_MCTRL_GPIO if GPIOLIB
        help
          If you have an Atheros AR933X SOC based board and want to use the
          built-in UART of the SoC, say Y to this option.
@@@ -1444,8 -1450,8 +1442,8 @@@ config SERIAL_MEN_Z13
  
  config SERIAL_SPRD
        tristate "Support for Spreadtrum serial"
 -      depends on ARCH_SPRD
        select SERIAL_CORE
 +      depends on COMMON_CLK
        help
          This enables the driver for the Spreadtrum's serial.
  
@@@ -1568,5 -1574,3 +1566,3 @@@ endmen
  
  config SERIAL_MCTRL_GPIO
        tristate
- 
- endif # TTY

diff --combined include/linux/mod_devicetable.h
index f8b66d43acf645ee3b3d2eaf3b782bf4524d6206,f10e779a3fd0a4cbdd5baf9586c3c7d446ab02e7..4c2ddd0941a7514e3b30adbb3211db90c9c39aab
--- 1/include/linux/mod_devicetable.h
--- 2/include/linux/mod_devicetable.h
+++ b/include/linux/mod_devicetable.h
@@@ -667,7 -667,9 +667,7 @@@ struct x86_cpu_id 
        kernel_ulong_t driver_data;
  };
  
 -#define X86_FEATURE_MATCH(x) \
 -      { X86_VENDOR_ANY, X86_FAMILY_ANY, X86_MODEL_ANY, x }
 -
 +/* Wild cards for x86_cpu_id::vendor, family, model and feature */
  #define X86_VENDOR_ANY 0xffff
  #define X86_FAMILY_ANY 0
  #define X86_MODEL_ANY  0
@@@ -819,4 -821,17 +819,17 @@@ struct wmi_device_id 
        const void *context;
  };
  
+ #define MHI_DEVICE_MODALIAS_FMT "mhi:%s"
+ #define MHI_NAME_SIZE 32
+ 
+ /**
+  * struct mhi_device_id - MHI device identification
+  * @chan: MHI channel name
+  * @driver_data: driver data;
+  */
+ struct mhi_device_id {
+       const char chan[MHI_NAME_SIZE];
+       kernel_ulong_t driver_data;
+ };
+ 
  #endif /* LINUX_MOD_DEVICETABLE_H */

diff --combined kernel/power/user.c
index 58ed9478787fcf242edccfadc083d3cf2b629913,98fb65970b6b9f36c6bc8e8e986a19617f2551ee..ef90eb1fb86e959df3f56f388ac38ee5f1d7fd04
--- 1/kernel/power/user.c
--- 2/kernel/power/user.c
+++ b/kernel/power/user.c
@@@ -27,8 -27,6 +27,6 @@@
  #include "power.h"
  
  
- #define SNAPSHOT_MINOR        231
- 
  static struct snapshot_data {
        struct snapshot_handle handle;
        int swap;
@@@ -409,7 -407,21 +407,7 @@@ snapshot_compat_ioctl(struct file *file
        switch (cmd) {
        case SNAPSHOT_GET_IMAGE_SIZE:
        case SNAPSHOT_AVAIL_SWAP_SIZE:
 -      case SNAPSHOT_ALLOC_SWAP_PAGE: {
 -              compat_loff_t __user *uoffset = compat_ptr(arg);
 -              loff_t offset;
 -              mm_segment_t old_fs;
 -              int err;
 -
 -              old_fs = get_fs();
 -              set_fs(KERNEL_DS);
 -              err = snapshot_ioctl(file, cmd, (unsigned long) &offset);
 -              set_fs(old_fs);
 -              if (!err && put_user(offset, uoffset))
 -                      err = -EFAULT;
 -              return err;
 -      }
 -
 +      case SNAPSHOT_ALLOC_SWAP_PAGE:
        case SNAPSHOT_CREATE_IMAGE:
                return snapshot_ioctl(file, cmd,
                                      (unsigned long) compat_ptr(arg));

diff --combined lib/Kconfig.debug
index a85a6a423bf447b5b78ac911d73ba6768e7685c1,7f4992fd8a2edaae26de9384e439e786a150e587..d1398cef3b183b183c18d0a38ec50faf70ecbb29
--- 1/lib/Kconfig.debug
--- 2/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@@ -98,7 -98,7 +98,7 @@@ config DYNAMIC_DEBU
        bool "Enable dynamic printk() support"
        default n
        depends on PRINTK
-       depends on DEBUG_FS
+       depends on (DEBUG_FS || PROC_FS)
        help
  
          Compiles debug level messages into the kernel, which would not
@@@ -116,8 -116,9 +116,9 @@@
          Usage:
  
          Dynamic debugging is controlled via the 'dynamic_debug/control' file,
-         which is contained in the 'debugfs' filesystem. Thus, the debugfs
-         filesystem must first be mounted before making use of this feature.
+         which is contained in the 'debugfs' filesystem or procfs.
+         Thus, the debugfs or procfs filesystem must first be mounted before
+         making use of this feature.
          We refer the control file as: <debugfs>/dynamic_debug/control. This
          file contains a list of the debug statements that can be enabled. The
          format for each line of the file is:
@@@ -266,7 -267,7 +267,7 @@@ config ENABLE_MUST_CHEC
          attribute warn_unused_result" messages.
  
  config FRAME_WARN
 -      int "Warn for stack frames larger than (needs gcc 4.4)"
 +      int "Warn for stack frames larger than"
        range 0 8192
        default 2048 if GCC_PLUGIN_LATENT_ENTROPY
        default 1280 if (!64BIT && PARISC)
@@@ -276,6 -277,7 +277,6 @@@
          Tell gcc to warn at build time for stack frames larger than this.
          Setting this too low will cause a lot of warnings.
          Setting it to 0 disables the warning.
 -        Requires gcc 4.4
  
  config STRIP_ASM_SYMS
        bool "Strip assembler-generated symbols during link"
@@@ -430,16 -432,6 +431,16 @@@ config MAGIC_SYSRQ_SERIA
          This option allows you to decide whether you want to enable the
          magic SysRq key.
  
 +config MAGIC_SYSRQ_SERIAL_SEQUENCE
 +      string "Char sequence that enables magic SysRq over serial"
 +      depends on MAGIC_SYSRQ_SERIAL
 +      default ""
 +      help
 +        Specifies a sequence of characters that can follow BREAK to enable
 +        SysRq on a serial console.
 +
 +        If unsure, leave an empty string and the option will not be enabled.
 +
  config DEBUG_FS
        bool "Debug Filesystem"
        help
@@@ -1095,23 -1087,6 +1096,23 @@@ config PROVE_LOCKIN
  
         For more details, see Documentation/locking/lockdep-design.rst.
  
 +config PROVE_RAW_LOCK_NESTING
 +      bool "Enable raw_spinlock - spinlock nesting checks"
 +      depends on PROVE_LOCKING
 +      default n
 +      help
 +       Enable the raw_spinlock vs. spinlock nesting checks which ensure
 +       that the lock nesting rules for PREEMPT_RT enabled kernels are
 +       not violated.
 +
 +       NOTE: There are known nesting problems. So if you enable this
 +       option expect lockdep splats until these problems have been fully
 +       addressed which is work in progress. This config switch allows to
 +       identify and analyze these problems. It will be removed and the
 +       check permanentely enabled once the main issues have been fixed.
 +
 +       If unsure, select N.
 +
  config LOCK_STAT
        bool "Lock usage statistics"
        depends on DEBUG_KERNEL && LOCK_DEBUGGING_SUPPORT
@@@ -1795,16 -1770,6 +1796,16 @@@ config TEST_LIST_SOR
  
          If unsure, say N.
  
 +config TEST_MIN_HEAP
 +      tristate "Min heap test"
 +      depends on DEBUG_KERNEL || m
 +      help
 +        Enable this to turn on min heap function tests. This test is
 +        executed only once during system boot (so affects only boot time),
 +        or at module load time.
 +
 +        If unsure, say N.
 +
  config TEST_SORT
        tristate "Array-based sort test"
        depends on DEBUG_KERNEL || m

diff --combined scripts/mod/devicetable-offsets.c
index d3c237b9b7c091db54d7a52ce0d0cf60437aff1c,fe3f4a95cb21790d1440f1efb5e2d4a3390e2a6f..010be8ba21160ea1d462ae703c7c5df62c756fe5
--- 1/scripts/mod/devicetable-offsets.c
--- 2/scripts/mod/devicetable-offsets.c
+++ b/scripts/mod/devicetable-offsets.c
@@@ -145,13 -145,6 +145,13 @@@ int main(void
        DEVID(i2c_device_id);
        DEVID_FIELD(i2c_device_id, name);
  
 +      DEVID(i3c_device_id);
 +      DEVID_FIELD(i3c_device_id, match_flags);
 +      DEVID_FIELD(i3c_device_id, dcr);
 +      DEVID_FIELD(i3c_device_id, manuf_id);
 +      DEVID_FIELD(i3c_device_id, part_id);
 +      DEVID_FIELD(i3c_device_id, extra_info);
 +
        DEVID(spi_device_id);
        DEVID_FIELD(spi_device_id, name);
  
@@@ -238,5 -231,8 +238,8 @@@
        DEVID(wmi_device_id);
        DEVID_FIELD(wmi_device_id, guid_string);
  
+       DEVID(mhi_device_id);
+       DEVID_FIELD(mhi_device_id, chan);
+ 
        return 0;
  }

diff --combined scripts/mod/file2alias.c
index f81cbe021a47b701ab122910b225376a3290815d,cae6a4e471b5fa6da0b9c8c08c862e4c500e2328..02d5d79da2844d263452bb37cf179fa0f909d4af
--- 1/scripts/mod/file2alias.c
--- 2/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@@ -919,24 -919,6 +919,24 @@@ static int do_i2c_entry(const char *fil
        return 1;
  }
  
 +static int do_i3c_entry(const char *filename, void *symval,
 +                      char *alias)
 +{
 +      DEF_FIELD(symval, i3c_device_id, match_flags);
 +      DEF_FIELD(symval, i3c_device_id, dcr);
 +      DEF_FIELD(symval, i3c_device_id, manuf_id);
 +      DEF_FIELD(symval, i3c_device_id, part_id);
 +      DEF_FIELD(symval, i3c_device_id, extra_info);
 +
 +      strcpy(alias, "i3c:");
 +      ADD(alias, "dcr", match_flags & I3C_MATCH_DCR, dcr);
 +      ADD(alias, "manuf", match_flags & I3C_MATCH_MANUF, manuf_id);
 +      ADD(alias, "part", match_flags & I3C_MATCH_PART, part_id);
 +      ADD(alias, "ext", match_flags & I3C_MATCH_EXTRA_INFO, extra_info);
 +
 +      return 1;
 +}
 +
  /* Looks like: spi:S */
  static int do_spi_entry(const char *filename, void *symval,
                        char *alias)
@@@ -1353,6 -1335,15 +1353,15 @@@ static int do_wmi_entry(const char *fil
        return 1;
  }
  
+ /* Looks like: mhi:S */
+ static int do_mhi_entry(const char *filename, void *symval, char *alias)
+ {
+       DEF_FIELD_ADDR(symval, mhi_device_id, chan);
+       sprintf(alias, MHI_DEVICE_MODALIAS_FMT, *chan);
+ 
+       return 1;
+ }
+ 
  /* Does namelen bytes of name exactly match the symbol? */
  static bool sym_is(const char *name, unsigned namelen, const char *symbol)
  {
@@@ -1404,7 -1395,6 +1413,7 @@@ static const struct devtable devtable[
        {"vmbus", SIZE_hv_vmbus_device_id, do_vmbus_entry},
        {"rpmsg", SIZE_rpmsg_device_id, do_rpmsg_entry},
        {"i2c", SIZE_i2c_device_id, do_i2c_entry},
 +      {"i3c", SIZE_i3c_device_id, do_i3c_entry},
        {"spi", SIZE_spi_device_id, do_spi_entry},
        {"dmi", SIZE_dmi_system_id, do_dmi_entry},
        {"platform", SIZE_platform_device_id, do_platform_entry},
@@@ -1426,6 -1416,7 +1435,7 @@@
        {"typec", SIZE_typec_device_id, do_typec_entry},
        {"tee", SIZE_tee_client_device_id, do_tee_entry},
        {"wmi", SIZE_wmi_device_id, do_wmi_entry},
+       {"mhi", SIZE_mhi_device_id, do_mhi_entry},
  };
  
  /* Create MODULE_ALIAS() statements.