Merge tag 'v5.2-rc1' into regulator-5.3
authorMark Brown <broonie@kernel.org>
Mon, 20 May 2019 10:54:11 +0000 (11:54 +0100)
committerMark Brown <broonie@kernel.org>
Mon, 20 May 2019 10:54:11 +0000 (11:54 +0100)
Linux 5.2-rc1

1  2 
MAINTAINERS

diff --combined MAINTAINERS
@@@ -268,12 -268,13 +268,13 @@@ L:      linux-gpio@vger.kernel.or
  S:    Maintained
  F:    drivers/gpio/gpio-104-idio-16.c
  
- ACCES 104-QUAD-8 IIO DRIVER
+ ACCES 104-QUAD-8 DRIVER
  M:    William Breathitt Gray <vilhelm.gray@gmail.com>
  L:    linux-iio@vger.kernel.org
  S:    Maintained
+ F:    Documentation/ABI/testing/sysfs-bus-counter-104-quad-8
  F:    Documentation/ABI/testing/sysfs-bus-iio-counter-104-quad-8
- F:    drivers/iio/counter/104-quad-8.c
+ F:    drivers/counter/104-quad-8.c
  
  ACCES PCI-IDIO-16 GPIO DRIVER
  M:    William Breathitt Gray <vilhelm.gray@gmail.com>
@@@ -468,7 -469,7 +469,7 @@@ ADM1025 HARDWARE MONITOR DRIVE
  M:    Jean Delvare <jdelvare@suse.com>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
- F:    Documentation/hwmon/adm1025
+ F:    Documentation/hwmon/adm1025.rst
  F:    drivers/hwmon/adm1025.c
  
  ADM1029 HARDWARE MONITOR DRIVER
@@@ -520,7 -521,7 +521,7 @@@ ADS1015 HARDWARE MONITOR DRIVE
  M:    Dirk Eibach <eibach@gdsys.de>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
- F:    Documentation/hwmon/ads1015
+ F:    Documentation/hwmon/ads1015.rst
  F:    drivers/hwmon/ads1015.c
  F:    include/linux/platform_data/ads1015.h
  
@@@ -533,7 -534,7 +534,7 @@@ ADT7475 HARDWARE MONITOR DRIVE
  M:    Jean Delvare <jdelvare@suse.com>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
- F:    Documentation/hwmon/adt7475
+ F:    Documentation/hwmon/adt7475.rst
  F:    drivers/hwmon/adt7475.c
  
  ADVANSYS SCSI DRIVER
@@@ -709,6 -710,12 +710,12 @@@ L:       linux-gpio@vger.kernel.or
  S:    Maintained
  F:    drivers/gpio/gpio-altera.c
  
+ ALTERA SYSTEM MANAGER DRIVER
+ M:    Thor Thayer <thor.thayer@linux.intel.com>
+ S:    Maintained
+ F:    drivers/mfd/altera-sysmgr.c
+ F:    include/linux/mfd/altera-sysgmr.h
  ALTERA SYSTEM RESOURCE DRIVER FOR ARRIA10 DEVKIT
  M:    Thor Thayer <thor.thayer@linux.intel.com>
  S:    Maintained
@@@ -735,6 -742,12 +742,12 @@@ F:       drivers/tty/serial/altera_jtaguart.
  F:    include/linux/altera_uart.h
  F:    include/linux/altera_jtaguart.h
  
+ AMAZON ANNAPURNA LABS THERMAL MMIO DRIVER
+ M:    Talel Shenhar <talel@amazon.com>
+ S:    Maintained
+ F:    Documentation/devicetree/bindings/thermal/amazon,al-thermal.txt
+ F:    drivers/thermal/thermal_mmio.c
  AMAZON ETHERNET DRIVERS
  M:    Netanel Belgazal <netanel@amazon.com>
  R:    Saeed Bishara <saeedb@amazon.com>
@@@ -744,6 -757,15 +757,15 @@@ S:       Supporte
  F:    Documentation/networking/device_drivers/amazon/ena.txt
  F:    drivers/net/ethernet/amazon/
  
+ AMAZON RDMA EFA DRIVER
+ M:    Gal Pressman <galpress@amazon.com>
+ R:    Yossi Leybovich <sleybo@amazon.com>
+ L:    linux-rdma@vger.kernel.org
+ Q:    https://patchwork.kernel.org/project/linux-rdma/list/
+ S:    Supported
+ F:    drivers/infiniband/hw/efa/
+ F:    include/uapi/rdma/efa-abi.h
  AMD CRYPTOGRAPHIC COPROCESSOR (CCP) DRIVER
  M:    Tom Lendacky <thomas.lendacky@amd.com>
  M:    Gary Hook <gary.hook@amd.com>
@@@ -764,7 -786,7 +786,7 @@@ AMD FAM15H PROCESSOR POWER MONITORING D
  M:    Huang Rui <ray.huang@amd.com>
  L:    linux-hwmon@vger.kernel.org
  S:    Supported
- F:    Documentation/hwmon/fam15h_power
+ F:    Documentation/hwmon/fam15h_power.rst
  F:    drivers/hwmon/fam15h_power.c
  
  AMD FCH GPIO DRIVER
@@@ -816,6 -838,14 +838,14 @@@ F:       drivers/gpu/drm/amd/include/vi_struc
  F:    drivers/gpu/drm/amd/include/v9_structs.h
  F:    include/uapi/linux/kfd_ioctl.h
  
+ AMD MP2 I2C DRIVER
+ M:    Elie Morisse <syniurge@gmail.com>
+ M:    Nehal Shah <nehal-bakulchandra.shah@amd.com>
+ M:    Shyam Sundar S K <shyam-sundar.s-k@amd.com>
+ L:    linux-i2c@vger.kernel.org
+ S:    Maintained
+ F:    drivers/i2c/busses/i2c-amd-mp2*
  AMD POWERPLAY
  M:    Rex Zhu <rex.zhu@amd.com>
  M:    Evan Quan <evan.quan@amd.com>
@@@ -868,7 -898,7 +898,7 @@@ L: linux-iio@vger.kernel.or
  W:    http://ez.analog.com/community/linux-device-drivers
  S:    Supported
  F:    drivers/iio/adc/ad7606.c
- F:    Documentation/devicetree/bindings/iio/adc/ad7606.txt
+ F:    Documentation/devicetree/bindings/iio/adc/adi,ad7606.txt
  
  ANALOG DEVICES INC AD7768-1 DRIVER
  M:    Stefan Popa <stefan.popa@analog.com>
@@@ -950,6 -980,7 +980,7 @@@ F: drivers/dma/dma-axi-dmac.
  ANALOG DEVICES INC IIO DRIVERS
  M:    Lars-Peter Clausen <lars@metafoo.de>
  M:    Michael Hennerich <Michael.Hennerich@analog.com>
+ M:    Stefan Popa <stefan.popa@analog.com>
  W:    http://wiki.analog.com/
  W:    http://ez.analog.com/community/linux-device-drivers
  S:    Supported
@@@ -960,10 -991,16 +991,16 @@@ F:      drivers/iio/adc/ltc2497
  X:    drivers/iio/*/adjd*
  F:    drivers/staging/iio/*/ad*
  
+ ANALOGBITS PLL LIBRARIES
+ M:    Paul Walmsley <paul.walmsley@sifive.com>
+ S:    Supported
+ F:    drivers/clk/analogbits/*
+ F:    include/linux/clk/analogbits*
  ANDES ARCHITECTURE
  M:    Greentime Hu <green.hu@gmail.com>
  M:    Vincent Chen <deanbo422@gmail.com>
- T:    git https://github.com/andestech/linux.git
+ T:    git https://git.kernel.org/pub/scm/linux/kernel/git/greentime/linux.git
  S:    Supported
  F:    arch/nds32/
  F:    Documentation/devicetree/bindings/interrupt-controller/andestech,ativic32.txt
@@@ -1167,7 -1204,7 +1204,7 @@@ S:      Supporte
  T:    git git://linux-arm.org/linux-ld.git for-upstream/mali-dp
  F:    drivers/gpu/drm/arm/display/include/
  F:    drivers/gpu/drm/arm/display/komeda/
- F:    Documentation/devicetree/bindings/display/arm/arm,komeda.txt
+ F:    Documentation/devicetree/bindings/display/arm,komeda.txt
  F:    Documentation/gpu/komeda-kms.rst
  
  ARM MALI-DP DRM DRIVER
@@@ -1180,6 -1217,15 +1217,15 @@@ F:    drivers/gpu/drm/arm
  F:    Documentation/devicetree/bindings/display/arm,malidp.txt
  F:    Documentation/gpu/afbc.rst
  
+ ARM MALI PANFROST DRM DRIVER
+ M:    Rob Herring <robh@kernel.org>
+ M:    Tomeu Vizoso <tomeu.vizoso@collabora.com>
+ L:    dri-devel@lists.freedesktop.org
+ S:    Supported
+ T:    git git://anongit.freedesktop.org/drm/drm-misc
+ F:    drivers/gpu/drm/panfrost/
+ F:    include/uapi/drm/panfrost_drm.h
  ARM MFM AND FLOPPY DRIVERS
  M:    Ian Molton <spyro@f2s.com>
  S:    Maintained
@@@ -1416,7 -1462,9 +1462,9 @@@ M:      Manivannan Sadhasivam <manivannan.sa
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm64/boot/dts/bitmain/
+ F:    drivers/pinctrl/pinctrl-bm1880.c
  F:    Documentation/devicetree/bindings/arm/bitmain.yaml
+ F:    Documentation/devicetree/bindings/pinctrl/bitmain,bm1880-pinctrl.txt
  
  ARM/CALXEDA HIGHBANK ARCHITECTURE
  M:    Rob Herring <robh@kernel.org>
@@@ -1685,11 -1733,21 +1733,21 @@@ L:   linux-arm-kernel@lists.infradead.or
  S:    Maintained
  
  ARM/INTEL IXP4XX ARM ARCHITECTURE
+ M:    Linus Walleij <linusw@kernel.org>
  M:    Imre Kaloz <kaloz@openwrt.org>
  M:    Krzysztof Halasa <khalasa@piap.pl>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
+ F:    Documentation/devicetree/bindings/arm/intel-ixp4xx.yaml
+ F:    Documentation/devicetree/bindings/gpio/intel,ixp4xx-gpio.txt
+ F:    Documentation/devicetree/bindings/interrupt-controller/intel,ixp4xx-interrupt.yaml
+ F:    Documentation/devicetree/bindings/timer/intel,ixp4xx-timer.yaml
  F:    arch/arm/mach-ixp4xx/
+ F:    drivers/clocksource/timer-ixp4xx.c
+ F:    drivers/gpio/gpio-ixp4xx.c
+ F:    drivers/irqchip/irq-ixp4xx.c
+ F:    include/linux/irqchip/irq-ixp4xx.h
+ F:    include/linux/platform_data/timer-ixp4xx.h
  
  ARM/INTEL RESEARCH IMOTE/STARGATE 2 MACHINE SUPPORT
  M:    Jonathan Cameron <jic23@cam.ac.uk>
@@@ -1985,7 -2043,7 +2043,7 @@@ W:      http://www.armlinux.org.uk
  S:    Maintained
  
  ARM/QUALCOMM SUPPORT
- M:    Andy Gross <andy.gross@linaro.org>
+ M:    Andy Gross <agross@kernel.org>
  M:    David Brown <david.brown@linaro.org>
  L:    linux-arm-msm@vger.kernel.org
  S:    Maintained
@@@ -2190,6 -2248,7 +2248,7 @@@ F:      arch/arm/mach-socfpga
  F:    arch/arm/boot/dts/socfpga*
  F:    arch/arm/configs/socfpga_defconfig
  F:    arch/arm64/boot/dts/altera/
+ F:    arch/arm64/boot/dts/intel/
  W:    http://www.rocketboards.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux.git
  
@@@ -2513,7 -2572,7 +2572,7 @@@ ASC7621 HARDWARE MONITOR DRIVE
  M:    George Joseph <george.joseph@fairview5.com>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
- F:    Documentation/hwmon/asc7621
+ F:    Documentation/hwmon/asc7621.rst
  F:    drivers/hwmon/asc7621.c
  
  ASPEED VIDEO ENGINE DRIVER
@@@ -2560,7 -2619,7 +2619,7 @@@ F:      include/linux/dmaengine.
  F:    include/linux/async_tx.h
  
  AT24 EEPROM DRIVER
- M:    Bartosz Golaszewski <brgl@bgdev.pl>
+ M:    Bartosz Golaszewski <bgolaszewski@baylibre.com>
  L:    linux-i2c@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git
  S:    Maintained
@@@ -2794,10 -2853,13 +2853,13 @@@ M:   Simon Wunderlich <sw@simonwunderlich
  M:    Antonio Quartulli <a@unstable.cc>
  L:    b.a.t.m.a.n@lists.open-mesh.org (moderated for non-subscribers)
  W:    https://www.open-mesh.org/
+ B:    https://www.open-mesh.org/projects/batman-adv/issues
+ C:    irc://chat.freenode.net/batman
  Q:    https://patchwork.open-mesh.org/project/batman/list/
+ T:    git https://git.open-mesh.org/linux-merge.git
  S:    Maintained
- F:    Documentation/ABI/testing/sysfs-class-net-batman-adv
- F:    Documentation/ABI/testing/sysfs-class-net-mesh
+ F:    Documentation/ABI/obsolete/sysfs-class-net-batman-adv
+ F:    Documentation/ABI/obsolete/sysfs-class-net-mesh
  F:    Documentation/networking/batman-adv.rst
  F:    include/uapi/linux/batadv_packet.h
  F:    include/uapi/linux/batman_adv.h
@@@ -3353,7 -3415,7 +3415,7 @@@ F:      include/uapi/linux/bsg.
  BT87X AUDIO DRIVER
  M:    Clemens Ladisch <clemens@ladisch.de>
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
- T:    git git://git.alsa-project.org/alsa-kernel.git
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git
  S:    Maintained
  F:    Documentation/sound/cards/bt87x.rst
  F:    sound/pci/bt87x.c
@@@ -3406,7 -3468,7 +3468,7 @@@ F:      drivers/scsi/FlashPoint.
  C-MEDIA CMI8788 DRIVER
  M:    Clemens Ladisch <clemens@ladisch.de>
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
- T:    git git://git.alsa-project.org/alsa-kernel.git
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git
  S:    Maintained
  F:    sound/pci/oxygen/
  
@@@ -3730,8 -3792,8 +3792,8 @@@ F:      scripts/checkpatch.p
  
  CHINESE DOCUMENTATION
  M:    Harry Wei <harryxiyou@gmail.com>
+ M:    Alex Shi <alex.shi@linux.alibaba.com>
  L:    xiyoulinuxkernelgroup@googlegroups.com (subscribers-only)
- L:    linux-kernel@zh-kernel.org (moderated for non-subscribers)
  S:    Maintained
  F:    Documentation/translations/zh_CN/
  
@@@ -3798,16 -3860,21 +3860,21 @@@ M:   Richard Fitzgerald <rf@opensource.ci
  L:    patches@opensource.cirrus.com
  S:    Supported
  F:    drivers/clk/clk-lochnagar.c
+ F:    drivers/hwmon/lochnagar-hwmon.c
  F:    drivers/mfd/lochnagar-i2c.c
  F:    drivers/pinctrl/cirrus/pinctrl-lochnagar.c
  F:    drivers/regulator/lochnagar-regulator.c
+ F:    sound/soc/codecs/lochnagar-sc.c
  F:    include/dt-bindings/clk/lochnagar.h
  F:    include/dt-bindings/pinctrl/lochnagar.h
  F:    include/linux/mfd/lochnagar*
  F:    Documentation/devicetree/bindings/mfd/cirrus,lochnagar.txt
  F:    Documentation/devicetree/bindings/clock/cirrus,lochnagar.txt
+ F:    Documentation/devicetree/bindings/hwmon/cirrus,lochnagar.txt
  F:    Documentation/devicetree/bindings/pinctrl/cirrus,lochnagar.txt
  F:    Documentation/devicetree/bindings/regulator/cirrus,lochnagar.txt
+ F:    Documentation/devicetree/bindings/sound/cirrus,lochnagar.txt
+ F:    Documentation/hwmon/lochnagar
  
  CISCO FCOE HBA DRIVER
  M:    Satish Kharat <satishkh@cisco.com>
@@@ -4045,7 -4112,7 +4112,7 @@@ CORETEMP HARDWARE MONITORING DRIVE
  M:    Fenghua Yu <fenghua.yu@intel.com>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
- F:    Documentation/hwmon/coretemp
+ F:    Documentation/hwmon/coretemp.rst
  F:    drivers/hwmon/coretemp.c
  
  COSA/SRP SYNC SERIAL DRIVER
@@@ -4054,6 -4121,16 +4121,16 @@@ W:    http://www.fi.muni.cz/~kas/cosa
  S:    Maintained
  F:    drivers/net/wan/cosa*
  
+ COUNTER SUBSYSTEM
+ M:    William Breathitt Gray <vilhelm.gray@gmail.com>
+ L:    linux-iio@vger.kernel.org
+ S:    Maintained
+ F:    Documentation/ABI/testing/sysfs-bus-counter*
+ F:    Documentation/driver-api/generic-counter.rst
+ F:    drivers/counter/
+ F:    include/linux/counter.h
+ F:    include/linux/counter_enum.h
  CPMAC ETHERNET DRIVER
  M:    Florian Fainelli <f.fainelli@gmail.com>
  L:    netdev@vger.kernel.org
@@@ -4073,7 -4150,9 +4150,9 @@@ F:      Documentation/admin-guide/pm/intel_p
  F:    Documentation/cpu-freq/
  F:    Documentation/devicetree/bindings/cpufreq/
  F:    drivers/cpufreq/
+ F:    kernel/sched/cpufreq*.c
  F:    include/linux/cpufreq.h
+ F:    include/linux/sched/cpufreq.h
  F:    tools/testing/selftests/cpufreq/
  
  CPU FREQUENCY DRIVERS - ARM BIG LITTLE
@@@ -4248,7 -4327,7 +4327,7 @@@ S:      Supporte
  F:    drivers/scsi/cxgbi/cxgb3i
  
  CXGB3 IWARP RNIC DRIVER (IW_CXGB3)
- M:    Steve Wise <swise@chelsio.com>
+ M:    Potnuri Bharat Teja <bharat@chelsio.com>
  L:    linux-rdma@vger.kernel.org
  W:    http://www.openfabrics.org
  S:    Supported
@@@ -4256,7 -4335,7 +4335,7 @@@ F:      drivers/infiniband/hw/cxgb3
  F:    include/uapi/rdma/cxgb3-abi.h
  
  CXGB4 CRYPTO DRIVER (chcr)
- M:    Harsh Jain <harsh@chelsio.com>
+ M:    Atul Gupta <atul.gupta@chelsio.com>
  L:    linux-crypto@vger.kernel.org
  W:    http://www.chelsio.com
  S:    Supported
@@@ -4277,7 -4356,7 +4356,7 @@@ S:      Supporte
  F:    drivers/scsi/cxgbi/cxgb4i
  
  CXGB4 IWARP RNIC DRIVER (IW_CXGB4)
- M:    Steve Wise <swise@chelsio.com>
+ M:    Potnuri Bharat Teja <bharat@chelsio.com>
  L:    linux-rdma@vger.kernel.org
  W:    http://www.openfabrics.org
  S:    Supported
@@@ -4293,7 -4372,7 +4372,7 @@@ F:      drivers/net/ethernet/chelsio/cxgb4vf
  
  CXL (IBM Coherent Accelerator Processor Interface CAPI) DRIVER
  M:    Frederic Barrat <fbarrat@linux.ibm.com>
- M:    Andrew Donnellan <andrew.donnellan@au1.ibm.com>
+ M:    Andrew Donnellan <ajd@linux.ibm.com>
  L:    linuxppc-dev@lists.ozlabs.org
  S:    Supported
  F:    arch/powerpc/platforms/powernv/pci-cxl.c
@@@ -4553,6 -4632,7 +4632,7 @@@ S:      Maintaine
  F:    drivers/devfreq/
  F:    include/linux/devfreq.h
  F:    Documentation/devicetree/bindings/devfreq/
+ F:    include/trace/events/devfreq.h
  
  DEVICE FREQUENCY EVENT (DEVFREQ-EVENT)
  M:    Chanwoo Choi <cw00.choi@samsung.com>
@@@ -4600,12 -4680,11 +4680,12 @@@ DIALOG SEMICONDUCTOR DRIVER
  M:    Support Opensource <support.opensource@diasemi.com>
  W:    http://www.dialog-semiconductor.com/products
  S:    Supported
- F:    Documentation/hwmon/da90??
+ F:    Documentation/hwmon/da90??.rst
  F:    Documentation/devicetree/bindings/mfd/da90*.txt
  F:    Documentation/devicetree/bindings/input/da90??-onkey.txt
  F:    Documentation/devicetree/bindings/thermal/da90??-thermal.txt
  F:    Documentation/devicetree/bindings/regulator/da92*.txt
 +F:    Documentation/devicetree/bindings/regulator/slg51000.txt
  F:    Documentation/devicetree/bindings/watchdog/da90??-wdt.txt
  F:    Documentation/devicetree/bindings/sound/da[79]*.txt
  F:    drivers/gpio/gpio-da90??.c
@@@ -4621,7 -4700,6 +4701,7 @@@ F:      drivers/power/supply/da9052-battery.
  F:    drivers/power/supply/da91??-*.c
  F:    drivers/regulator/da903x.c
  F:    drivers/regulator/da9???-regulator.[ch]
 +F:    drivers/regulator/slg51000-regulator.[ch]
  F:    drivers/thermal/da90??-thermal.c
  F:    drivers/rtc/rtc-da90??.c
  F:    drivers/video/backlight/da90??_bl.c
@@@ -4753,7 -4831,7 +4833,7 @@@ DME1737 HARDWARE MONITOR DRIVE
  M:    Juerg Haefliger <juergh@gmail.com>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
- F:    Documentation/hwmon/dme1737
+ F:    Documentation/hwmon/dme1737.rst
  F:    drivers/hwmon/dme1737.c
  
  DMI/SMBIOS SUPPORT
@@@ -4898,6 -4976,14 +4978,14 @@@ M:    Dave Airlie <airlied@redhat.com
  S:    Odd Fixes
  F:    drivers/gpu/drm/ast/
  
+ DRM DRIVER FOR ASPEED BMC GFX
+ M:    Joel Stanley <joel@jms.id.au>
+ L:    linux-aspeed@lists.ozlabs.org
+ T:    git git://anongit.freedesktop.org/drm/drm-misc
+ S:    Supported
+ F:    drivers/gpu/drm/aspeed/
+ F:    Documentation/devicetree/bindings/gpu/aspeed-gfx.txt
  DRM DRIVER FOR BOCHS VIRTUAL GPU
  M:    Gerd Hoffmann <kraxel@redhat.com>
  L:    virtualization@lists.linux-foundation.org
@@@ -4911,6 -4997,12 +4999,12 @@@ T:    git git://anongit.freedesktop.org/dr
  S:    Maintained
  F:    drivers/gpu/drm/tve200/
  
+ DRM DRIVER FOR FEIYANG FY07024DI26A30-D MIPI-DSI LCD PANELS
+ M:    Jagan Teki <jagan@amarulasolutions.com>
+ S:    Maintained
+ F:    drivers/gpu/drm/panel/panel-feiyang-fy07024di26a30d.c
+ F:    Documentation/devicetree/bindings/display/panel/feiyang,fy07024di26a30d.txt
  DRM DRIVER FOR ILITEK ILI9225 PANELS
  M:    David Lechner <david@lechnology.com>
  S:    Maintained
@@@ -5002,6 -5094,12 +5096,12 @@@ S:    Orphan / Obsolet
  F:    drivers/gpu/drm/r128/
  F:    include/uapi/drm/r128_drm.h
  
+ DRM DRIVER FOR ROCKTECH JH057N00900 PANELS
+ M:    Guido Günther <agx@sigxcpu.org>
+ S:    Maintained
+ F:    drivers/gpu/drm/panel/panel-rocktech-jh057n00900.c
+ F:    Documentation/devicetree/bindings/display/panel/rocktech,jh057n00900.txt
  DRM DRIVER FOR SAVAGE VIDEO CARDS
  S:    Orphan / Obsolete
  F:    drivers/gpu/drm/savage/
@@@ -5049,6 -5147,13 +5149,13 @@@ S:    Odd Fixe
  F:    drivers/gpu/drm/udl/
  T:    git git://anongit.freedesktop.org/drm/drm-misc
  
+ DRM DRIVER FOR VIRTUALBOX VIRTUAL GPU
+ M:    Hans de Goede <hdegoede@redhat.com>
+ L:    dri-devel@lists.freedesktop.org
+ S:    Maintained
+ F:    drivers/gpu/drm/vboxvideo/
+ T:    git git://anongit.freedesktop.org/drm/drm-misc
  DRM DRIVER FOR VIRTUAL KERNEL MODESETTING (VKMS)
  M:    Rodrigo Siqueira <rodrigosiqueiramelo@gmail.com>
  R:    Haneen Mohammed <hamohammed.sa@gmail.com>
@@@ -5183,6 -5288,15 +5290,15 @@@ S:    Maintaine
  F:    drivers/gpu/drm/hisilicon/
  F:    Documentation/devicetree/bindings/display/hisilicon/
  
+ DRM DRIVERS FOR LIMA
+ M:    Qiang Yu <yuq825@gmail.com>
+ L:    dri-devel@lists.freedesktop.org
+ L:    lima@lists.freedesktop.org (moderated for non-subscribers)
+ S:    Maintained
+ F:    drivers/gpu/drm/lima/
+ F:    include/uapi/drm/lima_drm.h
+ T:    git git://anongit.freedesktop.org/drm/drm-misc
  DRM DRIVERS FOR MEDIATEK
  M:    CK Hu <ck.hu@mediatek.com>
  M:    Philipp Zabel <p.zabel@pengutronix.de>
@@@ -5600,6 -5714,12 +5716,12 @@@ L:    linux-edac@vger.kernel.or
  S:    Maintained
  F:    drivers/edac/ghes_edac.c
  
+ EDAC-I10NM
+ M:    Tony Luck <tony.luck@intel.com>
+ L:    linux-edac@vger.kernel.org
+ S:    Maintained
+ F:    drivers/edac/i10nm_base.c
  EDAC-I3000
  L:    linux-edac@vger.kernel.org
  S:    Orphan
@@@ -5681,7 -5801,7 +5803,7 @@@ EDAC-SKYLAK
  M:    Tony Luck <tony.luck@intel.com>
  L:    linux-edac@vger.kernel.org
  S:    Maintained
- F:    drivers/edac/skx_edac.c
+ F:    drivers/edac/skx_*.c
  
  EDAC-TI
  M:    Tero Kristo <t-kristo@ti.com>
@@@ -5700,7 -5820,7 +5822,7 @@@ F:      drivers/edac/qcom_edac.
  EDIROL UA-101/UA-1000 DRIVER
  M:    Clemens Ladisch <clemens@ladisch.de>
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
- T:    git git://git.alsa-project.org/alsa-kernel.git
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git
  S:    Maintained
  F:    sound/usb/misc/ua101.c
  
@@@ -5939,7 -6059,7 +6061,7 @@@ F71805F HARDWARE MONITORING DRIVE
  M:    Jean Delvare <jdelvare@suse.com>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
- F:    Documentation/hwmon/f71805f
+ F:    Documentation/hwmon/f71805f.rst
  F:    drivers/hwmon/f71805f.c
  
  FADDR2LINE
@@@ -6040,7 -6160,7 +6162,7 @@@ F:      include/linux/f75375s.
  FIREWIRE AUDIO DRIVERS
  M:    Clemens Ladisch <clemens@ladisch.de>
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
- T:    git git://git.alsa-project.org/alsa-kernel.git
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git
  S:    Maintained
  F:    sound/firewire/
  
@@@ -6596,7 -6716,7 +6718,7 @@@ M:      Andy Shevchenko <andriy.shevchenko@l
  L:    linux-gpio@vger.kernel.org
  L:    linux-acpi@vger.kernel.org
  S:    Maintained
- F:    Documentation/acpi/gpio-properties.txt
+ F:    Documentation/firmware-guide/acpi/gpio-properties.rst
  F:    drivers/gpio/gpiolib-acpi.c
  
  GPIO IR Transmitter
@@@ -7388,13 -7508,12 +7510,12 @@@ S:   Supporte
  F:    drivers/net/ethernet/ibm/ibmvnic.*
  
  IBM Power Virtual Accelerator Switchboard
- M:    Sukadev Bhattiprolu
+ M:    Sukadev Bhattiprolu <sukadev@linux.ibm.com>
  L:    linuxppc-dev@lists.ozlabs.org
  S:    Supported
  F:    arch/powerpc/platforms/powernv/vas*
  F:    arch/powerpc/platforms/powernv/copy-paste.h
  F:    arch/powerpc/include/asm/vas.h
- F:    arch/powerpc/include/uapi/asm/vas.h
  
  IBM Power Virtual Ethernet Device Driver
  M:    Thomas Falcon <tlfalcon@linux.ibm.com>
@@@ -7441,14 -7560,14 +7562,14 @@@ F:   drivers/crypto/vmx/ghash
  F:    drivers/crypto/vmx/ppc-xlate.pl
  
  IBM Power PCI Hotplug Driver for RPA-compliant PPC64 platform
- M:    Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
+ M:    Tyrel Datwyler <tyreld@linux.ibm.com>
  L:    linux-pci@vger.kernel.org
  L:    linuxppc-dev@lists.ozlabs.org
  S:    Supported
  F:    drivers/pci/hotplug/rpaphp*
  
  IBM Power IO DLPAR Driver for RPA-compliant PPC64 platform
- M:    Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
+ M:    Tyrel Datwyler <tyreld@linux.ibm.com>
  L:    linux-pci@vger.kernel.org
  L:    linuxppc-dev@lists.ozlabs.org
  S:    Supported
@@@ -7620,7 -7739,7 +7741,7 @@@ INA209 HARDWARE MONITOR DRIVE
  M:    Guenter Roeck <linux@roeck-us.net>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
- F:    Documentation/hwmon/ina209
+ F:    Documentation/hwmon/ina209.rst
  F:    Documentation/devicetree/bindings/hwmon/ina2xx.txt
  F:    drivers/hwmon/ina209.c
  
@@@ -7628,7 -7747,7 +7749,7 @@@ INA2XX HARDWARE MONITOR DRIVE
  M:    Guenter Roeck <linux@roeck-us.net>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
- F:    Documentation/hwmon/ina2xx
+ F:    Documentation/hwmon/ina2xx.rst
  F:    drivers/hwmon/ina2xx.c
  F:    include/linux/platform_data/ina2xx.h
  
@@@ -7655,6 -7774,10 +7776,10 @@@ F:    drivers/infiniband
  F:    include/uapi/linux/if_infiniband.h
  F:    include/uapi/rdma/
  F:    include/rdma/
+ F:    include/trace/events/ib_mad.h
+ F:    include/trace/events/ib_umad.h
+ F:    samples/bpf/ibumad_kern.c
+ F:    samples/bpf/ibumad_user.c
  
  INGENIC JZ4780 DMA Driver
  M:    Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com>
@@@ -7878,10 -8001,10 +8003,10 @@@ F:   Documentation/media/v4l-drivers/ipu3
  INTEL IXP4XX QMGR, NPE, ETHERNET and HSS SUPPORT
  M:    Krzysztof Halasa <khalasa@piap.pl>
  S:    Maintained
- F:    arch/arm/mach-ixp4xx/include/mach/qmgr.h
- F:    arch/arm/mach-ixp4xx/include/mach/npe.h
- F:    arch/arm/mach-ixp4xx/ixp4xx_qmgr.c
- F:    arch/arm/mach-ixp4xx/ixp4xx_npe.c
+ F:    include/linux/soc/ixp4xx/qmgr.h
+ F:    include/linux/soc/ixp4xx/npe.h
+ F:    drivers/soc/ixp4xx/ixp4xx-qmgr.c
+ F:    drivers/soc/ixp4xx/ixp4xx-npe.c
  F:    drivers/net/ethernet/xscale/ixp4xx_eth.c
  F:    drivers/net/wan/ixp4xx_hss.c
  
@@@ -8048,6 -8171,7 +8173,7 @@@ F:      drivers/gpio/gpio-intel-mid.
  
  INTERCONNECT API
  M:    Georgi Djakov <georgi.djakov@linaro.org>
+ L:    linux-pm@vger.kernel.org
  S:    Maintained
  F:    Documentation/interconnect/
  F:    Documentation/devicetree/bindings/interconnect/
@@@ -8256,7 -8380,7 +8382,7 @@@ IT87 HARDWARE MONITORING DRIVE
  M:    Jean Delvare <jdelvare@suse.com>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
- F:    Documentation/hwmon/it87
+ F:    Documentation/hwmon/it87.rst
  F:    drivers/hwmon/it87.c
  
  IT913X MEDIA DRIVER
@@@ -8300,7 -8424,7 +8426,7 @@@ M:      Guenter Roeck <linux@roeck-us.net
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
  F:    drivers/hwmon/jc42.c
- F:    Documentation/hwmon/jc42
+ F:    Documentation/hwmon/jc42.rst
  
  JFS FILESYSTEM
  M:    Dave Kleikamp <shaggy@kernel.org>
@@@ -8319,9 -8443,11 +8445,11 @@@ F:    drivers/net/ethernet/jme.
  
  JOURNALLING FLASH FILE SYSTEM V2 (JFFS2)
  M:    David Woodhouse <dwmw2@infradead.org>
+ M:    Richard Weinberger <richard@nod.at>
  L:    linux-mtd@lists.infradead.org
  W:    http://www.linux-mtd.infradead.org/doc/jffs2.html
- S:    Maintained
+ T:    git git://git.infradead.org/ubifs-2.6.git
+ S:    Odd Fixes
  F:    fs/jffs2/
  F:    include/uapi/linux/jffs2.h
  
@@@ -8348,14 -8474,14 +8476,14 @@@ K10TEMP HARDWARE MONITORING DRIVE
  M:    Clemens Ladisch <clemens@ladisch.de>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
- F:    Documentation/hwmon/k10temp
+ F:    Documentation/hwmon/k10temp.rst
  F:    drivers/hwmon/k10temp.c
  
  K8TEMP HARDWARE MONITORING DRIVER
  M:    Rudolf Marek <r.marek@assembler.cz>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
- F:    Documentation/hwmon/k8temp
+ F:    Documentation/hwmon/k8temp.rst
  F:    drivers/hwmon/k8temp.c
  
  KASAN
@@@ -8416,6 -8542,7 +8544,7 @@@ F:      scripts/Kbuild
  F:    scripts/Makefile*
  F:    scripts/basic/
  F:    scripts/mk*
+ F:    scripts/*vmlinux*
  F:    scripts/mod/
  F:    scripts/package/
  
@@@ -8996,7 -9123,7 +9125,7 @@@ R:      Daniel Lustig <dlustig@nvidia.com
  L:    linux-kernel@vger.kernel.org
  L:    linux-arch@vger.kernel.org
  S:    Supported
- T:    git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git dev
  F:    tools/memory-model/
  F:    Documentation/atomic_bitops.txt
  F:    Documentation/atomic_t.txt
@@@ -9047,21 -9174,21 +9176,21 @@@ LM78 HARDWARE MONITOR DRIVE
  M:    Jean Delvare <jdelvare@suse.com>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
- F:    Documentation/hwmon/lm78
+ F:    Documentation/hwmon/lm78.rst
  F:    drivers/hwmon/lm78.c
  
  LM83 HARDWARE MONITOR DRIVER
  M:    Jean Delvare <jdelvare@suse.com>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
- F:    Documentation/hwmon/lm83
+ F:    Documentation/hwmon/lm83.rst
  F:    drivers/hwmon/lm83.c
  
  LM90 HARDWARE MONITOR DRIVER
  M:    Jean Delvare <jdelvare@suse.com>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
- F:    Documentation/hwmon/lm90
+ F:    Documentation/hwmon/lm90.rst
  F:    Documentation/devicetree/bindings/hwmon/lm90.txt
  F:    drivers/hwmon/lm90.c
  F:    include/dt-bindings/thermal/lm90.h
@@@ -9070,7 -9197,7 +9199,7 @@@ LM95234 HARDWARE MONITOR DRIVE
  M:    Guenter Roeck <linux@roeck-us.net>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
- F:    Documentation/hwmon/lm95234
+ F:    Documentation/hwmon/lm95234.rst
  F:    drivers/hwmon/lm95234.c
  
  LME2510 MEDIA DRIVER
@@@ -9102,7 -9229,6 +9231,6 @@@ F:      arch/*/include/asm/spinlock*.
  F:    include/linux/rwlock*.h
  F:    include/linux/mutex*.h
  F:    include/linux/rwsem*.h
- F:    arch/*/include/asm/rwsem.h
  F:    include/linux/seqlock.h
  F:    lib/locking*.[ch]
  F:    kernel/locking/
@@@ -9144,7 -9270,7 +9272,7 @@@ LTC4261 HARDWARE MONITOR DRIVE
  M:    Guenter Roeck <linux@roeck-us.net>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
- F:    Documentation/hwmon/ltc4261
+ F:    Documentation/hwmon/ltc4261.rst
  F:    drivers/hwmon/ltc4261.c
  
  LTC4306 I2C MULTIPLEXER DRIVER
@@@ -9375,7 -9501,7 +9503,7 @@@ MAX16065 HARDWARE MONITOR DRIVE
  M:    Guenter Roeck <linux@roeck-us.net>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
- F:    Documentation/hwmon/max16065
+ F:    Documentation/hwmon/max16065.rst
  F:    drivers/hwmon/max16065.c
  
  MAX2175 SDR TUNER DRIVER
@@@ -9391,14 -9517,14 +9519,14 @@@ F:   include/uapi/linux/max2175.
  MAX6650 HARDWARE MONITOR AND FAN CONTROLLER DRIVER
  L:    linux-hwmon@vger.kernel.org
  S:    Orphan
- F:    Documentation/hwmon/max6650
+ F:    Documentation/hwmon/max6650.rst
  F:    drivers/hwmon/max6650.c
  
  MAX6697 HARDWARE MONITOR DRIVER
  M:    Guenter Roeck <linux@roeck-us.net>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
- F:    Documentation/hwmon/max6697
+ F:    Documentation/hwmon/max6697.rst
  F:    Documentation/devicetree/bindings/hwmon/max6697.txt
  F:    drivers/hwmon/max6697.c
  F:    include/linux/platform_data/max6697.h
@@@ -9410,6 -9536,27 +9538,27 @@@ S:    Maintaine
  F:    Documentation/devicetree/bindings/sound/max9860.txt
  F:    sound/soc/codecs/max9860.*
  
+ MAXBOTIX ULTRASONIC RANGER IIO DRIVER
+ M:    Andreas Klinger <ak@it-klinger.de>
+ L:    linux-iio@vger.kernel.org
+ S:    Maintained
+ F:    Documentation/devicetree/bindings/iio/proximity/maxbotix,mb1232.txt
+ F:    drivers/iio/proximity/mb1232.c
+ MAXIM MAX77650 PMIC MFD DRIVER
+ M:    Bartosz Golaszewski <bgolaszewski@baylibre.com>
+ L:    linux-kernel@vger.kernel.org
+ S:    Maintained
+ F:    Documentation/devicetree/bindings/*/*max77650.txt
+ F:    Documentation/devicetree/bindings/*/max77650*.txt
+ F:    include/linux/mfd/max77650.h
+ F:    drivers/mfd/max77650.c
+ F:    drivers/regulator/max77650-regulator.c
+ F:    drivers/power/supply/max77650-charger.c
+ F:    drivers/input/misc/max77650-onkey.c
+ F:    drivers/leds/leds-max77650.c
+ F:    drivers/gpio/gpio-max77650.c
  MAXIM MAX77802 PMIC REGULATOR DEVICE DRIVER
  M:    Javier Martinez Canillas <javier@dowhile0.org>
  L:    linux-kernel@vger.kernel.org
@@@ -9778,9 -9925,17 +9927,17 @@@ F:    drivers/media/platform/mtk-vpu
  F:    Documentation/devicetree/bindings/media/mediatek-vcodec.txt
  F:    Documentation/devicetree/bindings/media/mediatek-vpu.txt
  
+ MEDIATEK MMC/SD/SDIO DRIVER
+ M:    Chaotian Jing <chaotian.jing@mediatek.com>
+ S:    Maintained
+ F:    drivers/mmc/host/mtk-sd.c
+ F:    Documentation/devicetree/bindings/mmc/mtk-sd.txt
  MEDIATEK MT76 WIRELESS LAN DRIVER
  M:    Felix Fietkau <nbd@nbd.name>
  M:    Lorenzo Bianconi <lorenzo.bianconi83@gmail.com>
+ R:    Ryder Lee <ryder.lee@mediatek.com>
+ R:    Roy Luo <royluo@google.com>
  L:    linux-wireless@vger.kernel.org
  S:    Maintained
  F:    drivers/net/wireless/mediatek/mt76/
@@@ -9879,15 -10034,6 +10036,6 @@@ F:   drivers/net/ethernet/mellanox/mlx5/c
  F:    drivers/net/ethernet/mellanox/mlx5/core/fpga/*
  F:    include/linux/mlx5/mlx5_ifc_fpga.h
  
- MELLANOX ETHERNET INNOVA IPSEC DRIVER
- R:    Boris Pismenny <borisp@mellanox.com>
- L:    netdev@vger.kernel.org
- S:    Supported
- W:    http://www.mellanox.com
- Q:    http://patchwork.ozlabs.org/project/netdev/list/
- F:    drivers/net/ethernet/mellanox/mlx5/core/en_ipsec/*
- F:    drivers/net/ethernet/mellanox/mlx5/core/ipsec*
  MELLANOX ETHERNET SWITCH DRIVERS
  M:    Jiri Pirko <jiri@mellanox.com>
  M:    Ido Schimmel <idosch@mellanox.com>
@@@ -10010,14 -10156,15 +10158,15 @@@ F:        mm
  MEMORY TECHNOLOGY DEVICES (MTD)
  M:    David Woodhouse <dwmw2@infradead.org>
  M:    Brian Norris <computersforpeace@gmail.com>
- M:    Boris Brezillon <bbrezillon@kernel.org>
  M:    Marek Vasut <marek.vasut@gmail.com>
+ M:    Miquel Raynal <miquel.raynal@bootlin.com>
  M:    Richard Weinberger <richard@nod.at>
+ M:    Vignesh Raghavendra <vigneshr@ti.com>
  L:    linux-mtd@lists.infradead.org
  W:    http://www.linux-mtd.infradead.org/
  Q:    http://patchwork.ozlabs.org/project/linux-mtd/list/
- T:    git git://git.infradead.org/linux-mtd.git master
- T:    git git://git.infradead.org/linux-mtd.git mtd/next
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/fixes
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/next
  S:    Maintained
  F:    Documentation/devicetree/bindings/mtd/
  F:    drivers/mtd/
@@@ -10044,7 -10191,7 +10193,7 @@@ F:   drivers/mfd/menf21bmc.
  F:    drivers/watchdog/menf21bmc_wdt.c
  F:    drivers/leds/leds-menf21bmc.c
  F:    drivers/hwmon/menf21bmc_hwmon.c
- F:    Documentation/hwmon/menf21bmc
+ F:    Documentation/hwmon/menf21bmc.rst
  
  MEN Z069 WATCHDOG DRIVER
  M:    Johannes Thumshirn <jth@kernel.org>
@@@ -10059,6 -10206,7 +10208,7 @@@ L:   linux-amlogic@lists.infradead.or
  W:    http://linux-meson.com/
  S:    Supported
  F:    drivers/media/platform/meson/ao-cec.c
+ F:    drivers/media/platform/meson/ao-cec-g12a.c
  F:    Documentation/devicetree/bindings/media/meson-ao-cec.txt
  T:    git git://linuxtv.org/media_tree.git
  
@@@ -10115,7 -10263,8 +10265,8 @@@ MICROCHIP I2C DRIVE
  M:    Ludovic Desroches <ludovic.desroches@microchip.com>
  L:    linux-i2c@vger.kernel.org
  S:    Supported
- F:    drivers/i2c/busses/i2c-at91.c
+ F:    drivers/i2c/busses/i2c-at91.h
+ F:    drivers/i2c/busses/i2c-at91-*.c
  
  MICROCHIP ISC DRIVER
  M:    Eugen Hristev <eugen.hristev@microchip.com>
@@@ -10391,7 -10540,7 +10542,7 @@@ F:   arch/arm/mach-mmp
  
  MMU GATHER AND TLB INVALIDATION
  M:    Will Deacon <will.deacon@arm.com>
- M:    "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
+ M:    "Aneesh Kumar K.V" <aneesh.kumar@linux.ibm.com>
  M:    Andrew Morton <akpm@linux-foundation.org>
  M:    Nick Piggin <npiggin@gmail.com>
  M:    Peter Zijlstra <peterz@infradead.org>
@@@ -10437,7 -10586,7 +10588,7 @@@ F:   include/uapi/linux/meye.
  MOXA SMARTIO/INDUSTIO/INTELLIO SERIAL CARD
  M:    Jiri Slaby <jirislaby@gmail.com>
  S:    Maintained
- F:    Documentation/serial/moxa-smartio
+ F:    Documentation/serial/moxa-smartio.rst
  F:    drivers/tty/mxser.*
  
  MR800 AVERMEDIA USB FM RADIO DRIVER
@@@ -10624,14 -10773,12 +10775,12 @@@ S:        Supporte
  F:    drivers/net/ethernet/myricom/myri10ge/
  
  NAND FLASH SUBSYSTEM
- M:    Boris Brezillon <bbrezillon@kernel.org>
  M:    Miquel Raynal <miquel.raynal@bootlin.com>
  R:    Richard Weinberger <richard@nod.at>
  L:    linux-mtd@lists.infradead.org
  W:    http://www.linux-mtd.infradead.org/
  Q:    http://patchwork.ozlabs.org/project/linux-mtd/list/
- T:    git git://git.infradead.org/linux-mtd.git nand/fixes
- T:    git git://git.infradead.org/linux-mtd.git nand/next
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/next
  S:    Maintained
  F:    drivers/mtd/nand/
  F:    include/linux/mtd/*nand*.h
@@@ -10672,7 -10819,7 +10821,7 @@@ NCT6775 HARDWARE MONITOR DRIVE
  M:    Guenter Roeck <linux@roeck-us.net>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
- F:    Documentation/hwmon/nct6775
+ F:    Documentation/hwmon/nct6775.rst
  F:    drivers/hwmon/nct6775.c
  
  NET_FAILOVER MODULE
@@@ -10750,6 -10897,7 +10899,7 @@@ L:   linux-block@vger.kernel.or
  L:    nbd@other.debian.org
  F:    Documentation/blockdev/nbd.txt
  F:    drivers/block/nbd.c
+ F:    include/trace/events/nbd.h
  F:    include/uapi/linux/nbd.h
  
  NETWORK DROP MONITOR
@@@ -11120,6 -11268,16 +11270,16 @@@ F: Documentation/ABI/stable/sysfs-bus-n
  F:    include/linux/nvmem-consumer.h
  F:    include/linux/nvmem-provider.h
  
+ NXP FXAS21002C DRIVER
+ M:    Rui Miguel Silva <rmfrfs@gmail.com>
+ L:    linux-iio@vger.kernel.org
+ S:    Maintained
+ F:    Documentation/devicetree/bindings/iio/gyroscope/fxas21002c.txt
+ F:    drivers/iio/gyro/fxas21002c_core.c
+ F:    drivers/iio/gyro/fxas21002c.h
+ F:    drivers/iio/gyro/fxas21002c_i2c.c
+ F:    drivers/iio/gyro/fxas21002c_spi.c
  NXP SGTL5000 DRIVER
  M:    Fabio Estevam <festevam@gmail.com>
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
@@@ -11127,6 -11285,12 +11287,12 @@@ S: Maintaine
  F:    Documentation/devicetree/bindings/sound/sgtl5000.txt
  F:    sound/soc/codecs/sgtl5000*
  
+ NXP SJA1105 ETHERNET SWITCH DRIVER
+ M:    Vladimir Oltean <olteanv@gmail.com>
+ L:    linux-kernel@vger.kernel.org
+ S:    Maintained
+ F:    drivers/net/dsa/sja1105
  NXP TDA998X DRM DRIVER
  M:    Russell King <linux@armlinux.org.uk>
  S:    Maintained
@@@ -11175,7 -11339,7 +11341,7 @@@ F:   tools/objtool
  
  OCXL (Open Coherent Accelerator Processor Interface OpenCAPI) DRIVER
  M:    Frederic Barrat <fbarrat@linux.ibm.com>
- M:    Andrew Donnellan <andrew.donnellan@au1.ibm.com>
+ M:    Andrew Donnellan <ajd@linux.ibm.com>
  L:    linuxppc-dev@lists.ozlabs.org
  S:    Supported
  F:    arch/powerpc/platforms/powernv/ocxl.c
@@@ -11606,7 -11770,7 +11772,7 @@@ F:   Documentation/devicetree/bindings/op
  OPL4 DRIVER
  M:    Clemens Ladisch <clemens@ladisch.de>
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
- T:    git git://git.alsa-project.org/alsa-kernel.git
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git
  S:    Maintained
  F:    sound/drivers/opl4/
  
@@@ -11622,6 -11786,7 +11788,7 @@@ F:   include/linux/oprofile.
  ORACLE CLUSTER FILESYSTEM 2 (OCFS2)
  M:    Mark Fasheh <mark@fasheh.com>
  M:    Joel Becker <jlbec@evilplan.org>
+ M:    Joseph Qi <joseph.qi@linux.alibaba.com>
  L:    ocfs2-devel@oss.oracle.com (moderated for non-subscribers)
  W:    http://ocfs2.wiki.kernel.org
  S:    Supported
@@@ -11680,6 -11845,14 +11847,14 @@@ L: linux-i2c@vger.kernel.or
  S:    Orphan
  F:    drivers/i2c/busses/i2c-pasemi.c
  
+ PACKING
+ M:    Vladimir Oltean <olteanv@gmail.com>
+ L:    netdev@vger.kernel.org
+ S:    Supported
+ F:    lib/packing.c
+ F:    include/linux/packing.h
+ F:    Documentation/packing.txt
  PADATA PARALLEL EXECUTION MECHANISM
  M:    Steffen Klassert <steffen.klassert@secunet.com>
  L:    linux-crypto@vger.kernel.org
@@@ -11766,7 -11939,7 +11941,7 @@@ PC87360 HARDWARE MONITORING DRIVE
  M:    Jim Cromie <jim.cromie@gmail.com>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
- F:    Documentation/hwmon/pc87360
+ F:    Documentation/hwmon/pc87360.rst
  F:    drivers/hwmon/pc87360.c
  
  PC8736x GPIO DRIVER
@@@ -11778,7 -11951,7 +11953,7 @@@ PC87427 HARDWARE MONITORING DRIVE
  M:    Jean Delvare <jdelvare@suse.com>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
- F:    Documentation/hwmon/pc87427
+ F:    Documentation/hwmon/pc87427.rst
  F:    drivers/hwmon/pc87427.c
  
  PCA9532 LED DRIVER
@@@ -11893,7 -12066,8 +12068,8 @@@ F:   include/linux/switchtec.
  F:    drivers/ntb/hw/mscc/
  
  PCI DRIVER FOR MOBIVEIL PCIE IP
- M:    Subrahmanya Lingappa <l.subrahmanya@mobiveil.co.in>
+ M:    Karthikeyan Mitran <m.karthikeyan@mobiveil.co.in>
+ M:    Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
  L:    linux-pci@vger.kernel.org
  S:    Supported
  F:    Documentation/devicetree/bindings/pci/mobiveil-pcie.txt
@@@ -12027,6 -12201,12 +12203,12 @@@ T: git git://git.kernel.org/pub/scm/lin
  S:    Supported
  F:    drivers/pci/controller/
  
+ PCIE DRIVER FOR ANNAPURNA LABS
+ M:    Jonathan Chocron <jonnyc@amazon.com>
+ L:    linux-pci@vger.kernel.org
+ S:    Maintained
+ F:    drivers/pci/controller/dwc/pcie-al.c
  PCIE DRIVER FOR AMLOGIC MESON
  M:    Yue Wang <yue.wang@Amlogic.com>
  L:    linux-pci@vger.kernel.org
@@@ -12347,23 -12527,23 +12529,23 @@@ S:        Maintaine
  F:    Documentation/devicetree/bindings/hwmon/ibm,cffps1.txt
  F:    Documentation/devicetree/bindings/hwmon/max31785.txt
  F:    Documentation/devicetree/bindings/hwmon/ltc2978.txt
- F:    Documentation/hwmon/adm1275
- F:    Documentation/hwmon/ibm-cffps
- F:    Documentation/hwmon/ir35221
- F:    Documentation/hwmon/lm25066
- F:    Documentation/hwmon/ltc2978
- F:    Documentation/hwmon/ltc3815
- F:    Documentation/hwmon/max16064
- F:    Documentation/hwmon/max20751
- F:    Documentation/hwmon/max31785
- F:    Documentation/hwmon/max34440
- F:    Documentation/hwmon/max8688
- F:    Documentation/hwmon/pmbus
- F:    Documentation/hwmon/pmbus-core
- F:    Documentation/hwmon/tps40422
- F:    Documentation/hwmon/ucd9000
- F:    Documentation/hwmon/ucd9200
- F:    Documentation/hwmon/zl6100
+ F:    Documentation/hwmon/adm1275.rst
+ F:    Documentation/hwmon/ibm-cffps.rst
+ F:    Documentation/hwmon/ir35221.rst
+ F:    Documentation/hwmon/lm25066.rst
+ F:    Documentation/hwmon/ltc2978.rst
+ F:    Documentation/hwmon/ltc3815.rst
+ F:    Documentation/hwmon/max16064.rst
+ F:    Documentation/hwmon/max20751.rst
+ F:    Documentation/hwmon/max31785.rst
+ F:    Documentation/hwmon/max34440.rst
+ F:    Documentation/hwmon/max8688.rst
+ F:    Documentation/hwmon/pmbus.rst
+ F:    Documentation/hwmon/pmbus-core.rst
+ F:    Documentation/hwmon/tps40422.rst
+ F:    Documentation/hwmon/ucd9000.rst
+ F:    Documentation/hwmon/ucd9200.rst
+ F:    Documentation/hwmon/zl6100.rst
  F:    drivers/hwmon/pmbus/
  F:    include/linux/pmbus.h
  
@@@ -12419,7 -12599,7 +12601,7 @@@ M:   Mark Rutland <mark.rutland@arm.com
  M:    Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
  L:    linux-arm-kernel@lists.infradead.org
  S:    Maintained
- F:    drivers/firmware/psci*.c
+ F:    drivers/firmware/psci/
  F:    include/linux/psci.h
  F:    include/uapi/linux/psci.h
  
@@@ -12627,7 -12807,7 +12809,7 @@@ M:   Bartlomiej Zolnierkiewicz <b.zolnier
  L:    linux-hwmon@vger.kernel.org
  S:    Supported
  F:    Documentation/devicetree/bindings/hwmon/pwm-fan.txt
- F:    Documentation/hwmon/pwm-fan
+ F:    Documentation/hwmon/pwm-fan.rst
  F:    drivers/hwmon/pwm-fan.c
  
  PWM IR Transmitter
@@@ -13045,9 -13225,9 +13227,9 @@@ M:   Josh Triplett <josh@joshtriplett.org
  R:    Steven Rostedt <rostedt@goodmis.org>
  R:    Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  R:    Lai Jiangshan <jiangshanlai@gmail.com>
- L:    linux-kernel@vger.kernel.org
+ L:    rcu@vger.kernel.org
  S:    Supported
- T:    git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git dev
  F:    tools/testing/selftests/rcutorture
  
  RDC R-321X SoC
@@@ -13093,10 -13273,10 +13275,10 @@@ R:        Steven Rostedt <rostedt@goodmis.org
  R:    Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  R:    Lai Jiangshan <jiangshanlai@gmail.com>
  R:    Joel Fernandes <joel@joelfernandes.org>
- L:    linux-kernel@vger.kernel.org
+ L:    rcu@vger.kernel.org
  W:    http://www.rdrop.com/users/paulmck/RCU/
  S:    Supported
- T:    git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git dev
  F:    Documentation/RCU/
  X:    Documentation/RCU/torture.txt
  F:    include/linux/rcu*
@@@ -13322,7 -13502,7 +13504,7 @@@ ROCKETPORT DRIVE
  P:    Comtrol Corp.
  W:    http://www.comtrol.com
  S:    Maintained
- F:    Documentation/serial/rocket.txt
+ F:    Documentation/serial/rocket.rst
  F:    drivers/tty/rocket*
  
  ROCKETPORT EXPRESS/INFINITY DRIVER
@@@ -13406,6 -13586,12 +13588,12 @@@ T: git git://git.kernel.org/pub/scm/lin
  S:    Maintained
  F:    drivers/net/wireless/realtek/rtlwifi/
  
+ REALTEK WIRELESS DRIVER (rtw88)
+ M:    Yan-Hsuan Chuang <yhchuang@realtek.com>
+ L:    linux-wireless@vger.kernel.org
+ S:    Maintained
+ F:    drivers/net/wireless/realtek/rtw88/
  RTL8XXXU WIRELESS DRIVER (rtl8xxxu)
  M:    Jes Sorensen <Jes.Sorensen@gmail.com>
  L:    linux-wireless@vger.kernel.org
@@@ -13951,7 -14137,7 +14139,7 @@@ W:   https://selinuxproject.or
  W:    https://github.com/SELinuxProject
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git
  S:    Supported
- F:    include/linux/selinux*
+ F:    include/uapi/linux/selinux_netlink.h
  F:    security/selinux/
  F:    scripts/selinux/
  F:    Documentation/admin-guide/LSM/SELinux.rst
@@@ -14248,10 -14434,10 +14436,10 @@@ M:        "Paul E. McKenney" <paulmck@linux.ib
  M:    Josh Triplett <josh@joshtriplett.org>
  R:    Steven Rostedt <rostedt@goodmis.org>
  R:    Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- L:    linux-kernel@vger.kernel.org
+ L:    rcu@vger.kernel.org
  W:    http://www.rdrop.com/users/paulmck/RCU/
  S:    Supported
- T:    git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git dev
  F:    include/linux/srcu*.h
  F:    kernel/rcu/srcu*.c
  
@@@ -14292,21 -14478,21 +14480,21 @@@ SMM665 HARDWARE MONITOR DRIVE
  M:    Guenter Roeck <linux@roeck-us.net>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
- F:    Documentation/hwmon/smm665
+ F:    Documentation/hwmon/smm665.rst
  F:    drivers/hwmon/smm665.c
  
  SMSC EMC2103 HARDWARE MONITOR DRIVER
  M:    Steve Glendinning <steve.glendinning@shawell.net>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
- F:    Documentation/hwmon/emc2103
+ F:    Documentation/hwmon/emc2103.rst
  F:    drivers/hwmon/emc2103.c
  
  SMSC SCH5627 HARDWARE MONITOR DRIVER
  M:    Hans de Goede <hdegoede@redhat.com>
  L:    linux-hwmon@vger.kernel.org
  S:    Supported
- F:    Documentation/hwmon/sch5627
+ F:    Documentation/hwmon/sch5627.rst
  F:    drivers/hwmon/sch5627.c
  
  SMSC UFX6000 and UFX7000 USB to VGA DRIVER
@@@ -14319,7 -14505,7 +14507,7 @@@ SMSC47B397 HARDWARE MONITOR DRIVE
  M:    Jean Delvare <jdelvare@suse.com>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
- F:    Documentation/hwmon/smsc47b397
+ F:    Documentation/hwmon/smsc47b397.rst
  F:    drivers/hwmon/smsc47b397.c
  
  SMSC911x ETHERNET DRIVER
@@@ -14339,9 -14525,8 +14527,8 @@@ SOC-CAMERA V4L2 SUBSYSTE
  L:    linux-media@vger.kernel.org
  T:    git git://linuxtv.org/media_tree.git
  S:    Orphan
- F:    include/media/soc*
- F:    drivers/media/i2c/soc_camera/
- F:    drivers/media/platform/soc_camera/
+ F:    include/media/soc_camera.h
+ F:    drivers/staging/media/soc_camera/
  
  SOCIONEXT SYNQUACER I2C DRIVER
  M:    Ard Biesheuvel <ard.biesheuvel@linaro.org>
@@@ -14477,16 -14662,15 +14664,15 @@@ T:        git git://linuxtv.org/media_tree.gi
  S:    Maintained
  F:    drivers/media/i2c/imx355.c
  
- SONY MEMORYSTICK CARD SUPPORT
- M:    Alex Dubov <oakad@yahoo.com>
- W:    http://tifmxx.berlios.de/
- S:    Maintained
- F:    drivers/memstick/host/tifm_ms.c
- SONY MEMORYSTICK STANDARD SUPPORT
+ SONY MEMORYSTICK SUBSYSTEM
  M:    Maxim Levitsky <maximlevitsky@gmail.com>
+ M:    Alex Dubov <oakad@yahoo.com>
+ M:    Ulf Hansson <ulf.hansson@linaro.org>
+ L:    linux-mmc@vger.kernel.org
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git
  S:    Maintained
- F:    drivers/memstick/core/ms_block.*
+ F:    drivers/memstick/
+ F:    include/linux/memstick.h
  
  SONY VAIO CONTROL DEVICE DRIVER
  M:    Mattia Dongili <malattia@linux.it>
@@@ -14504,7 -14688,6 +14690,6 @@@ M:   Takashi Iwai <tiwai@suse.com
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
  W:    http://www.alsa-project.org/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git
- T:    git git://git.alsa-project.org/alsa-kernel.git
  Q:    http://patchwork.kernel.org/project/alsa-devel/list/
  S:    Maintained
  F:    Documentation/sound/
@@@ -14617,8 -14800,7 +14802,7 @@@ M:   Tudor Ambarus <tudor.ambarus@microch
  L:    linux-mtd@lists.infradead.org
  W:    http://www.linux-mtd.infradead.org/
  Q:    http://patchwork.ozlabs.org/project/linux-mtd/list/
- T:    git git://git.infradead.org/linux-mtd.git spi-nor/fixes
- T:    git git://git.infradead.org/linux-mtd.git spi-nor/next
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git spi-nor/next
  S:    Maintained
  F:    drivers/mtd/spi-nor/
  F:    include/linux/mtd/spi-nor.h
@@@ -14682,6 -14864,14 +14866,14 @@@ S: Maintaine
  F:    drivers/iio/imu/st_lsm6dsx/
  F:    Documentation/devicetree/bindings/iio/imu/st_lsm6dsx.txt
  
+ ST MIPID02 CSI-2 TO PARALLEL BRIDGE DRIVER
+ M:    Mickael Guene <mickael.guene@st.com>
+ L:    linux-media@vger.kernel.org
+ T:    git git://linuxtv.org/media_tree.git
+ S:    Maintained
+ F:    drivers/media/i2c/st-mipid02.c
+ F:    Documentation/devicetree/bindings/media/i2c/st,st-mipid02.txt
  ST STM32 I2C/SMBUS DRIVER
  M:    Pierre-Yves MORDRET <pierre-yves.mordret@st.com>
  L:    linux-i2c@vger.kernel.org
@@@ -15318,6 -15508,11 +15510,11 @@@ M: Laxman Dewangan <ldewangan@nvidia.co
  S:    Supported
  F:    drivers/spi/spi-tegra*
  
+ TEGRA XUSB PADCTL DRIVER
+ M:    JC Kuo <jckuo@nvidia.com>
+ S:    Supported
+ F:    drivers/phy/tegra/xusb*
  TEHUTI ETHERNET DRIVER
  M:    Andy Gospodarek <andy@greyhouse.net>
  L:    netdev@vger.kernel.org
@@@ -15353,6 -15548,12 +15550,12 @@@ F: Documentation/devicetree/bindings/re
  F:    Documentation/devicetree/bindings/clock/ti,sci-clk.txt
  F:    drivers/clk/keystone/sci-clk.c
  F:    drivers/reset/reset-ti-sci.c
+ F:    Documentation/devicetree/bindings/interrupt-controller/ti,sci-intr.txt
+ F:    Documentation/devicetree/bindings/interrupt-controller/ti,sci-inta.txt
+ F:    drivers/irqchip/irq-ti-sci-intr.c
+ F:    drivers/irqchip/irq-ti-sci-inta.c
+ F:    include/linux/soc/ti/ti_sci_inta_msi.h
+ F:    drivers/soc/ti/ti_sci_inta_msi.c
  
  Texas Instruments ASoC drivers
  M:    Peter Ujfalusi <peter.ujfalusi@ti.com>
@@@ -15471,7 -15672,7 +15674,7 @@@ F:   include/linux/clk/ti.
  
  TI DAVINCI MACHINE SUPPORT
  M:    Sekhar Nori <nsekhar@ti.com>
M:    Kevin Hilman <khilman@kernel.org>
R:    Bartosz Golaszewski <bgolaszewski@baylibre.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci.git
  S:    Supported
@@@ -15511,9 -15712,11 +15714,11 @@@ S: Maintaine
  F:    drivers/net/ethernet/ti/cpsw*
  F:    drivers/net/ethernet/ti/davinci*
  
- TI FLASH MEDIA INTERFACE DRIVER
+ TI FLASH MEDIA MEMORYSTICK/MMC DRIVERS
  M:    Alex Dubov <oakad@yahoo.com>
  S:    Maintained
+ W:    http://tifmxx.berlios.de/
+ F:    drivers/memstick/host/tifm_ms.c
  F:    drivers/misc/tifm*
  F:    drivers/mmc/host/tifm_sd.c
  F:    include/linux/tifm.h
@@@ -15665,7 -15868,7 +15870,7 @@@ TMP401 HARDWARE MONITOR DRIVE
  M:    Guenter Roeck <linux@roeck-us.net>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
- F:    Documentation/hwmon/tmp401
+ F:    Documentation/hwmon/tmp401.rst
  F:    drivers/hwmon/tmp401.c
  
  TMPFS (SHMEM FILESYSTEM)
@@@ -15698,7 -15901,7 +15903,7 @@@ M:   "Paul E. McKenney" <paulmck@linux.ib
  M:    Josh Triplett <josh@joshtriplett.org>
  L:    linux-kernel@vger.kernel.org
  S:    Supported
- T:    git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git dev
  F:    Documentation/RCU/torture.txt
  F:    kernel/torture.c
  F:    kernel/rcu/rcutorture.c
@@@ -15940,6 -16143,12 +16145,12 @@@ F: drivers/uwb
  F:    include/linux/uwb.h
  F:    include/linux/uwb/
  
+ UNICODE SUBSYSTEM:
+ M:    Gabriel Krisman Bertazi <krisman@collabora.com>
+ L:    linux-fsdevel@vger.kernel.org
+ S:    Supported
+ F:    fs/unicode/
  UNICORE32 ARCHITECTURE:
  M:    Guan Xuetao <gxt@pku.edu.cn>
  W:    http://mprc.pku.edu.cn/~guanxuetao/linux
@@@ -15985,6 -16194,13 +16196,13 @@@ L: linux-scsi@vger.kernel.or
  S:    Supported
  F:    drivers/scsi/ufs/*dwc*
  
+ UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER MEDIATEK HOOKS
+ M:    Stanley Chu <stanley.chu@mediatek.com>
+ L:    linux-scsi@vger.kernel.org
+ L:    linux-mediatek@lists.infradead.org (moderated for non-subscribers)
+ S:    Maintained
+ F:    drivers/scsi/ufs/ufs-mediatek*
  UNSORTED BLOCK IMAGES (UBI)
  M:    Artem Bityutskiy <dedekind1@gmail.com>
  M:    Richard Weinberger <richard@nod.at>
@@@ -16088,6 -16304,14 +16306,14 @@@ L: linux-usb@vger.kernel.or
  S:    Maintained
  F:    drivers/usb/roles/intel-xhci-usb-role-switch.c
  
+ USB IP DRIVER FOR HISILICON KIRIN
+ M:    Yu Chen <chenyu56@huawei.com>
+ M:    Binghui Wang <wangbinghui@hisilicon.com>
+ L:    linux-usb@vger.kernel.org
+ S:    Maintained
+ F:    Documentation/devicetree/bindings/phy/phy-hi3660-usb3.txt
+ F:    drivers/phy/hisilicon/phy-hi3660-usb3.c
  USB ISP116X DRIVER
  M:    Olav Kongas <ok@artecdesign.ee>
  L:    linux-usb@vger.kernel.org
@@@ -16114,7 -16338,7 +16340,7 @@@ F:   drivers/usb/storage
  USB MIDI DRIVER
  M:    Clemens Ladisch <clemens@ladisch.de>
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
- T:    git git://git.alsa-project.org/alsa-kernel.git
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git
  S:    Maintained
  F:    sound/usb/midi.*
  
@@@ -16387,6 -16611,7 +16613,7 @@@ F:   fs/fat
  
  VFIO DRIVER
  M:    Alex Williamson <alex.williamson@redhat.com>
+ R:    Cornelia Huck <cohuck@redhat.com>
  L:    kvm@vger.kernel.org
  T:    git git://github.com/awilliam/linux-vfio.git
  S:    Maintained
@@@ -16703,7 -16928,7 +16930,7 @@@ VT1211 HARDWARE MONITOR DRIVE
  M:    Juerg Haefliger <juergh@gmail.com>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
- F:    Documentation/hwmon/vt1211
+ F:    Documentation/hwmon/vt1211.rst
  F:    drivers/hwmon/vt1211.c
  
  VT8231 HARDWARE MONITOR DRIVER
@@@ -16731,14 -16956,14 +16958,14 @@@ W83791D HARDWARE MONITORING DRIVE
  M:    Marc Hulsman <m.hulsman@tudelft.nl>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
- F:    Documentation/hwmon/w83791d
+ F:    Documentation/hwmon/w83791d.rst
  F:    drivers/hwmon/w83791d.c
  
  W83793 HARDWARE MONITORING DRIVER
  M:    Rudolf Marek <r.marek@assembler.cz>
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
- F:    Documentation/hwmon/w83793
+ F:    Documentation/hwmon/w83793.rst
  F:    drivers/hwmon/w83793.c
  
  W83795 HARDWARE MONITORING DRIVER
@@@ -16847,7 -17072,7 +17074,7 @@@ L:   patches@opensource.cirrus.co
  T:    git https://github.com/CirrusLogic/linux-drivers.git
  W:    https://github.com/CirrusLogic/linux-drivers/wiki
  S:    Supported
- F:    Documentation/hwmon/wm83??
+ F:    Documentation/hwmon/wm83??.rst
  F:    Documentation/devicetree/bindings/extcon/extcon-arizona.txt
  F:    Documentation/devicetree/bindings/regulator/arizona-regulator.txt
  F:    Documentation/devicetree/bindings/mfd/arizona.txt
@@@ -16937,7 -17162,7 +17164,7 @@@ M:   Tony Luck <tony.luck@intel.com
  M:    Borislav Petkov <bp@alien8.de>
  L:    linux-edac@vger.kernel.org
  S:    Maintained
- F:    arch/x86/kernel/cpu/mcheck/*
+ F:    arch/x86/kernel/cpu/mce/*
  
  X86 MICROCODE UPDATE SUPPORT
  M:    Borislav Petkov <bp@alien8.de>