Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

author Linus Torvalds <[email protected]>

Sun, 19 May 2019 17:58:45 +0000 (10:58 -0700)

committer Linus Torvalds <[email protected]>

Sun, 19 May 2019 17:58:45 +0000 (10:58 -0700)
author Linus Torvalds <[email protected]>
Sun, 19 May 2019 17:58:45 +0000 (10:58 -0700)
committer Linus Torvalds <[email protected]>
Sun, 19 May 2019 17:58:45 +0000 (10:58 -0700)
diff --combined MAINTAINERS

index 9cc6767e1b12eae0e55e9d105796a86bd0f16015,96159e502e6cbbb446909ba624d8781e939afb5c..4f4dd9413da7a2ee47e0928ac9c36fadc540df53
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -268,13 -268,12 +268,13 @@@ L:      [email protected]
   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 <[email protected]>
   L:    [email protected]
   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 <[email protected]>
@@@ -469,7 -468,7 +469,7 @@@ ADM1025 HARDWARE MONITOR DRIVE
   M:    Jean Delvare <[email protected]>
   L:    [email protected]
   S:    Maintained
- -F:    Documentation/hwmon/adm1025
+ +F:    Documentation/hwmon/adm1025.rst
   F:    drivers/hwmon/adm1025.c
   
   ADM1029 HARDWARE MONITOR DRIVER
@@@ -521,7 -520,7 +521,7 @@@ ADS1015 HARDWARE MONITOR DRIVE
   M:    Dirk Eibach <[email protected]>
   L:    [email protected]
   S:    Maintained
- -F:    Documentation/hwmon/ads1015
+ +F:    Documentation/hwmon/ads1015.rst
   F:    drivers/hwmon/ads1015.c
   F:    include/linux/platform_data/ads1015.h
   
@@@ -534,7 -533,7 +534,7 @@@ ADT7475 HARDWARE MONITOR DRIVE
   M:    Jean Delvare <[email protected]>
   L:    [email protected]
   S:    Maintained
- -F:    Documentation/hwmon/adt7475
+ +F:    Documentation/hwmon/adt7475.rst
   F:    drivers/hwmon/adt7475.c
   
   ADVANSYS SCSI DRIVER
@@@ -710,12 -709,6 +710,12 @@@ L:       [email protected]
   S:    Maintained
   F:    drivers/gpio/gpio-altera.c
   
+ +ALTERA SYSTEM MANAGER DRIVER
+ +M:    Thor Thayer <[email protected]>
+ +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 <[email protected]>
   S:    Maintained
@@@ -742,12 -735,6 +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 <[email protected]>
+ +S:    Maintained
+ +F:    Documentation/devicetree/bindings/thermal/amazon,al-thermal.txt
+ +F:    drivers/thermal/thermal_mmio.c
+ +
   AMAZON ETHERNET DRIVERS
   M:    Netanel Belgazal <[email protected]>
   R:    Saeed Bishara <[email protected]>
@@@ -757,15 -744,6 +757,15 @@@ S:       Supporte
   F:    Documentation/networking/device_drivers/amazon/ena.txt
   F:    drivers/net/ethernet/amazon/
   
+ +AMAZON RDMA EFA DRIVER
+ +M:    Gal Pressman <[email protected]>
+ +R:    Yossi Leybovich <[email protected]>
+ +L:    [email protected]
+ +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 <[email protected]>
   M:    Gary Hook <[email protected]>
@@@ -786,7 -764,7 +786,7 @@@ AMD FAM15H PROCESSOR POWER MONITORING D
   M:    Huang Rui <[email protected]>
   L:    [email protected]
   S:    Supported
- -F:    Documentation/hwmon/fam15h_power
+ +F:    Documentation/hwmon/fam15h_power.rst
   F:    drivers/hwmon/fam15h_power.c
   
   AMD FCH GPIO DRIVER
@@@ -838,14 -816,6 +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 <[email protected]>
+ +M:    Nehal Shah <[email protected]>
+ +M:    Shyam Sundar S K <[email protected]>
+ +L:    [email protected]
+ +S:    Maintained
+ +F:    drivers/i2c/busses/i2c-amd-mp2*
+ +
   AMD POWERPLAY
   M:    Rex Zhu <[email protected]>
   M:    Evan Quan <[email protected]>
@@@ -898,7 -868,7 +898,7 @@@ L: [email protected]
   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 <[email protected]>
@@@ -980,7 -950,6 +980,7 @@@ F: drivers/dma/dma-axi-dmac.
   ANALOG DEVICES INC IIO DRIVERS
   M:    Lars-Peter Clausen <[email protected]>
   M:    Michael Hennerich <[email protected]>
+ +M:    Stefan Popa <[email protected]>
   W:    http://wiki.analog.com/
   W:    http://ez.analog.com/community/linux-device-drivers
   S:    Supported
@@@ -991,16 -960,10 +991,16 @@@ F:      drivers/iio/adc/ltc2497
   X:    drivers/iio/*/adjd*
   F:    drivers/staging/iio/*/ad*
   
+ +ANALOGBITS PLL LIBRARIES
+ +M:    Paul Walmsley <[email protected]>
+ +S:    Supported
+ +F:    drivers/clk/analogbits/*
+ +F:    include/linux/clk/analogbits*
+ +
   ANDES ARCHITECTURE
   M:    Greentime Hu <[email protected]>
   M:    Vincent Chen <[email protected]>
- -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
@@@ -1204,7 -1167,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
@@@ -1217,15 -1180,6 +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 <[email protected]>
+ +M:    Tomeu Vizoso <[email protected]>
+ +L:    [email protected]
+ +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 <[email protected]>
   S:    Maintained
@@@ -1462,9 -1416,7 +1462,9 @@@ M:      Manivannan Sadhasivam <manivannan.sa
   L:    [email protected] (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 <[email protected]>
@@@ -1733,21 -1685,11 +1733,21 @@@ L:   [email protected]
   S:    Maintained
   
   ARM/INTEL IXP4XX ARM ARCHITECTURE
+ +M:    Linus Walleij <[email protected]>
   M:    Imre Kaloz <[email protected]>
   M:    Krzysztof Halasa <[email protected]>
   L:    [email protected] (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 <[email protected]>
@@@ -2043,7 -1985,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 <[email protected]>
   L:    [email protected]
   S:    Maintained
@@@ -2248,7 -2190,6 +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
   
@@@ -2572,7 -2513,7 +2572,7 @@@ ASC7621 HARDWARE MONITOR DRIVE
   M:    George Joseph <[email protected]>
   L:    [email protected]
   S:    Maintained
- -F:    Documentation/hwmon/asc7621
+ +F:    Documentation/hwmon/asc7621.rst
   F:    drivers/hwmon/asc7621.c
   
   ASPEED VIDEO ENGINE DRIVER
@@@ -2619,7 -2560,7 +2619,7 @@@ F:      include/linux/dmaengine.
   F:    include/linux/async_tx.h
   
   AT24 EEPROM DRIVER
- -M:    Bartosz Golaszewski <b[email protected]>
+ +M:    Bartosz Golaszewski <b[email protected]>
   L:    [email protected]
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git
   S:    Maintained
@@@ -2853,13 -2794,10 +2853,13 @@@ M:   Simon Wunderlich <sw@simonwunderlich
   M:    Antonio Quartulli <[email protected]>
   L:    [email protected] (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
@@@ -3183,7 -3121,6 +3183,7 @@@ F:      drivers/cpufreq/bmips-cpufreq.
   BROADCOM BMIPS MIPS ARCHITECTURE
   M:    Kevin Cernekee <[email protected]>
   M:    Florian Fainelli <[email protected]>
+ +L:    [email protected]
   L:    [email protected]
   T:    git git://github.com/broadcom/stblinux.git
   S:    Maintained
@@@ -3415,7 -3352,7 +3415,7 @@@ F:      include/uapi/linux/bsg.
   BT87X AUDIO DRIVER
   M:    Clemens Ladisch <[email protected]>
   L:    [email protected] (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
@@@ -3468,7 -3405,7 +3468,7 @@@ F:      drivers/scsi/FlashPoint.
   C-MEDIA CMI8788 DRIVER
   M:    Clemens Ladisch <[email protected]>
   L:    [email protected] (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/
   
@@@ -3792,8 -3729,8 +3792,8 @@@ F:      scripts/checkpatch.p
   
   CHINESE DOCUMENTATION
   M:    Harry Wei <[email protected]>
+ +M:    Alex Shi <[email protected]>
   L:    [email protected] (subscribers-only)
- -L:    [email protected] (moderated for non-subscribers)
   S:    Maintained
   F:    Documentation/translations/zh_CN/
   
@@@ -3860,21 -3797,16 +3860,21 @@@ M:   Richard Fitzgerald <[email protected]
   L:    [email protected]
   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 <[email protected]>
@@@ -4112,7 -4044,7 +4112,7 @@@ CORETEMP HARDWARE MONITORING DRIVE
   M:    Fenghua Yu <[email protected]>
   L:    [email protected]
   S:    Maintained
- -F:    Documentation/hwmon/coretemp
+ +F:    Documentation/hwmon/coretemp.rst
   F:    drivers/hwmon/coretemp.c
   
   COSA/SRP SYNC SERIAL DRIVER
@@@ -4121,16 -4053,6 +4121,16 @@@ W:    http://www.fi.muni.cz/~kas/cosa
   S:    Maintained
   F:    drivers/net/wan/cosa*
   
+ +COUNTER SUBSYSTEM
+ +M:    William Breathitt Gray <[email protected]>
+ +L:    [email protected]
+ +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 <[email protected]>
   L:    [email protected]
@@@ -4150,9 -4072,7 +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
@@@ -4327,7 -4247,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:    [email protected]
   W:    http://www.openfabrics.org
   S:    Supported
@@@ -4335,7 -4255,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:    [email protected]
   W:    http://www.chelsio.com
   S:    Supported
@@@ -4356,7 -4276,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:    [email protected]
   W:    http://www.openfabrics.org
   S:    Supported
@@@ -4372,7 -4292,7 +4372,7 @@@ F:      drivers/net/ethernet/chelsio/cxgb4vf
   
   CXL (IBM Coherent Accelerator Processor Interface CAPI) DRIVER
   M:    Frederic Barrat <[email protected]>
- -M:    Andrew Donnellan <andrew.donnellan@au1.ibm.com>
+ +M:    Andrew Donnellan <ajd@linux.ibm.com>
   L:    [email protected]
   S:    Supported
   F:    arch/powerpc/platforms/powernv/pci-cxl.c
@@@ -4632,7 -4552,6 +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 <[email protected]>
@@@ -4680,7 -4599,7 +4680,7 @@@ DIALOG SEMICONDUCTOR DRIVER
   M:    Support Opensource <[email protected]>
   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
@@@ -4831,7 -4750,7 +4831,7 @@@ DME1737 HARDWARE MONITOR DRIVE
   M:    Juerg Haefliger <[email protected]>
   L:    [email protected]
   S:    Maintained
- -F:    Documentation/hwmon/dme1737
+ +F:    Documentation/hwmon/dme1737.rst
   F:    drivers/hwmon/dme1737.c
   
   DMI/SMBIOS SUPPORT
@@@ -4976,14 -4895,6 +4976,14 @@@ M:    Dave Airlie <[email protected]
   S:    Odd Fixes
   F:    drivers/gpu/drm/ast/
   
+ +DRM DRIVER FOR ASPEED BMC GFX
+ +M:    Joel Stanley <[email protected]>
+ +L:    [email protected]
+ +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 <[email protected]>
   L:    [email protected]
@@@ -4997,12 -4908,6 +4997,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 <[email protected]>
+ +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 <[email protected]>
   S:    Maintained
@@@ -5094,12 -4999,6 +5094,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 <[email protected]>
+ +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/
@@@ -5147,13 -5046,6 +5147,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 <[email protected]>
+ +L:    [email protected]
+ +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 <[email protected]>
   R:    Haneen Mohammed <[email protected]>
@@@ -5288,15 -5180,6 +5288,15 @@@ S:    Maintaine
   F:    drivers/gpu/drm/hisilicon/
   F:    Documentation/devicetree/bindings/display/hisilicon/
   
+ +DRM DRIVERS FOR LIMA
+ +M:    Qiang Yu <[email protected]>
+ +L:    [email protected]
+ +L:    [email protected] (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 <[email protected]>
   M:    Philipp Zabel <[email protected]>
@@@ -5714,12 -5597,6 +5714,12 @@@ L:    [email protected]
   S:    Maintained
   F:    drivers/edac/ghes_edac.c
   
+ +EDAC-I10NM
+ +M:    Tony Luck <[email protected]>
+ +L:    [email protected]
+ +S:    Maintained
+ +F:    drivers/edac/i10nm_base.c
+ +
   EDAC-I3000
   L:    [email protected]
   S:    Orphan
@@@ -5801,7 -5678,7 +5801,7 @@@ EDAC-SKYLAK
   M:    Tony Luck <[email protected]>
   L:    [email protected]
   S:    Maintained
- -F:    drivers/edac/skx_edac.c
+ +F:    drivers/edac/skx_*.c
   
   EDAC-TI
   M:    Tero Kristo <[email protected]>
@@@ -5820,7 -5697,7 +5820,7 @@@ F:      drivers/edac/qcom_edac.
   EDIROL UA-101/UA-1000 DRIVER
   M:    Clemens Ladisch <[email protected]>
   L:    [email protected] (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
   
@@@ -6059,7 -5936,7 +6059,7 @@@ F71805F HARDWARE MONITORING DRIVE
   M:    Jean Delvare <[email protected]>
   L:    [email protected]
   S:    Maintained
- -F:    Documentation/hwmon/f71805f
+ +F:    Documentation/hwmon/f71805f.rst
   F:    drivers/hwmon/f71805f.c
   
   FADDR2LINE
@@@ -6160,7 -6037,7 +6160,7 @@@ F:      include/linux/f75375s.
   FIREWIRE AUDIO DRIVERS
   M:    Clemens Ladisch <[email protected]>
   L:    [email protected] (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/
   
@@@ -6584,7 -6461,7 +6584,7 @@@ S:      Maintaine
   F:    drivers/media/radio/radio-gemtek*
   
   GENERIC GPIO I2C DRIVER
- -M:    Haavard Skinnemoen <hskinnemoen@gmail.com>
+ +M:    Wolfram Sang <wsa+renesas@sang-engineering.com>
   S:    Supported
   F:    drivers/i2c/busses/i2c-gpio.c
   F:    include/linux/platform_data/i2c-gpio.h
@@@ -6716,7 -6593,7 +6716,7 @@@ M:      Andy Shevchenko <andriy.shevchenko@l
   L:    [email protected]
   L:    [email protected]
   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
@@@ -7456,6 -7333,7 +7456,6 @@@ F:      Documentation/devicetree/bindings/i3
   F:    Documentation/driver-api/i3c
   F:    drivers/i3c/
   F:    include/linux/i3c/
- -F:    include/dt-bindings/i3c/
   
   I3C DRIVER FOR SYNOPSYS DESIGNWARE
   M:    Vitor Soares <[email protected]>
@@@ -7508,12 -7386,13 +7508,12 @@@ S:   Supporte
   F:    drivers/net/ethernet/ibm/ibmvnic.*
   
   IBM Power Virtual Accelerator Switchboard
- -M:    Sukadev Bhattiprolu
+ +M:    Sukadev Bhattiprolu <[email protected]>
   L:    [email protected]
   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 <[email protected]>
@@@ -7560,14 -7439,14 +7560,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 <[email protected]>
   L:    [email protected]
   L:    [email protected]
   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 <[email protected]>
   L:    [email protected]
   L:    [email protected]
   S:    Supported
@@@ -7739,7 -7618,7 +7739,7 @@@ INA209 HARDWARE MONITOR DRIVE
   M:    Guenter Roeck <[email protected]>
   L:    [email protected]
   S:    Maintained
- -F:    Documentation/hwmon/ina209
+ +F:    Documentation/hwmon/ina209.rst
   F:    Documentation/devicetree/bindings/hwmon/ina2xx.txt
   F:    drivers/hwmon/ina209.c
   
@@@ -7747,7 -7626,7 +7747,7 @@@ INA2XX HARDWARE MONITOR DRIVE
   M:    Guenter Roeck <[email protected]>
   L:    [email protected]
   S:    Maintained
- -F:    Documentation/hwmon/ina2xx
+ +F:    Documentation/hwmon/ina2xx.rst
   F:    drivers/hwmon/ina2xx.c
   F:    include/linux/platform_data/ina2xx.h
   
@@@ -7774,10 -7653,6 +7774,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 <[email protected]>
@@@ -8001,10 -7876,10 +8001,10 @@@ F:   Documentation/media/v4l-drivers/ipu3
   INTEL IXP4XX QMGR, NPE, ETHERNET and HSS SUPPORT
   M:    Krzysztof Halasa <[email protected]>
   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
   
@@@ -8171,7 -8046,6 +8171,7 @@@ F:      drivers/gpio/gpio-intel-mid.
   
   INTERCONNECT API
   M:    Georgi Djakov <[email protected]>
+ +L:    [email protected]
   S:    Maintained
   F:    Documentation/interconnect/
   F:    Documentation/devicetree/bindings/interconnect/
@@@ -8380,7 -8254,7 +8380,7 @@@ IT87 HARDWARE MONITORING DRIVE
   M:    Jean Delvare <[email protected]>
   L:    [email protected]
   S:    Maintained
- -F:    Documentation/hwmon/it87
+ +F:    Documentation/hwmon/it87.rst
   F:    drivers/hwmon/it87.c
   
   IT913X MEDIA DRIVER
@@@ -8424,7 -8298,7 +8424,7 @@@ M:      Guenter Roeck <[email protected]
   L:    [email protected]
   S:    Maintained
   F:    drivers/hwmon/jc42.c
- -F:    Documentation/hwmon/jc42
+ +F:    Documentation/hwmon/jc42.rst
   
   JFS FILESYSTEM
   M:    Dave Kleikamp <[email protected]>
@@@ -8443,11 -8317,9 +8443,11 @@@ F:    drivers/net/ethernet/jme.
   
   JOURNALLING FLASH FILE SYSTEM V2 (JFFS2)
   M:    David Woodhouse <[email protected]>
+ +M:    Richard Weinberger <[email protected]>
   L:    [email protected]
   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
   
@@@ -8474,14 -8346,14 +8474,14 @@@ K10TEMP HARDWARE MONITORING DRIVE
   M:    Clemens Ladisch <[email protected]>
   L:    [email protected]
   S:    Maintained
- -F:    Documentation/hwmon/k10temp
+ +F:    Documentation/hwmon/k10temp.rst
   F:    drivers/hwmon/k10temp.c
   
   K8TEMP HARDWARE MONITORING DRIVER
   M:    Rudolf Marek <[email protected]>
   L:    [email protected]
   S:    Maintained
- -F:    Documentation/hwmon/k8temp
+ +F:    Documentation/hwmon/k8temp.rst
   F:    drivers/hwmon/k8temp.c
   
   KASAN
@@@ -8836,7 -8708,6 +8836,7 @@@ F:      scripts/leaking_addresses.p
   LED SUBSYSTEM
   M:    Jacek Anaszewski <[email protected]>
   M:    Pavel Machek <[email protected]>
+ +R:    Dan Murphy <[email protected]>
   L:    [email protected]
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds.git
   S:    Maintained
@@@ -9122,7 -8993,7 +9122,7 @@@ R:      Daniel Lustig <[email protected]
   L:    [email protected]
   L:    [email protected]
   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
@@@ -9173,21 -9044,21 +9173,21 @@@ LM78 HARDWARE MONITOR DRIVE
   M:    Jean Delvare <[email protected]>
   L:    [email protected]
   S:    Maintained
- -F:    Documentation/hwmon/lm78
+ +F:    Documentation/hwmon/lm78.rst
   F:    drivers/hwmon/lm78.c
   
   LM83 HARDWARE MONITOR DRIVER
   M:    Jean Delvare <[email protected]>
   L:    [email protected]
   S:    Maintained
- -F:    Documentation/hwmon/lm83
+ +F:    Documentation/hwmon/lm83.rst
   F:    drivers/hwmon/lm83.c
   
   LM90 HARDWARE MONITOR DRIVER
   M:    Jean Delvare <[email protected]>
   L:    [email protected]
   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
@@@ -9196,7 -9067,7 +9196,7 @@@ LM95234 HARDWARE MONITOR DRIVE
   M:    Guenter Roeck <[email protected]>
   L:    [email protected]
   S:    Maintained
- -F:    Documentation/hwmon/lm95234
+ +F:    Documentation/hwmon/lm95234.rst
   F:    drivers/hwmon/lm95234.c
   
   LME2510 MEDIA DRIVER
@@@ -9228,6 -9099,7 +9228,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/
@@@ -9269,7 -9141,7 +9269,7 @@@ LTC4261 HARDWARE MONITOR DRIVE
   M:    Guenter Roeck <[email protected]>
   L:    [email protected]
   S:    Maintained
- -F:    Documentation/hwmon/ltc4261
+ +F:    Documentation/hwmon/ltc4261.rst
   F:    drivers/hwmon/ltc4261.c
   
   LTC4306 I2C MULTIPLEXER DRIVER
@@@ -9500,7 -9372,7 +9500,7 @@@ MAX16065 HARDWARE MONITOR DRIVE
   M:    Guenter Roeck <[email protected]>
   L:    [email protected]
   S:    Maintained
- -F:    Documentation/hwmon/max16065
+ +F:    Documentation/hwmon/max16065.rst
   F:    drivers/hwmon/max16065.c
   
   MAX2175 SDR TUNER DRIVER
@@@ -9516,14 -9388,14 +9516,14 @@@ F:   include/uapi/linux/max2175.
   MAX6650 HARDWARE MONITOR AND FAN CONTROLLER DRIVER
   L:    [email protected]
   S:    Orphan
- -F:    Documentation/hwmon/max6650
+ +F:    Documentation/hwmon/max6650.rst
   F:    drivers/hwmon/max6650.c
   
   MAX6697 HARDWARE MONITOR DRIVER
   M:    Guenter Roeck <[email protected]>
   L:    [email protected]
   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
@@@ -9535,27 -9407,6 +9535,27 @@@ S:    Maintaine
   F:    Documentation/devicetree/bindings/sound/max9860.txt
   F:    sound/soc/codecs/max9860.*
   
+ +MAXBOTIX ULTRASONIC RANGER IIO DRIVER
+ +M:    Andreas Klinger <[email protected]>
+ +L:    [email protected]
+ +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 <[email protected]>
+ +L:    [email protected]
+ +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 <[email protected]>
   L:    [email protected]
@@@ -9924,17 -9775,9 +9924,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 <[email protected]>
+ +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 <[email protected]>
   M:    Lorenzo Bianconi <[email protected]>
+ +R:    Ryder Lee <[email protected]>
+ +R:    Roy Luo <[email protected]>
   L:    [email protected]
   S:    Maintained
   F:    drivers/net/wireless/mediatek/mt76/
@@@ -10033,6 -9876,15 +10033,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 <[email protected]>
- -L:    [email protected]
- -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 <[email protected]>
   M:    Ido Schimmel <[email protected]>
@@@ -10155,15 -10007,14 +10155,15 @@@ F:        mm
   MEMORY TECHNOLOGY DEVICES (MTD)
   M:    David Woodhouse <[email protected]>
   M:    Brian Norris <[email protected]>
- -M:    Boris Brezillon <[email protected]>
   M:    Marek Vasut <[email protected]>
+ +M:    Miquel Raynal <[email protected]>
   M:    Richard Weinberger <[email protected]>
+ +M:    Vignesh Raghavendra <[email protected]>
   L:    [email protected]
   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/
@@@ -10190,7 -10041,7 +10190,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 <[email protected]>
@@@ -10205,7 -10056,6 +10205,7 @@@ L:   [email protected]
   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
   
@@@ -10262,8 -10112,7 +10262,8 @@@ MICROCHIP I2C DRIVE
   M:    Ludovic Desroches <[email protected]>
   L:    [email protected]
   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 <[email protected]>
@@@ -10296,7 -10145,7 +10296,7 @@@ F:   drivers/spi/spi-at91-usart.
   F:    Documentation/devicetree/bindings/mfd/atmel-usart.txt
   
   MICROCHIP KSZ SERIES ETHERNET SWITCH DRIVER
- -M:    Woojung Huh <Woojung.H[email protected]>
+ +M:    Woojung Huh <woojung.h[email protected]>
   M:    Microchip Linux Driver Support <[email protected]>
   L:    [email protected]
   S:    Maintained
@@@ -10539,7 -10388,7 +10539,7 @@@ F:   arch/arm/mach-mmp
   
   MMU GATHER AND TLB INVALIDATION
   M:    Will Deacon <[email protected]>
- -M:    "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
+ +M:    "Aneesh Kumar K.V" <[email protected]>
   M:    Andrew Morton <[email protected]>
   M:    Nick Piggin <[email protected]>
   M:    Peter Zijlstra <[email protected]>
@@@ -10585,7 -10434,7 +10585,7 @@@ F:   include/uapi/linux/meye.
   MOXA SMARTIO/INDUSTIO/INTELLIO SERIAL CARD
   M:    Jiri Slaby <[email protected]>
   S:    Maintained
- -F:    Documentation/serial/moxa-smartio
+ +F:    Documentation/serial/moxa-smartio.rst
   F:    drivers/tty/mxser.*
   
   MR800 AVERMEDIA USB FM RADIO DRIVER
@@@ -10772,12 -10621,14 +10772,12 @@@ S:        Supporte
   F:    drivers/net/ethernet/myricom/myri10ge/
   
   NAND FLASH SUBSYSTEM
- -M:    Boris Brezillon <[email protected]>
   M:    Miquel Raynal <[email protected]>
   R:    Richard Weinberger <[email protected]>
   L:    [email protected]
   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
@@@ -10818,7 -10669,7 +10818,7 @@@ NCT6775 HARDWARE MONITOR DRIVE
   M:    Guenter Roeck <[email protected]>
   L:    [email protected]
   S:    Maintained
- -F:    Documentation/hwmon/nct6775
+ +F:    Documentation/hwmon/nct6775.rst
   F:    drivers/hwmon/nct6775.c
   
   NET_FAILOVER MODULE
@@@ -10896,7 -10747,6 +10896,7 @@@ L:   [email protected]
   L:    [email protected]
   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
@@@ -11267,16 -11117,6 +11267,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 <[email protected]>
+ +L:    [email protected]
+ +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 <[email protected]>
   L:    [email protected] (moderated for non-subscribers)
@@@ -11284,12 -11124,6 +11284,12 @@@ S: Maintaine
   F:    Documentation/devicetree/bindings/sound/sgtl5000.txt
   F:    sound/soc/codecs/sgtl5000*
   
+ +NXP SJA1105 ETHERNET SWITCH DRIVER
+ +M:    Vladimir Oltean <[email protected]>
+ +L:    [email protected]
+ +S:    Maintained
+ +F:    drivers/net/dsa/sja1105
+ +
   NXP TDA998X DRM DRIVER
   M:    Russell King <[email protected]>
   S:    Maintained
@@@ -11338,7 -11172,7 +11338,7 @@@ F:   tools/objtool
   
   OCXL (Open Coherent Accelerator Processor Interface OpenCAPI) DRIVER
   M:    Frederic Barrat <[email protected]>
- -M:    Andrew Donnellan <andrew.donnellan@au1.ibm.com>
+ +M:    Andrew Donnellan <ajd@linux.ibm.com>
   L:    [email protected]
   S:    Supported
   F:    arch/powerpc/platforms/powernv/ocxl.c
@@@ -11769,7 -11603,7 +11769,7 @@@ F:   Documentation/devicetree/bindings/op
   OPL4 DRIVER
   M:    Clemens Ladisch <[email protected]>
   L:    [email protected] (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/
   
@@@ -11785,7 -11619,6 +11785,7 @@@ F:   include/linux/oprofile.
   ORACLE CLUSTER FILESYSTEM 2 (OCFS2)
   M:    Mark Fasheh <[email protected]>
   M:    Joel Becker <[email protected]>
+ +M:    Joseph Qi <[email protected]>
   L:    [email protected] (moderated for non-subscribers)
   W:    http://ocfs2.wiki.kernel.org
   S:    Supported
@@@ -11844,14 -11677,6 +11844,14 @@@ L: [email protected]
   S:    Orphan
   F:    drivers/i2c/busses/i2c-pasemi.c
   
+ +PACKING
+ +M:    Vladimir Oltean <[email protected]>
+ +L:    [email protected]
+ +S:    Supported
+ +F:    lib/packing.c
+ +F:    include/linux/packing.h
+ +F:    Documentation/packing.txt
+ +
   PADATA PARALLEL EXECUTION MECHANISM
   M:    Steffen Klassert <[email protected]>
   L:    [email protected]
@@@ -11938,7 -11763,7 +11938,7 @@@ PC87360 HARDWARE MONITORING DRIVE
   M:    Jim Cromie <[email protected]>
   L:    [email protected]
   S:    Maintained
- -F:    Documentation/hwmon/pc87360
+ +F:    Documentation/hwmon/pc87360.rst
   F:    drivers/hwmon/pc87360.c
   
   PC8736x GPIO DRIVER
@@@ -11950,7 -11775,7 +11950,7 @@@ PC87427 HARDWARE MONITORING DRIVE
   M:    Jean Delvare <[email protected]>
   L:    [email protected]
   S:    Maintained
- -F:    Documentation/hwmon/pc87427
+ +F:    Documentation/hwmon/pc87427.rst
   F:    drivers/hwmon/pc87427.c
   
   PCA9532 LED DRIVER
@@@ -12065,8 -11890,7 +12065,8 @@@ F:   include/linux/switchtec.
   F:    drivers/ntb/hw/mscc/
   
   PCI DRIVER FOR MOBIVEIL PCIE IP
- -M:    Subrahmanya Lingappa <[email protected]>
+ +M:    Karthikeyan Mitran <[email protected]>
+ +M:    Hou Zhiqiang <[email protected]>
   L:    [email protected]
   S:    Supported
   F:    Documentation/devicetree/bindings/pci/mobiveil-pcie.txt
@@@ -12200,12 -12024,6 +12200,12 @@@ T: git git://git.kernel.org/pub/scm/lin
   S:    Supported
   F:    drivers/pci/controller/
   
+ +PCIE DRIVER FOR ANNAPURNA LABS
+ +M:    Jonathan Chocron <[email protected]>
+ +L:    [email protected]
+ +S:    Maintained
+ +F:    drivers/pci/controller/dwc/pcie-al.c
+ +
   PCIE DRIVER FOR AMLOGIC MESON
   M:    Yue Wang <[email protected]>
   L:    [email protected]
@@@ -12357,7 -12175,6 +12357,7 @@@ F:   arch/*/kernel/*/*/perf_event*.
   F:    arch/*/include/asm/perf_event.h
   F:    arch/*/kernel/perf_callchain.c
   F:    arch/*/events/*
+ +F:    arch/*/events/*/*
   F:    tools/perf/
   
   PERSONALITY HANDLING
@@@ -12526,23 -12343,23 +12526,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
   
@@@ -12598,7 -12415,7 +12598,7 @@@ M:   Mark Rutland <[email protected]
   M:    Lorenzo Pieralisi <[email protected]>
   L:    [email protected]
   S:    Maintained
- -F:    drivers/firmware/psci*.c
+ +F:    drivers/firmware/psci/
   F:    include/linux/psci.h
   F:    include/uapi/linux/psci.h
   
@@@ -12806,7 -12623,7 +12806,7 @@@ M:   Bartlomiej Zolnierkiewicz <b.zolnier
   L:    [email protected]
   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
@@@ -13224,9 -13041,9 +13224,9 @@@ M:   Josh Triplett <[email protected]
   R:    Steven Rostedt <[email protected]>
   R:    Mathieu Desnoyers <[email protected]>
   R:    Lai Jiangshan <[email protected]>
- -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
@@@ -13272,10 -13089,10 +13272,10 @@@ R:        Steven Rostedt <[email protected]
   R:    Mathieu Desnoyers <[email protected]>
   R:    Lai Jiangshan <[email protected]>
   R:    Joel Fernandes <[email protected]>
- -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*
@@@ -13501,7 -13318,7 +13501,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
@@@ -13585,12 -13402,6 +13585,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 <[email protected]>
+ +L:    [email protected]
+ +S:    Maintained
+ +F:    drivers/net/wireless/realtek/rtw88/
+ +
   RTL8XXXU WIRELESS DRIVER (rtl8xxxu)
   M:    Jes Sorensen <[email protected]>
   L:    [email protected]
@@@ -14136,7 -13947,7 +14136,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
@@@ -14433,10 -14244,10 +14433,10 @@@ M:        "Paul E. McKenney" <[email protected]
   M:    Josh Triplett <[email protected]>
   R:    Steven Rostedt <[email protected]>
   R:    Mathieu Desnoyers <[email protected]>
- -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
   
@@@ -14477,21 -14288,21 +14477,21 @@@ SMM665 HARDWARE MONITOR DRIVE
   M:    Guenter Roeck <[email protected]>
   L:    [email protected]
   S:    Maintained
- -F:    Documentation/hwmon/smm665
+ +F:    Documentation/hwmon/smm665.rst
   F:    drivers/hwmon/smm665.c
   
   SMSC EMC2103 HARDWARE MONITOR DRIVER
   M:    Steve Glendinning <[email protected]>
   L:    [email protected]
   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 <[email protected]>
   L:    [email protected]
   S:    Supported
- -F:    Documentation/hwmon/sch5627
+ +F:    Documentation/hwmon/sch5627.rst
   F:    drivers/hwmon/sch5627.c
   
   SMSC UFX6000 and UFX7000 USB to VGA DRIVER
@@@ -14504,7 -14315,7 +14504,7 @@@ SMSC47B397 HARDWARE MONITOR DRIVE
   M:    Jean Delvare <[email protected]>
   L:    [email protected]
   S:    Maintained
- -F:    Documentation/hwmon/smsc47b397
+ +F:    Documentation/hwmon/smsc47b397.rst
   F:    drivers/hwmon/smsc47b397.c
   
   SMSC911x ETHERNET DRIVER
@@@ -14524,8 -14335,9 +14524,8 @@@ SOC-CAMERA V4L2 SUBSYSTE
   L:    [email protected]
   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 <[email protected]>
@@@ -14661,15 -14473,16 +14661,15 @@@ T:        git git://linuxtv.org/media_tree.gi
   S:    Maintained
   F:    drivers/media/i2c/imx355.c
   
- -SONY MEMORYSTICK CARD SUPPORT
- -M:    Alex Dubov <[email protected]>
- -W:    http://tifmxx.berlios.de/
- -S:    Maintained
- -F:    drivers/memstick/host/tifm_ms.c
- -
- -SONY MEMORYSTICK STANDARD SUPPORT
+ +SONY MEMORYSTICK SUBSYSTEM
   M:    Maxim Levitsky <[email protected]>
+ +M:    Alex Dubov <[email protected]>
+ +M:    Ulf Hansson <[email protected]>
+ +L:    [email protected]
+ +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 <[email protected]>
@@@ -14687,6 -14500,7 +14687,6 @@@ M:   Takashi Iwai <[email protected]
   L:    [email protected] (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/
@@@ -14799,7 -14613,8 +14799,7 @@@ M:   Tudor Ambarus <tudor.ambarus@microch
   L:    [email protected]
   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
@@@ -14863,14 -14678,6 +14863,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 <[email protected]>
+ +L:    [email protected]
+ +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 <[email protected]>
   L:    [email protected]
@@@ -15507,11 -15314,6 +15507,11 @@@ M: Laxman Dewangan <[email protected]
   S:    Supported
   F:    drivers/spi/spi-tegra*
   
+ +TEGRA XUSB PADCTL DRIVER
+ +M:    JC Kuo <[email protected]>
+ +S:    Supported
+ +F:    drivers/phy/tegra/xusb*
+ +
   TEHUTI ETHERNET DRIVER
   M:    Andy Gospodarek <[email protected]>
   L:    [email protected]
@@@ -15547,6 -15349,12 +15547,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 <[email protected]>
@@@ -15665,7 -15473,7 +15671,7 @@@ F:   include/linux/clk/ti.
   
   TI DAVINCI MACHINE SUPPORT
   M:    Sekhar Nori <[email protected]>
- -M:    Kevin Hilman <[email protected]>
+ +R:    Bartosz Golaszewski <[email protected]>
   L:    [email protected] (moderated for non-subscribers)
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci.git
   S:    Supported
@@@ -15705,11 -15513,9 +15711,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 <[email protected]>
   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
@@@ -15861,7 -15667,7 +15867,7 @@@ TMP401 HARDWARE MONITOR DRIVE
   M:    Guenter Roeck <[email protected]>
   L:    [email protected]
   S:    Maintained
- -F:    Documentation/hwmon/tmp401
+ +F:    Documentation/hwmon/tmp401.rst
   F:    drivers/hwmon/tmp401.c
   
   TMPFS (SHMEM FILESYSTEM)
@@@ -15894,7 -15700,7 +15900,7 @@@ M:   "Paul E. McKenney" <[email protected]
   M:    Josh Triplett <[email protected]>
   L:    [email protected]
   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
@@@ -16136,12 -15942,6 +16142,12 @@@ F: drivers/uwb
   F:    include/linux/uwb.h
   F:    include/linux/uwb/
   
+ +UNICODE SUBSYSTEM:
+ +M:    Gabriel Krisman Bertazi <[email protected]>
+ +L:    [email protected]
+ +S:    Supported
+ +F:    fs/unicode/
+ +
   UNICORE32 ARCHITECTURE:
   M:    Guan Xuetao <[email protected]>
   W:    http://mprc.pku.edu.cn/~guanxuetao/linux
@@@ -16187,13 -15987,6 +16193,13 @@@ L: [email protected]
   S:    Supported
   F:    drivers/scsi/ufs/*dwc*
   
+ +UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER MEDIATEK HOOKS
+ +M:    Stanley Chu <[email protected]>
+ +L:    [email protected]
+ +L:    [email protected] (moderated for non-subscribers)
+ +S:    Maintained
+ +F:    drivers/scsi/ufs/ufs-mediatek*
+ +
   UNSORTED BLOCK IMAGES (UBI)
   M:    Artem Bityutskiy <[email protected]>
   M:    Richard Weinberger <[email protected]>
@@@ -16297,14 -16090,6 +16303,14 @@@ L: [email protected]
   S:    Maintained
   F:    drivers/usb/roles/intel-xhci-usb-role-switch.c
   
+ +USB IP DRIVER FOR HISILICON KIRIN
+ +M:    Yu Chen <[email protected]>
+ +M:    Binghui Wang <[email protected]>
+ +L:    [email protected]
+ +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 <[email protected]>
   L:    [email protected]
@@@ -16331,7 -16116,7 +16337,7 @@@ F:   drivers/usb/storage
   USB MIDI DRIVER
   M:    Clemens Ladisch <[email protected]>
   L:    [email protected] (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.*
   
@@@ -16604,7 -16389,6 +16610,7 @@@ F:   fs/fat
   
   VFIO DRIVER
   M:    Alex Williamson <[email protected]>
+ +R:    Cornelia Huck <[email protected]>
   L:    [email protected]
   T:    git git://github.com/awilliam/linux-vfio.git
   S:    Maintained
@@@ -16921,7 -16705,7 +16927,7 @@@ VT1211 HARDWARE MONITOR DRIVE
   M:    Juerg Haefliger <[email protected]>
   L:    [email protected]
   S:    Maintained
- -F:    Documentation/hwmon/vt1211
+ +F:    Documentation/hwmon/vt1211.rst
   F:    drivers/hwmon/vt1211.c
   
   VT8231 HARDWARE MONITOR DRIVER
@@@ -16949,14 -16733,14 +16955,14 @@@ W83791D HARDWARE MONITORING DRIVE
   M:    Marc Hulsman <[email protected]>
   L:    [email protected]
   S:    Maintained
- -F:    Documentation/hwmon/w83791d
+ +F:    Documentation/hwmon/w83791d.rst
   F:    drivers/hwmon/w83791d.c
   
   W83793 HARDWARE MONITORING DRIVER
   M:    Rudolf Marek <[email protected]>
   L:    [email protected]
   S:    Maintained
- -F:    Documentation/hwmon/w83793
+ +F:    Documentation/hwmon/w83793.rst
   F:    drivers/hwmon/w83793.c
   
   W83795 HARDWARE MONITORING DRIVER
@@@ -17065,7 -16849,7 +17071,7 @@@ L:   [email protected]
   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
@@@ -17155,7 -16939,7 +17161,7 @@@ M:   Tony Luck <[email protected]
   M:    Borislav Petkov <[email protected]>
   L:    [email protected]
   S:    Maintained
- -F:    arch/x86/kernel/cpu/mcheck/*
+ +F:    arch/x86/kernel/cpu/mce/*
   
   X86 MICROCODE UPDATE SUPPORT
   M:    Borislav Petkov <[email protected]>
diff --combined arch/arm64/Kconfig.platforms

index 1001410c4782e8bc6f0d68f147010653bd1391a2,ab9cac8235b34be58ffd57bda5806f0dd8027c70..42eca656faa85c8eb59725812db0b92bb4db7e72
--- 1/arch/arm64/Kconfig.platforms
--- 2/arch/arm64/Kconfig.platforms
+++ b/arch/arm64/Kconfig.platforms
@@@ -7,11 -7,6 +7,11 @@@ config ARCH_ACTION
         help
           This enables support for the Actions Semiconductor S900 SoC family.
   
+ +config ARCH_AGILEX
+ +      bool "Intel's Agilex SoCFPGA Family"
+ +      help
+ +        This enables support for Intel's Agilex SoCFPGA Family.
+ +
   config ARCH_SUNXI
         bool "Allwinner sunxi 64-bit SoC Family"
         select ARCH_HAS_RESET_CONTROLLER
@@@ -87,6 -82,11 +87,11 @@@ config ARCH_EXYNO
   config ARCH_K3
         bool "Texas Instruments Inc. K3 multicore SoC architecture"
         select PM_GENERIC_DOMAINS if PM
+       select MAILBOX
+       select TI_MESSAGE_MANAGER
+       select TI_SCI_PROTOCOL
+       select TI_SCI_INTR_IRQCHIP
+       select TI_SCI_INTA_IRQCHIP
         help
           This enables support for Texas Instruments' K3 multicore SoC
           architecture.
@@@ -215,7 -215,6 +220,7 @@@ config ARCH_SYNQUACE
   config ARCH_TEGRA
         bool "NVIDIA Tegra SoC Family"
         select ARCH_HAS_RESET_CONTROLLER
+ +      select ARM_GIC_PM
         select CLKDEV_LOOKUP
         select CLKSRC_MMIO
         select TIMER_OF
diff --combined drivers/iommu/Kconfig

index 15b831113dedb0ae538bc5bf9dbdd3d174450901,eb1c8cd243f94f88ff73226a5832d9e0220a43c4..e559e43c8ac2f270e0d2549d48035d470090b2eb
--- 1/drivers/iommu/Kconfig
--- 2/drivers/iommu/Kconfig
+++ b/drivers/iommu/Kconfig
@@@ -94,6 -94,7 +94,7 @@@ config IOMMU_DM
         bool
         select IOMMU_API
         select IOMMU_IOVA
+       select IRQ_MSI_IOMMU
         select NEED_SG_DMA_LENGTH
   
   config FSL_PAMU
@@@ -359,31 -360,6 +360,31 @@@ config ARM_SMM
           Say Y here if your SoC includes an IOMMU device implementing
           the ARM SMMU architecture.
   
+ +config ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT
+ +      bool "Default to disabling bypass on ARM SMMU v1 and v2"
+ +      depends on ARM_SMMU
+ +      default y
+ +      help
+ +        Say Y here to (by default) disable bypass streams such that
+ +        incoming transactions from devices that are not attached to
+ +        an iommu domain will report an abort back to the device and
+ +        will not be allowed to pass through the SMMU.
+ +
+ +        Any old kernels that existed before this KConfig was
+ +        introduced would default to _allowing_ bypass (AKA the
+ +        equivalent of NO for this config).  However the default for
+ +        this option is YES because the old behavior is insecure.
+ +
+ +        There are few reasons to allow unmatched stream bypass, and
+ +        even fewer good ones.  If saying YES here breaks your board
+ +        you should work on fixing your board.  This KConfig option
+ +        is expected to be removed in the future and we'll simply
+ +        hardcode the bypass disable in the code.
+ +
+ +        NOTE: the kernel command line parameter
+ +        'arm-smmu.disable_bypass' will continue to override this
+ +        config.
+ +
   config ARM_SMMU_V3
         bool "ARM Ltd. System MMU Version 3 (SMMUv3) Support"
         depends on ARM64
diff --combined drivers/iommu/dma-iommu.c

index 5e898047c3907337f832c597471141f2d065f97f,13916fefeb27964ca933fd87c542844724c6eb8c..129c4badf9ae63b2f1e8d341c52a680a83bbc966
--- 1/drivers/iommu/dma-iommu.c
--- 2/drivers/iommu/dma-iommu.c
+++ b/drivers/iommu/dma-iommu.c
@@@ -206,13 -206,12 +206,13 @@@ static int cookie_init_hw_msi_region(st
         return 0;
   }
   
- -static void iova_reserve_pci_windows(struct pci_dev *dev,
+ +static int iova_reserve_pci_windows(struct pci_dev *dev,
                 struct iova_domain *iovad)
   {
         struct pci_host_bridge *bridge = pci_find_host_bridge(dev->bus);
         struct resource_entry *window;
         unsigned long lo, hi;
+ +      phys_addr_t start = 0, end;
   
         resource_list_for_each_entry(window, &bridge->windows) {
                 if (resource_type(window->res) != IORESOURCE_MEM)
@@@ -222,31 -221,6 +222,31 @@@
                 hi = iova_pfn(iovad, window->res->end - window->offset);
                 reserve_iova(iovad, lo, hi);
         }
+ +
+ +      /* Get reserved DMA windows from host bridge */
+ +      resource_list_for_each_entry(window, &bridge->dma_ranges) {
+ +              end = window->res->start - window->offset;
+ +resv_iova:
+ +              if (end > start) {
+ +                      lo = iova_pfn(iovad, start);
+ +                      hi = iova_pfn(iovad, end);
+ +                      reserve_iova(iovad, lo, hi);
+ +              } else {
+ +                      /* dma_ranges list should be sorted */
+ +                      dev_err(&dev->dev, "Failed to reserve IOVA\n");
+ +                      return -EINVAL;
+ +              }
+ +
+ +              start = window->res->end - window->offset + 1;
+ +              /* If window is last entry */
+ +              if (window->node.next == &bridge->dma_ranges &&
+ +                  end != ~(dma_addr_t)0) {
+ +                      end = ~(dma_addr_t)0;
+ +                      goto resv_iova;
+ +              }
+ +      }
+ +
+ +      return 0;
   }
   
   static int iova_reserve_iommu_regions(struct device *dev,
@@@ -258,11 -232,8 +258,11 @@@
         LIST_HEAD(resv_regions);
         int ret = 0;
   
- -      if (dev_is_pci(dev))
- -              iova_reserve_pci_windows(to_pci_dev(dev), iovad);
+ +      if (dev_is_pci(dev)) {
+ +              ret = iova_reserve_pci_windows(to_pci_dev(dev), iovad);
+ +              if (ret)
+ +                      return ret;
+ +      }
   
         iommu_get_resv_regions(dev, &resv_regions);
         list_for_each_entry(region, &resv_regions, list) {
@@@ -648,7 -619,17 +648,7 @@@ out_free_pages
   
   int iommu_dma_mmap(struct page **pages, size_t size, struct vm_area_struct *vma)
   {
- -      unsigned long uaddr = vma->vm_start;
- -      unsigned int i, count = PAGE_ALIGN(size) >> PAGE_SHIFT;
- -      int ret = -ENXIO;
- -
- -      for (i = vma->vm_pgoff; i < count && uaddr < vma->vm_end; i++) {
- -              ret = vm_insert_page(vma, uaddr, pages[i]);
- -              if (ret)
- -                      break;
- -              uaddr += PAGE_SIZE;
- -      }
- -      return ret;
+ +      return vm_map_pages(vma, pages, PAGE_ALIGN(size) >> PAGE_SHIFT);
   }
   
   static dma_addr_t __iommu_dma_map(struct device *dev, phys_addr_t phys,
@@@ -907,17 -888,18 +907,18 @@@ out_free_page
         return NULL;
   }
   
- void iommu_dma_map_msi_msg(int irq, struct msi_msg *msg)
+ int iommu_dma_prepare_msi(struct msi_desc *desc, phys_addr_t msi_addr)
   {
-       struct device *dev = msi_desc_to_dev(irq_get_msi_desc(irq));
+       struct device *dev = msi_desc_to_dev(desc);
         struct iommu_domain *domain = iommu_get_domain_for_dev(dev);
         struct iommu_dma_cookie *cookie;
         struct iommu_dma_msi_page *msi_page;
-       phys_addr_t msi_addr = (u64)msg->address_hi << 32 | msg->address_lo;
         unsigned long flags;
   
-       if (!domain || !domain->iova_cookie)
-               return;
+       if (!domain || !domain->iova_cookie) {
+               desc->iommu_cookie = NULL;
+               return 0;
+       }
   
         cookie = domain->iova_cookie;
   
@@@ -930,19 -912,26 +931,26 @@@
         msi_page = iommu_dma_get_msi_page(dev, msi_addr, domain);
         spin_unlock_irqrestore(&cookie->msi_lock, flags);
   
-       if (WARN_ON(!msi_page)) {
-               /*
-                * We're called from a void callback, so the best we can do is
-                * 'fail' by filling the message with obviously bogus values.
-                * Since we got this far due to an IOMMU being present, it's
-                * not like the existing address would have worked anyway...
-                */
-               msg->address_hi = ~0U;
-               msg->address_lo = ~0U;
-               msg->data = ~0U;
-       } else {
-               msg->address_hi = upper_32_bits(msi_page->iova);
-               msg->address_lo &= cookie_msi_granule(cookie) - 1;
-               msg->address_lo += lower_32_bits(msi_page->iova);
-       }
+       msi_desc_set_iommu_cookie(desc, msi_page);
+ 
+       if (!msi_page)
+               return -ENOMEM;
+       return 0;
+ }
+ 
+ void iommu_dma_compose_msi_msg(struct msi_desc *desc,
+                              struct msi_msg *msg)
+ {
+       struct device *dev = msi_desc_to_dev(desc);
+       const struct iommu_domain *domain = iommu_get_domain_for_dev(dev);
+       const struct iommu_dma_msi_page *msi_page;
+ 
+       msi_page = msi_desc_get_iommu_cookie(desc);
+ 
+       if (!domain || !domain->iova_cookie || WARN_ON(!msi_page))
+               return;
+ 
+       msg->address_hi = upper_32_bits(msi_page->iova);
+       msg->address_lo &= cookie_msi_granule(domain->iova_cookie) - 1;
+       msg->address_lo += lower_32_bits(msi_page->iova);
   }
diff --combined drivers/irqchip/Kconfig

index cf7984991062987e30e9119cfe9164dc9fea4c5b,fcf9457cc1d91b8ebb04e9bbbaaef366d68d86f2..1c1f3f66dfd3c4d06b36d0210151e2fce00690c4
--- 1/drivers/irqchip/Kconfig
--- 2/drivers/irqchip/Kconfig
+++ b/drivers/irqchip/Kconfig
@@@ -6,7 -6,6 +6,6 @@@ config IRQCHI
   
   config ARM_GIC
         bool
-       select IRQ_DOMAIN
         select IRQ_DOMAIN_HIERARCHY
         select GENERIC_IRQ_MULTI_HANDLER
         select GENERIC_IRQ_EFFECTIVE_AFF_MASK
@@@ -33,7 -32,6 +32,6 @@@ config GIC_NON_BANKE
   
   config ARM_GIC_V3
         bool
-       select IRQ_DOMAIN
         select GENERIC_IRQ_MULTI_HANDLER
         select IRQ_DOMAIN_HIERARCHY
         select PARTITION_PERCPU
@@@ -59,7 -57,6 +57,6 @@@ config ARM_GIC_V3_ITS_FSL_M
   
   config ARM_NVIC
         bool
-       select IRQ_DOMAIN
         select IRQ_DOMAIN_HIERARCHY
         select GENERIC_IRQ_CHIP
   
@@@ -160,12 -157,6 +157,12 @@@ config IMGPDC_IR
         select GENERIC_IRQ_CHIP
         select IRQ_DOMAIN
   
+ +config IXP4XX_IRQ
+ +      bool
+ +      select IRQ_DOMAIN
+ +      select GENERIC_IRQ_MULTI_HANDLER
+ +      select SPARSE_IRQ
+ +
   config MADERA_IRQ
         tristate
   
@@@ -358,7 -349,6 +355,6 @@@ config STM32_EXT
   config QCOM_IRQ_COMBINER
         bool "QCOM IRQ combiner support"
         depends on ARCH_QCOM && ACPI
-       select IRQ_DOMAIN
         select IRQ_DOMAIN_HIERARCHY
         help
           Say yes here to add support for the IRQ combiner devices embedded
@@@ -375,7 -365,6 +371,6 @@@ config IRQ_UNIPHIER_AIDE
   config MESON_IRQ_GPIO
          bool "Meson GPIO Interrupt Multiplexer"
          depends on ARCH_MESON
-        select IRQ_DOMAIN
          select IRQ_DOMAIN_HIERARCHY
          help
            Support Meson SoC Family GPIO Interrupt Multiplexer
@@@ -391,7 -380,6 +386,6 @@@ config GOLDFISH_PI
   config QCOM_PDC
         bool "QCOM PDC"
         depends on ARCH_QCOM
-       select IRQ_DOMAIN
         select IRQ_DOMAIN_HIERARCHY
         help
           Power Domain Controller driver to manage and configure wakeup
@@@ -431,6 -419,27 +425,27 @@@ config LS1X_IR
         help
           Support for the Loongson-1 platform Interrupt Controller.
   
+ config TI_SCI_INTR_IRQCHIP
+       bool
+       depends on TI_SCI_PROTOCOL
+       select IRQ_DOMAIN_HIERARCHY
+       help
+         This enables the irqchip driver support for K3 Interrupt router
+         over TI System Control Interface available on some new TI's SoCs.
+         If you wish to use interrupt router irq resources managed by the
+         TI System Controller, say Y here. Otherwise, say N.
+ 
+ config TI_SCI_INTA_IRQCHIP
+       bool
+       depends on TI_SCI_PROTOCOL
+       select IRQ_DOMAIN_HIERARCHY
+       select TI_SCI_INTA_MSI_DOMAIN
+       help
+         This enables the irqchip driver support for K3 Interrupt aggregator
+         over TI System Control Interface available on some new TI's SoCs.
+         If you wish to use interrupt aggregator irq resources managed by the
+         TI System Controller, say Y here. Otherwise, say N.
+ 
   endmenu
   
   config SIFIVE_PLIC
diff --combined drivers/irqchip/Makefile

index f8c66e958a64deaad16fea727ab5d9f2ace020bc,8a33013da953ce91b8461f37805fe8eeccf2ff0b..606a003a00002678898b06671e36fc4f43b026f9
--- 1/drivers/irqchip/Makefile
--- 2/drivers/irqchip/Makefile
+++ b/drivers/irqchip/Makefile
@@@ -43,7 -43,6 +43,7 @@@ obj-$(CONFIG_ATMEL_AIC5_IRQ)  += irq-atm
   obj-$(CONFIG_I8259)                   += irq-i8259.o
   obj-$(CONFIG_IMGPDC_IRQ)              += irq-imgpdc.o
   obj-$(CONFIG_IRQ_MIPS_CPU)            += irq-mips-cpu.o
+ +obj-$(CONFIG_IXP4XX_IRQ)              += irq-ixp4xx.o
   obj-$(CONFIG_SIRF_IRQ)                        += irq-sirfsoc.o
   obj-$(CONFIG_JCORE_AIC)                       += irq-jcore-aic.o
   obj-$(CONFIG_RDA_INTC)                        += irq-rda-intc.o
@@@ -98,3 -97,5 +98,5 @@@ obj-$(CONFIG_SIFIVE_PLIC)             += irq-sifiv
   obj-$(CONFIG_IMX_IRQSTEER)            += irq-imx-irqsteer.o
   obj-$(CONFIG_MADERA_IRQ)              += irq-madera.o
   obj-$(CONFIG_LS1X_IRQ)                        += irq-ls1x.o
+ obj-$(CONFIG_TI_SCI_INTR_IRQCHIP)     += irq-ti-sci-intr.o
+ obj-$(CONFIG_TI_SCI_INTA_IRQCHIP)     += irq-ti-sci-inta.o
diff --combined drivers/irqchip/irq-gic-v2m.c

index de14e06fd9ec86c48d340a9a1da78f5d33af5efa,4359f05833776b3e76d63e1d1946fd2500e71f5d..3c77ab676e54a4927f5eb10dab19784f76b48e52
--- 1/drivers/irqchip/irq-gic-v2m.c
--- 2/drivers/irqchip/irq-gic-v2m.c
+++ b/drivers/irqchip/irq-gic-v2m.c
@@@ -110,7 -110,7 +110,7 @@@ static void gicv2m_compose_msi_msg(stru
         if (v2m->flags & GICV2M_NEEDS_SPI_OFFSET)
                 msg->data -= v2m->spi_offset;
   
-       iommu_dma_map_msi_msg(data->irq, msg);
+       iommu_dma_compose_msi_msg(irq_data_get_msi_desc(data), msg);
   }
   
   static struct irq_chip gicv2m_irq_chip = {
@@@ -167,6 -167,7 +167,7 @@@ static void gicv2m_unalloc_msi(struct v
   static int gicv2m_irq_domain_alloc(struct irq_domain *domain, unsigned int virq,
                                    unsigned int nr_irqs, void *args)
   {
+       msi_alloc_info_t *info = args;
         struct v2m_data *v2m = NULL, *tmp;
         int hwirq, offset, i, err = 0;
   
@@@ -186,6 -187,11 +187,11 @@@
   
         hwirq = v2m->spi_start + offset;
   
+       err = iommu_dma_prepare_msi(info->desc,
+                                   v2m->res.start + V2M_MSI_SETSPI_NS);
+       if (err)
+               return err;
+ 
         for (i = 0; i < nr_irqs; i++) {
                 err = gicv2m_irq_gic_domain_alloc(domain, virq + i, hwirq + i);
                 if (err)
@@@ -446,7 -452,7 +452,7 @@@ static struct fwnode_handle *gicv2m_get
   }
   
   static int __init
- -acpi_parse_madt_msi(struct acpi_subtable_header *header,
+ +acpi_parse_madt_msi(union acpi_subtable_headers *header,
                     const unsigned long end)
   {
         int ret;
diff --combined drivers/irqchip/irq-gic-v3-its.c

index 128ac893d7e4a42da76c06ed41eb385085012df8,1e364d3ad9c5e0f6998b61532f08f12fa570a34d..cfb9b4e5f91450e18b507e30a1ae6c14010ebfb8
--- 1/drivers/irqchip/irq-gic-v3-its.c
--- 2/drivers/irqchip/irq-gic-v3-its.c
+++ b/drivers/irqchip/irq-gic-v3-its.c
@@@ -26,7 -26,6 +26,6 @@@
   #include <linux/interrupt.h>
   #include <linux/irqdomain.h>
   #include <linux/list.h>
- #include <linux/list_sort.h>
   #include <linux/log2.h>
   #include <linux/memblock.h>
   #include <linux/mm.h>
@@@ -1179,7 -1178,7 +1178,7 @@@ static void its_irq_compose_msi_msg(str
         msg->address_hi         = upper_32_bits(addr);
         msg->data               = its_get_event_id(d);
   
-       iommu_dma_map_msi_msg(d->irq, msg);
+       iommu_dma_compose_msi_msg(irq_data_get_msi_desc(d), msg);
   }
   
   static int its_irq_set_irqchip_state(struct irq_data *d,
@@@ -1465,9 -1464,8 +1464,8 @@@ static struct lpi_range *mk_lpi_range(u
   {
         struct lpi_range *range;
   
-       range = kzalloc(sizeof(*range), GFP_KERNEL);
+       range = kmalloc(sizeof(*range), GFP_KERNEL);
         if (range) {
-               INIT_LIST_HEAD(&range->entry);
                 range->base_id = base;
                 range->span = span;
         }
@@@ -1475,31 -1473,6 +1473,6 @@@
         return range;
   }
   
- static int lpi_range_cmp(void *priv, struct list_head *a, struct list_head *b)
- {
-       struct lpi_range *ra, *rb;
- 
-       ra = container_of(a, struct lpi_range, entry);
-       rb = container_of(b, struct lpi_range, entry);
- 
-       return ra->base_id - rb->base_id;
- }
- 
- static void merge_lpi_ranges(void)
- {
-       struct lpi_range *range, *tmp;
- 
-       list_for_each_entry_safe(range, tmp, &lpi_range_list, entry) {
-               if (!list_is_last(&range->entry, &lpi_range_list) &&
-                   (tmp->base_id == (range->base_id + range->span))) {
-                       tmp->base_id = range->base_id;
-                       tmp->span += range->span;
-                       list_del(&range->entry);
-                       kfree(range);
-               }
-       }
- }
- 
   static int alloc_lpi_range(u32 nr_lpis, u32 *base)
   {
         struct lpi_range *range, *tmp;
@@@ -1529,25 -1502,49 +1502,49 @@@
         return err;
   }
   
+ static void merge_lpi_ranges(struct lpi_range *a, struct lpi_range *b)
+ {
+       if (&a->entry == &lpi_range_list || &b->entry == &lpi_range_list)
+               return;
+       if (a->base_id + a->span != b->base_id)
+               return;
+       b->base_id = a->base_id;
+       b->span += a->span;
+       list_del(&a->entry);
+       kfree(a);
+ }
+ 
   static int free_lpi_range(u32 base, u32 nr_lpis)
   {
-       struct lpi_range *new;
-       int err = 0;
+       struct lpi_range *new, *old;
+ 
+       new = mk_lpi_range(base, nr_lpis);
+       if (!new)
+               return -ENOMEM;
   
         mutex_lock(&lpi_range_lock);
   
-       new = mk_lpi_range(base, nr_lpis);
-       if (!new) {
-               err = -ENOMEM;
-               goto out;
+       list_for_each_entry_reverse(old, &lpi_range_list, entry) {
+               if (old->base_id < base)
+                       break;
         }
+       /*
+        * old is the last element with ->base_id smaller than base,
+        * so new goes right after it. If there are no elements with
+        * ->base_id smaller than base, &old->entry ends up pointing
+        * at the head of the list, and inserting new it the start of
+        * the list is the right thing to do in that case as well.
+        */
+       list_add(&new->entry, &old->entry);
+       /*
+        * Now check if we can merge with the preceding and/or
+        * following ranges.
+        */
+       merge_lpi_ranges(old, new);
+       merge_lpi_ranges(new, list_next_entry(new, entry));
   
-       list_add(&new->entry, &lpi_range_list);
-       list_sort(NULL, &lpi_range_list, lpi_range_cmp);
-       merge_lpi_ranges();
- out:
         mutex_unlock(&lpi_range_lock);
-       return err;
+       return 0;
   }
   
   static int __init its_lpi_init(u32 id_bits)
@@@ -2487,7 -2484,7 +2484,7 @@@ static int its_msi_prepare(struct irq_d
         int err = 0;
   
         /*
-        * We ignore "dev" entierely, and rely on the dev_id that has
+        * We ignore "dev" entirely, and rely on the dev_id that has
          * been passed via the scratchpad. This limits this domain's
          * usefulness to upper layers that definitely know that they
          * are built on top of the ITS.
@@@ -2566,6 -2563,7 +2563,7 @@@ static int its_irq_domain_alloc(struct 
   {
         msi_alloc_info_t *info = args;
         struct its_device *its_dev = info->scratchpad[0].ptr;
+       struct its_node *its = its_dev->its;
         irq_hw_number_t hwirq;
         int err;
         int i;
@@@ -2574,6 -2572,10 +2572,10 @@@
         if (err)
                 return err;
   
+       err = iommu_dma_prepare_msi(info->desc, its->get_msi_base(its_dev));
+       if (err)
+               return err;
+ 
         for (i = 0; i < nr_irqs; i++) {
                 err = its_irq_gic_domain_alloc(domain, virq + i, hwirq + i);
                 if (err)
@@@ -3830,13 -3832,13 +3832,13 @@@ static int __init acpi_get_its_numa_nod
         return NUMA_NO_NODE;
   }
   
- -static int __init gic_acpi_match_srat_its(struct acpi_subtable_header *header,
+ +static int __init gic_acpi_match_srat_its(union acpi_subtable_headers *header,
                                           const unsigned long end)
   {
         return 0;
   }
   
- -static int __init gic_acpi_parse_srat_its(struct acpi_subtable_header *header,
+ +static int __init gic_acpi_parse_srat_its(union acpi_subtable_headers *header,
                          const unsigned long end)
   {
         int node;
@@@ -3903,7 -3905,7 +3905,7 @@@ static int __init acpi_get_its_numa_nod
   static void __init acpi_its_srat_maps_free(void) { }
   #endif
   
- -static int __init gic_acpi_parse_madt_its(struct acpi_subtable_header *header,
+ +static int __init gic_acpi_parse_madt_its(union acpi_subtable_headers *header,
                                           const unsigned long end)
   {
         struct acpi_madt_generic_translator *its_entry;
diff --combined drivers/soc/ti/Kconfig

index 57960e92ebe03bafa01ad04ba7ca95176640e677,82f110fe495337dbddc1b157e38633324402b7a8..dbd6c60b81db03be2ba18dcb37798cde045dcb1d
--- 1/drivers/soc/ti/Kconfig
--- 2/drivers/soc/ti/Kconfig
+++ b/drivers/soc/ti/Kconfig
@@@ -45,12 -45,11 +45,12 @@@ config KEYSTONE_NAVIGATOR_DM
   config AMX3_PM
         tristate "AMx3 Power Management"
         depends on SOC_AM33XX || SOC_AM43XX
- -      depends on WKUP_M3_IPC && TI_EMIF_SRAM && SRAM
+ +      depends on WKUP_M3_IPC && TI_EMIF_SRAM && SRAM && RTC_DRV_OMAP
         help
           Enable power management on AM335x and AM437x. Required for suspend to mem
           and standby states on both AM335x and AM437x platforms and for deeper cpuidle
- -        c-states on AM335x.
+ +        c-states on AM335x. Also required for rtc and ddr in self-refresh low
+ +        power mode on AM437x platforms.
   
   config WKUP_M3_IPC
         tristate "TI AMx3 Wkup-M3 IPC Driver"
@@@ -74,4 -73,10 +74,10 @@@ config TI_SCI_PM_DOMAIN
           called ti_sci_pm_domains. Note this is needed early in boot before
           rootfs may be available.
   
+ config TI_SCI_INTA_MSI_DOMAIN
+       bool
+       select GENERIC_MSI_IRQ_DOMAIN
+       help
+         Driver to enable Interrupt Aggregator specific MSI Domain.
+ 
   endif # SOC_TI
diff --combined include/linux/msi.h

index 052f04fcf95323046206f40e87da2081dd182a49,3eb42ede0114607d8824111345ed7fc8932cf4ab..d48e919d55ae71970eb53459ddc1bb580a2fcd44
--- 1/include/linux/msi.h
--- 2/include/linux/msi.h
+++ b/include/linux/msi.h
@@@ -47,6 -47,14 +47,14 @@@ struct fsl_mc_msi_desc 
         u16                             msi_index;
   };
   
+ /**
+  * ti_sci_inta_msi_desc - TISCI based INTA specific msi descriptor data
+  * @dev_index: TISCI device index
+  */
+ struct ti_sci_inta_msi_desc {
+       u16     dev_index;
+ };
+ 
   /**
    * struct msi_desc - Descriptor structure for MSI based interrupts
    * @list:     List head for management
@@@ -68,6 -76,7 +76,7 @@@
    * @mask_base:        [PCI MSI-X] Mask register base address
    * @platform: [platform]  Platform device specific msi descriptor data
    * @fsl_mc:   [fsl-mc]    FSL MC device specific msi descriptor data
+  * @inta:     [INTA]      TISCI based INTA specific msi descriptor data
    */
   struct msi_desc {
         /* Shared device/bus type independent data */
@@@ -77,6 -86,9 +86,9 @@@
         struct device                   *dev;
         struct msi_msg                  msg;
         struct irq_affinity_desc        *affinity;
+ #ifdef CONFIG_IRQ_MSI_IOMMU
+       const void                      *iommu_cookie;
+ #endif
   
         union {
                 /* PCI MSI/X specific data */
@@@ -106,6 -118,7 +118,7 @@@
                  */
                 struct platform_msi_desc platform;
                 struct fsl_mc_msi_desc fsl_mc;
+               struct ti_sci_inta_msi_desc inta;
         };
   };
   
@@@ -119,6 -132,29 +132,29 @@@
   #define for_each_msi_entry_safe(desc, tmp, dev)       \
         list_for_each_entry_safe((desc), (tmp), dev_to_msi_list((dev)), list)
   
+ #ifdef CONFIG_IRQ_MSI_IOMMU
+ static inline const void *msi_desc_get_iommu_cookie(struct msi_desc *desc)
+ {
+       return desc->iommu_cookie;
+ }
+ 
+ static inline void msi_desc_set_iommu_cookie(struct msi_desc *desc,
+                                            const void *iommu_cookie)
+ {
+       desc->iommu_cookie = iommu_cookie;
+ }
+ #else
+ static inline const void *msi_desc_get_iommu_cookie(struct msi_desc *desc)
+ {
+       return NULL;
+ }
+ 
+ static inline void msi_desc_set_iommu_cookie(struct msi_desc *desc,
+                                            const void *iommu_cookie)
+ {
+ }
+ #endif
+ 
   #ifdef CONFIG_PCI_MSI
   #define first_pci_msi_entry(pdev)     first_msi_entry(&(pdev)->dev)
   #define for_each_pci_msi_entry(desc, pdev)    \
@@@ -148,6 -184,24 +184,6 @@@ u32 __pci_msi_desc_mask_irq(struct msi_
   void pci_msi_mask_irq(struct irq_data *data);
   void pci_msi_unmask_irq(struct irq_data *data);
   
- -/* Conversion helpers. Should be removed after merging */
- -static inline void __write_msi_msg(struct msi_desc *entry, struct msi_msg *msg)
- -{
- -      __pci_write_msi_msg(entry, msg);
- -}
- -static inline void write_msi_msg(int irq, struct msi_msg *msg)
- -{
- -      pci_write_msi_msg(irq, msg);
- -}
- -static inline void mask_msi_irq(struct irq_data *data)
- -{
- -      pci_msi_mask_irq(data);
- -}
- -static inline void unmask_msi_irq(struct irq_data *data)
- -{
- -      pci_msi_unmask_irq(data);
- -}
- -
   /*
    * The arch hooks to setup up msi irqs. Those functions are
    * implemented as weak symbols so that they /can/ be overriden by
author	Linus Torvalds <[email protected]>
	Sun, 19 May 2019 17:58:45 +0000 (10:58 -0700)
committer	Linus Torvalds <[email protected]>
	Sun, 19 May 2019 17:58:45 +0000 (10:58 -0700)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm64/Kconfig.platforms	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/iommu/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/iommu/dma-iommu.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/irqchip/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/irqchip/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/irqchip/irq-gic-v2m.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/irqchip/irq-gic-v3-its.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/soc/ti/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/msi.h	patch \|	diff1 \|	diff2 \|	blob \| history