Merge tag 'ntb-4.13' of git://github.com/jonmason/ntb

Pull NTB updates from Jon Mason:
 "The major change in the series is a rework of the NTB infrastructure
  to all for IDT hardware to be supported (and resulting fallout from
  that). There are also a few clean-ups, etc.

  New IDT NTB driver and changes to the NTB infrastructure to allow for
  this different kind of NTB HW, some style fixes (per Greg KH
  recommendation), and some ntb_test tweaks"

* tag 'ntb-4.13' of git://github.com/jonmason/ntb:
  ntb_netdev: set the net_device's parent
  ntb: Add error path/handling to Debug FS entry creation
  ntb: Add more debugfs support for ntb_perf testing options
  ntb: Remove debug-fs variables from the context structure
  ntb: Add a module option to control affinity of DMA channels
  NTB: Add IDT 89HPESxNTx PCIe-switches support
  ntb_hw_intel: Style fixes: open code macros that just obfuscate code
  ntb_hw_amd: Style fixes: open code macros that just obfuscate code
  NTB: Add ntb.h comments
  NTB: Add PCIe Gen4 link speed
  NTB: Add new Memory Windows API documentation
  NTB: Add Messaging NTB API
  NTB: Alter Scratchpads API to support multi-ports devices
  NTB: Alter MW API to support multi-ports devices
  NTB: Alter link-state API to support multi-port devices
  NTB: Add indexed ports NTB API
  NTB: Make link-state API being declared first
  NTB: ntb_test: add parameter for doorbell bitmask
  NTB: ntb_test: modprobe on remote host

diff --combined MAINTAINERS
index 7d9bd4a041aff9254ce43f85ca173da777087c19,66f7649fad9507030c8fad3c985517332ae1ec2f..4bae99c376352c2064410f1996a0591771767aca
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -155,7 -155,7 +155,7 @@@ S: Maintaine
  F:    drivers/scsi/53c700*
  
  6LOWPAN GENERIC (BTLE/IEEE 802.15.4)
 -M:    Alexander Aring <a[email protected]>
 +M:    Alexander Aring <a[email protected]>
  M:    Jukka Rissanen <[email protected]>
  L:    [email protected]
  L:    [email protected]
@@@ -478,7 -478,7 +478,7 @@@ L: [email protected]
  S:    Maintained
  F:    Documentation/hwmon/ads1015
  F:    drivers/hwmon/ads1015.c
 -F:    include/linux/i2c/ads1015.h
 +F:    include/linux/platform_data/ads1015.h
  
  ADT746X FAN DRIVER
  M:    Colin Leroy <[email protected]>
@@@ -1036,22 -1036,6 +1036,22 @@@ S:    Maintaine
  F:    drivers/amba/
  F:    include/linux/amba/bus.h
  
 +ARM/ACTIONS SEMI ARCHITECTURE
 +M:    Andreas Färber <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +N:    owl
 +F:    arch/arm/mach-actions/
 +F:    arch/arm/boot/dts/owl-*
 +F:    arch/arm64/boot/dts/actions/
 +F:    drivers/clocksource/owl-*
 +F:    drivers/soc/actions/
 +F:    include/dt-bindings/power/owl-*
 +F:    include/linux/soc/actions/
 +F:    Documentation/devicetree/bindings/arm/actions.txt
 +F:    Documentation/devicetree/bindings/power/actions,owl-sps.txt
 +F:    Documentation/devicetree/bindings/timer/actions,owl-timer.txt
 +
  ARM/ADS SPHERE MACHINE SUPPORT
  M:    Lennert Buytenhek <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -1139,18 -1123,6 +1139,18 @@@ F:    arch/arm/mach-aspeed
  F:    arch/arm/boot/dts/aspeed-*
  F:    drivers/*/*aspeed*
  
 +ARM/ASPEED I2C DRIVER
 +M:    Brendan Higgins <[email protected]>
 +R:    Benjamin Herrenschmidt <[email protected]>
 +R:    Joel Stanley <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/irqchip/irq-aspeed-i2c-ic.c
 +F:    drivers/i2c/busses/i2c-aspeed.c
 +F:    Documentation/devicetree/bindings/interrupt-controller/aspeed,ast2400-i2c-ic.txt
 +F:    Documentation/devicetree/bindings/i2c/i2c-aspeed.txt
 +
  ARM/ATMEL AT91RM9200, AT91SAM9 AND SAMA5 SOC SUPPORT
  M:    Nicolas Ferre <[email protected]>
  M:    Alexandre Belloni <[email protected]>
@@@ -1235,9 -1207,7 +1235,9 @@@ L:      [email protected]
  S:    Maintained
  F:    drivers/hwtracing/coresight/*
  F:    Documentation/trace/coresight.txt
 +F:    Documentation/trace/coresight-cpu-debug.txt
  F:    Documentation/devicetree/bindings/arm/coresight.txt
 +F:    Documentation/devicetree/bindings/arm/coresight-cpu-debug.txt
  F:    Documentation/ABI/testing/sysfs-bus-coresight-devices-*
  F:    tools/perf/arch/arm/util/pmu.c
  F:    tools/perf/arch/arm/util/auxtrace.c
@@@ -1255,7 -1225,7 +1255,7 @@@ L:      [email protected]
  T:    git git://github.com/ulli-kroll/linux.git
  S:    Maintained
  F:    arch/arm/mach-gemini/
 -F:    drivers/rtc/rtc-gemini.c
 +F:    drivers/rtc/rtc-ftrtc010.c
  
  ARM/CSR SIRFPRIMA2 MACHINE SUPPORT
  M:    Barry Song <[email protected]>
@@@ -1527,7 -1497,6 +1527,7 @@@ F:      arch/arm64/boot/dts/marvell/armada
  F:    drivers/cpufreq/mvebu-cpufreq.c
  F:    drivers/irqchip/irq-armada-370-xp.c
  F:    drivers/irqchip/irq-mvebu-*
 +F:    drivers/pinctrl/mvebu/
  F:    drivers/rtc/rtc-armada38x.c
  
  ARM/Marvell Berlin SoC support
@@@ -1694,6 -1663,7 +1694,6 @@@ F:      arch/arm/mach-qcom
  F:    arch/arm64/boot/dts/qcom/*
  F:    drivers/i2c/busses/i2c-qup.c
  F:    drivers/clk/qcom/
 -F:    drivers/pinctrl/qcom/
  F:    drivers/dma/qcom/
  F:    drivers/soc/qcom/
  F:    drivers/spi/spi-qup.c
@@@ -1709,13 -1679,6 +1709,13 @@@ M:    Lennert Buytenhek <kernel@wantstofly
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  
 +ARM/REALTEK ARCHITECTURE
 +M:    Andreas Färber <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +F:    arch/arm64/boot/dts/realtek/
 +F:    Documentation/devicetree/bindings/arm/realtek.txt
 +
  ARM/RENESAS ARM64 ARCHITECTURE
  M:    Simon Horman <[email protected]>
  M:    Magnus Damm <[email protected]>
@@@ -1749,7 -1712,6 +1749,7 @@@ L:      [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git
  S:    Maintained
  F:    arch/arm/boot/dts/rk3*
 +F:    arch/arm/boot/dts/rv1108*
  F:    arch/arm/mach-rockchip/
  F:    drivers/clk/rockchip/
  F:    drivers/i2c/busses/i2c-rk3x.c
@@@ -1814,12 -1776,11 +1814,12 @@@ F:   arch/arm/plat-samsung/s5p-dev-mfc.
  F:    drivers/media/platform/s5p-mfc/
  
  ARM/SAMSUNG S5P SERIES HDMI CEC SUBSYSTEM SUPPORT
 -M:    Kyungmin Park <kyungmin.park@samsung.com>
 -L:    linux-[email protected]
 +M:    Marek Szyprowski <m.szyprowski@samsung.com>
 +L:    linux-[email protected] (moderated for non-subscribers)
  L:    [email protected]
  S:    Maintained
 -F:    drivers/staging/media/platform/s5p-cec/
 +F:    drivers/media/platform/s5p-cec/
 +F:    Documentation/devicetree/bindings/media/s5p-cec.txt
  
  ARM/SAMSUNG S5P SERIES JPEG CODEC SUPPORT
  M:    Andrzej Pietrasiewicz <[email protected]>
@@@ -1882,8 -1843,8 +1882,8 @@@ F:      drivers/i2c/busses/i2c-st.
  F:    drivers/media/rc/st_rc.c
  F:    drivers/media/platform/sti/c8sectpfe/
  F:    drivers/mmc/host/sdhci-st.c
 -F:    drivers/phy/phy-miphy28lp.c
 -F:    drivers/phy/phy-stih407-usb.c
 +F:    drivers/phy/st/phy-miphy28lp.c
 +F:    drivers/phy/st/phy-stih407-usb.c
  F:    drivers/pinctrl/pinctrl-st.c
  F:    drivers/remoteproc/st_remoteproc.c
  F:    drivers/remoteproc/st_slim_rproc.c
@@@ -2361,15 -2322,6 +2361,15 @@@ F:    Documentation/devicetree/bindings/in
  F:    drivers/input/touchscreen/atmel_mxt_ts.c
  F:    include/linux/platform_data/atmel_mxt_ts.h
  
 +ATOMIC INFRASTRUCTURE
 +M:    Will Deacon <[email protected]>
 +M:    Peter Zijlstra <[email protected]>
 +R:    Boqun Feng <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    arch/*/include/asm/atomic*.h
 +F:    include/*/atomic*.h
 +
  ATTO EXPRESSSAS SAS/SATA RAID SCSI DRIVER
  M:    Bradley Grove <[email protected]>
  L:    [email protected]
@@@ -2643,21 -2595,6 +2643,21 @@@ S:    Maintaine
  F:    net/bluetooth/
  F:    include/net/bluetooth/
  
 +DMA MAPPING HELPERS
 +M:    Christoph Hellwig <[email protected]>
 +M:    Marek Szyprowski <[email protected]>
 +R:    Robin Murphy <[email protected]>
 +L:    [email protected]
 +T:    git git://git.infradead.org/users/hch/dma-mapping.git
 +W:    http://git.infradead.org/users/hch/dma-mapping.git
 +S:    Supported
 +F:    lib/dma-debug.c
 +F:    lib/dma-noop.c
 +F:    lib/dma-virt.c
 +F:    drivers/base/dma-mapping.c
 +F:    drivers/base/dma-coherent.c
 +F:    include/linux/dma-mapping.h
 +
  BONDING DRIVER
  M:    Jay Vosburgh <[email protected]>
  M:    Veaceslav Falico <[email protected]>
@@@ -2748,6 -2685,7 +2748,6 @@@ N:      kon
  F:    arch/arm/mach-bcm/
  
  BROADCOM BCM2835 ARM ARCHITECTURE
 -M:    Lee Jones <[email protected]>
  M:    Eric Anholt <[email protected]>
  M:    Stefan Wahren <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -2847,11 -2785,8 +2847,11 @@@ BROADCOM BRCM80211 IEEE802.11n WIRELES
  M:    Arend van Spriel <[email protected]>
  M:    Franky Lin <[email protected]>
  M:    Hante Meuleman <[email protected]>
 +M:    Chi-Hsien Lin <[email protected]>
 +M:    Wright Feng <[email protected]>
  L:    [email protected]
  L:    [email protected]
 +L:    [email protected]
  S:    Supported
  F:    drivers/net/wireless/broadcom/brcm80211/
  
@@@ -3202,7 -3137,6 +3202,7 @@@ F:      include/media/cec.
  F:    include/media/cec-notifier.h
  F:    include/uapi/linux/cec.h
  F:    include/uapi/linux/cec-funcs.h
 +F:    Documentation/devicetree/bindings/media/cec.txt
  
  CELL BROADBAND ENGINE ARCHITECTURE
  M:    Arnd Bergmann <[email protected]>
@@@ -3331,10 -3265,9 +3331,10 @@@ F:    Documentation/devicetree/bindings/in
  F:    drivers/input/touchscreen/chipone_icn8318.c
  
  CHROME HARDWARE PLATFORM SUPPORT
 +M:    Benson Leung <[email protected]>
  M:    Olof Johansson <[email protected]>
  S:    Maintained
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/olof/chrome-platform.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/bleung/chrome-platform.git
  F:    drivers/platform/chrome/
  
  CISCO VIC ETHERNET NIC DRIVER
@@@ -3653,6 -3586,7 +3653,6 @@@ T:      git git://git.kernel.org/pub/scm/lin
  S:    Maintained
  F:    Documentation/crypto/
  F:    Documentation/devicetree/bindings/crypto/
 -F:    Documentation/DocBook/crypto-API.tmpl
  F:    arch/*/crypto/
  F:    crypto/
  F:    drivers/crypto/
@@@ -3779,13 -3713,6 +3779,13 @@@ S:    Supporte
  F:    drivers/infiniband/hw/cxgb4/
  F:    include/uapi/rdma/cxgb4-abi.h
  
 +CXGB4 CRYPTO DRIVER (chcr)
 +M:    Harsh Jain <[email protected]>
 +L:    [email protected]
 +W:    http://www.chelsio.com
 +S:    Supported
 +F:    drivers/crypto/chelsio
 +
  CXGB4VF ETHERNET DRIVER (CXGB4VF)
  M:    Casey Leedom <[email protected]>
  L:    [email protected]
@@@ -3794,8 -3721,8 +3794,8 @@@ S:      Supporte
  F:    drivers/net/ethernet/chelsio/cxgb4vf/
  
  CXL (IBM Coherent Accelerator Processor Interface CAPI) DRIVER
 -M:    Ian Munsie <[email protected]>
  M:    Frederic Barrat <[email protected]>
 +M:    Andrew Donnellan <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    arch/powerpc/platforms/powernv/pci-cxl.c
@@@ -3859,12 -3786,6 +3859,12 @@@ S:    Supporte
  F:    drivers/input/touchscreen/cyttsp*
  F:    include/linux/input/cyttsp.h
  
 +D-LINK DIR-685 TOUCHKEYS DRIVER
 +M:    Linus Walleij <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/input/dlink-dir685-touchkeys.c
 +
  DALLAS/MAXIM DS1685-FAMILY REAL TIME CLOCK
  M:    Joshua Kinard <[email protected]>
  S:    Maintained
@@@ -3974,12 -3895,6 +3974,12 @@@ M:    Pali Rohár <[email protected]
  S:    Maintained
  F:    drivers/platform/x86/dell-wmi.c
  
 +DENALI NAND DRIVER
 +M:    Masahiro Yamada <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/mtd/nand/denali*
 +
  DESIGNWARE USB2 DRD IP DRIVER
  M:    John Youn <[email protected]>
  L:    [email protected]
@@@ -4073,10 -3988,7 +4073,10 @@@ W:    http://www.dialog-semiconductor.com/
  S:    Supported
  F:    Documentation/hwmon/da90??
  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/watchdog/da92??-wdt.txt
  F:    Documentation/devicetree/bindings/sound/da[79]*.txt
  F:    drivers/gpio/gpio-da90??.c
  F:    drivers/hwmon/da90??-hwmon.c
@@@ -4091,7 -4003,6 +4091,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/thermal/da90??-thermal.c
  F:    drivers/rtc/rtc-da90??.c
  F:    drivers/video/backlight/da90??_bl.c
  F:    drivers/watchdog/da90??_wdt.c
@@@ -4232,7 -4143,8 +4232,7 @@@ M:      Jonathan Corbet <[email protected]
  L:    [email protected]
  S:    Maintained
  F:    Documentation/
 -F:    scripts/docproc.c
 -F:    scripts/kernel-doc*
 +F:    scripts/kernel-doc
  X:    Documentation/ABI/
  X:    Documentation/devicetree/
  X:    Documentation/acpi
@@@ -4323,12 -4235,6 +4323,12 @@@ F:    include/drm/drm
  F:    include/uapi/drm/drm*
  F:    include/linux/vga*
  
 +DRM DRIVER FOR ARM PL111 CLCD
 +M:    Eric Anholt <[email protected]>
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
 +S:    Supported
 +F:    drivers/gpu/drm/pl111/
 +
  DRM DRIVER FOR AST SERVER GRAPHICS CHIPS
  M:    Dave Airlie <[email protected]>
  S:    Odd Fixes
@@@ -4336,8 -4242,6 +4336,8 @@@ F:      drivers/gpu/drm/ast
  
  DRM DRIVERS FOR BRIDGE CHIPS
  M:    Archit Taneja <[email protected]>
 +M:    Andrzej Hajda <[email protected]>
 +R:    Laurent Pinchart <[email protected]>
  S:    Maintained
  T:    git git://anongit.freedesktop.org/drm/drm-misc
  F:    drivers/gpu/drm/bridge/
@@@ -4594,17 -4498,6 +4594,17 @@@ S:    Maintaine
  F:    drivers/gpu/drm/sti
  F:    Documentation/devicetree/bindings/display/st,stih4xx.txt
  
 +DRM DRIVERS FOR STM
 +M:    Yannick Fertre <[email protected]>
 +M:    Philippe Cornu <[email protected]>
 +M:    Benjamin Gaignard <[email protected]>
 +M:    Vincent Abriou <[email protected]>
 +L:    [email protected]
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
 +S:    Maintained
 +F:    drivers/gpu/drm/stm
 +F:    Documentation/devicetree/bindings/display/st,stm32-ltdc.txt
 +
  DRM DRIVER FOR TDFX VIDEO CARDS
  S:    Orphan / Obsolete
  F:    drivers/gpu/drm/tdfx/
@@@ -4799,13 -4692,6 +4799,13 @@@ S:    Maintaine
  F:    drivers/media/usb/dvb-usb-v2/dvb_usb*
  F:    drivers/media/usb/dvb-usb-v2/usb_urb.c
  
 +DONGWOON DW9714 LENS VOICE COIL DRIVER
 +M:    Sakari Ailus <[email protected]>
 +L:    [email protected]
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    drivers/media/i2c/dw9714.c
 +
  DYNAMIC DEBUG
  M:    Jason Baron <[email protected]>
  S:    Maintained
@@@ -5113,12 -4999,6 +5113,12 @@@ T:    git git://git.kernel.org/pub/scm/lin
  F:    drivers/video/fbdev/s1d13xxxfb.c
  F:    include/video/s1d13xxxfb.h
  
 +ERRSEQ ERROR TRACKING INFRASTRUCTURE
 +M:    Jeff Layton <[email protected]>
 +S:    Maintained
 +F:    lib/errseq.c
 +F:    include/linux/errseq.h
 +
  ET131X NETWORK DRIVER
  M:    Mark Einon <[email protected]>
  S:    Odd Fixes
@@@ -5402,7 -5282,7 +5402,7 @@@ S:      Maintaine
  F:    drivers/video/fbdev/fsl-diu-fb.*
  
  FREESCALE DMA DRIVER
 -M:    Li Yang <leoli@freescale.com>
 +M:    Li Yang <leoyang.li@nxp.com>
  M:    Zhang Wei <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -5467,11 -5347,11 +5467,11 @@@ S:   Maintaine
  F:    drivers/net/ethernet/freescale/dpaa
  
  FREESCALE SOC DRIVERS
 -M:    Scott Wood <[email protected]>
 +M:    Li Yang <[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/devicetree/bindings/powerpc/fsl/
 +F:    Documentation/devicetree/bindings/soc/fsl/
  F:    drivers/soc/fsl/
  F:    include/linux/fsl/
  
@@@ -5484,14 -5364,14 +5484,14 @@@ F:   include/soc/fsl/*qe*.
  F:    include/soc/fsl/*ucc*.h
  
  FREESCALE USB PERIPHERAL DRIVERS
 -M:    Li Yang <leoli@freescale.com>
 +M:    Li Yang <leoyang.li@nxp.com>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
  F:    drivers/usb/gadget/udc/fsl*
  
  FREESCALE QUICC ENGINE UCC ETHERNET DRIVER
 -M:    Li Yang <leoli@freescale.com>
 +M:    Li Yang <leoyang.li@nxp.com>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
@@@ -5801,15 -5681,6 +5801,15 @@@ F:    include/asm-generic/gpio.
  F:    include/uapi/linux/gpio.h
  F:    tools/gpio/
  
 +GPIO ACPI SUPPORT
 +M:    Mika Westerberg <[email protected]>
 +M:    Andy Shevchenko <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/acpi/gpio-properties.txt
 +F:    drivers/gpio/gpiolib-acpi.c
 +
  GRE DEMULTIPLEXER DRIVER
  M:    Dmitry Kozlov <[email protected]>
  L:    [email protected]
@@@ -6154,7 -6025,7 +6154,7 @@@ F:      drivers/hid/hid-sensor-
  F:    drivers/iio/*/hid-*
  F:    include/linux/hid-sensor-*
  
 -HIGH-RESOLUTION TIMERS, CLOCKEVENTS, DYNTICKS
 +HIGH-RESOLUTION TIMERS, CLOCKEVENTS
  M:    Thomas Gleixner <[email protected]>
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core
@@@ -6162,6 -6033,7 +6162,6 @@@ S:      Maintaine
  F:    Documentation/timers/
  F:    kernel/time/hrtimer.c
  F:    kernel/time/clockevents.c
 -F:    kernel/time/tick*.*
  F:    kernel/time/timer_*.c
  F:    include/linux/clockchips.h
  F:    include/linux/hrtimer.h
@@@ -6400,7 -6272,6 +6400,7 @@@ M:      Mika Westerberg <mika.westerberg@lin
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
 +F:    drivers/i2c/i2c-core-acpi.c
  
  I2C-TAOS-EVM DRIVER
  M:    Jean Delvare <[email protected]>
@@@ -6555,7 -6426,7 +6555,7 @@@ F:      Documentation/cdrom/ide-c
  F:    drivers/ide/ide-cd*
  
  IEEE 802.15.4 SUBSYSTEM
 -M:    Alexander Aring <a[email protected]>
 +M:    Alexander Aring <a[email protected]>
  M:    Stefan Schmidt <[email protected]>
  L:    [email protected]
  W:    http://wpan.cakelab.org/
@@@ -6609,13 -6480,6 +6609,13 @@@ F:    Documentation/ABI/testing/sysfs-bus-
  F:    Documentation/devicetree/bindings/iio/adc/envelope-detector.txt
  F:    drivers/iio/adc/envelope-detector.c
  
 +IIO MULTIPLEXER
 +M:    Peter Rosin <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/iio/multiplexer/iio-mux.txt
 +F:    drivers/iio/multiplexer/iio-mux.c
 +
  IIO SUBSYSTEM AND DRIVERS
  M:    Jonathan Cameron <[email protected]>
  R:    Hartmut Knaack <[email protected]>
@@@ -6733,10 -6597,8 +6733,10 @@@ S:    Maintaine
  F:    drivers/input/
  F:    include/linux/input.h
  F:    include/uapi/linux/input.h
 +F:    include/uapi/linux/input-event-codes.h
  F:    include/linux/input/
  F:    Documentation/devicetree/bindings/input/
 +F:    Documentation/input/
  
  INPUT MULTITOUCH (MT) PROTOCOL
  M:    Henrik Rydberg <[email protected]>
@@@ -6746,12 -6608,6 +6746,12 @@@ F:    Documentation/input/multi-touch-prot
  F:    drivers/input/input-mt.c
  K:    \b(ABS|SYN)_MT_
  
 +INSIDE SECURE CRYPTO DRIVER
 +M:    Antoine Tenart <[email protected]>
 +F:    drivers/crypto/inside-secure/
 +S:    Maintained
 +L:    [email protected]
 +
  INTEL ASoC BDW/HSW DRIVERS
  M:    Jie Yang <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -6881,7 -6737,6 +6881,7 @@@ F:      Documentation/networking/i40e.tx
  F:    Documentation/networking/i40evf.txt
  F:    drivers/net/ethernet/intel/
  F:    drivers/net/ethernet/intel/*/
 +F:    include/linux/avf/virtchnl.h
  
  INTEL RDMA RNIC DRIVER
  M:     Faisal Latif <[email protected]>
@@@ -7389,10 -7244,9 +7389,10 @@@ KERNEL SELFTEST FRAMEWOR
  M:    Shuah Khan <[email protected]>
  M:    Shuah Khan <[email protected]>
  L:    [email protected]
 -T:    git git://git.kernel.org/pub/scm/shuah/linux-kselftest
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git
  S:    Maintained
 -F:    tools/testing/selftests
 +F:    tools/testing/selftests/
 +F:    Documentation/dev-tools/kselftest*
  
  KERNEL VIRTUAL MACHINE (KVM)
  M:    Paolo Bonzini <[email protected]>
@@@ -7431,7 -7285,7 +7431,7 @@@ F:      arch/powerpc/kvm
  
  KERNEL VIRTUAL MACHINE for s390 (KVM/s390)
  M:    Christian Borntraeger <[email protected]>
 -M:    Cornelia Huck <co[email protected].com>
 +M:    Cornelia Huck <cohuck@redhat.com>
  L:    [email protected]
  W:    http://www.ibm.com/developerworks/linux/linux390/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git
@@@ -7494,7 -7348,7 +7494,7 @@@ KEYS/KEYRINGS
  M:    David Howells <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/security/keys.txt
 +F:    Documentation/security/keys/core.rst
  F:    include/linux/key.h
  F:    include/linux/key-type.h
  F:    include/linux/keyctl.h
@@@ -7508,7 -7362,7 +7508,7 @@@ M:      Mimi Zohar <[email protected]
  L:    [email protected]
  L:    [email protected]
  S:    Supported
 -F:    Documentation/security/keys-trusted-encrypted.txt
 +F:    Documentation/security/keys/trusted-encrypted.rst
  F:    include/keys/trusted-type.h
  F:    security/keys/trusted.c
  F:    security/keys/trusted.h
@@@ -7519,7 -7373,7 +7519,7 @@@ M:      David Safford <[email protected]
  L:    [email protected]
  L:    [email protected]
  S:    Supported
 -F:    Documentation/security/keys-trusted-encrypted.txt
 +F:    Documentation/security/keys/trusted-encrypted.rst
  F:    include/keys/encrypted-type.h
  F:    security/keys/encrypted-keys/
  
@@@ -7529,7 -7383,7 +7529,7 @@@ W:      http://kgdb.wiki.kernel.org
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/kgdb.git
  S:    Maintained
 -F:    Documentation/DocBook/kgdb.tmpl
 +F:    Documentation/dev-tools/kgdb.rst
  F:    drivers/misc/kgdbts.c
  F:    drivers/tty/serial/kgdboc.c
  F:    include/linux/kdb.h
@@@ -7683,15 -7537,6 +7683,15 @@@ S:    Maintaine
  F:    drivers/ata/pata_*.c
  F:    drivers/ata/ata_generic.c
  
 +LIBATA PATA FARADAY FTIDE010 AND GEMINI SATA BRIDGE DRIVERS
 +M:    Linus Walleij <[email protected]>
 +L:    [email protected]
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git
 +S:    Maintained
 +F:    drivers/ata/pata_ftide010.c
 +F:    drivers/ata/sata_gemini.c
 +F:    drivers/ata/sata_gemini.h
 +
  LIBATA SATA AHCI PLATFORM devices support
  M:    Hans de Goede <[email protected]>
  M:    Tejun Heo <[email protected]>
@@@ -7710,7 -7555,7 +7710,7 @@@ S:      Maintaine
  F:    drivers/ata/sata_promise.*
  
  LIBLOCKDEP
 -M:    Sasha Levin <sasha.levin@oracle.com>
 +M:    Sasha Levin <alexander.levin@verizon.com>
  S:    Maintained
  F:    tools/lib/lockdep/
  
@@@ -7746,7 -7591,9 +7746,7 @@@ M:      Ross Zwisler <[email protected]
  L:    [email protected]
  Q:    https://patchwork.kernel.org/project/linux-nvdimm/list/
  S:    Supported
 -F:    drivers/nvdimm/pmem.c
 -F:    include/linux/pmem.h
 -F:    arch/*/include/asm/pmem.h
 +F:    drivers/nvdimm/pmem*
  
  LIGHTNVM PLATFORM SUPPORT
  M:    Matias Bjorling <[email protected]>
@@@ -7837,7 -7684,6 +7837,7 @@@ T:      git git://git.kernel.org/pub/scm/lin
  S:    Maintained
  F:    arch/powerpc/platforms/83xx/
  F:    arch/powerpc/platforms/85xx/
 +F:    Documentation/devicetree/bindings/powerpc/fsl/
  
  LINUX FOR POWERPC PA SEMI PWRFICIENT
  L:    [email protected]
@@@ -8131,12 -7977,6 +8131,12 @@@ S:    Maintaine
  F:    drivers/net/ethernet/marvell/mv643xx_eth.*
  F:    include/linux/mv643xx.h
  
 +MARVELL MV88X3310 PHY DRIVER
 +M:    Russell King <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/net/phy/marvell10g.c
 +
  MARVELL MVNETA ETHERNET DRIVER
  M:    Thomas Petazzoni <[email protected]>
  L:    [email protected]
@@@ -8190,16 -8030,6 +8190,16 @@@ S:    Maintaine
  F:    Documentation/hwmon/max20751
  F:    drivers/hwmon/max20751.c
  
 +MAX2175 SDR TUNER DRIVER
 +M:    Ramesh Shanmugasundaram <[email protected]>
 +L:    [email protected]
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/media/i2c/max2175.txt
 +F:    Documentation/media/v4l-drivers/max2175.rst
 +F:    drivers/media/i2c/max2175*
 +F:    include/uapi/linux/max2175.h
 +
  MAX6650 HARDWARE MONITOR AND FAN CONTROLLER DRIVER
  L:    [email protected]
  S:    Orphan
@@@ -8230,11 -8060,11 +8230,11 @@@ S:   Supporte
  F:    drivers/power/supply/max14577_charger.c
  F:    drivers/power/supply/max77693_charger.c
  
 -MAXIM MAX77802 MULTIFUNCTION PMIC DEVICE DRIVERS
 -M:    Javier Martinez Canillas <javier@osg.samsung.com>
 +MAXIM MAX77802 PMIC REGULATOR DEVICE DRIVER
 +M:    Javier Martinez Canillas <javier@dowhile0.org>
  L:    [email protected]
  S:    Supported
 -F:    drivers/*/*max77802*.c
 +F:    drivers/regulator/max77802-regulator.c
  F:    Documentation/devicetree/bindings/*/*max77802.txt
  F:    include/dt-bindings/*/*max77802.h
  
@@@ -8280,27 -8110,6 +8280,27 @@@ L:    [email protected]
  S:    Maintained
  F:    drivers/iio/dac/cio-dac.c
  
 +MEDIA DRIVERS FOR RENESAS - DRIF
 +M:    Ramesh Shanmugasundaram <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Supported
 +F:    Documentation/devicetree/bindings/media/renesas,drif.txt
 +F:    drivers/media/platform/rcar_drif.c
 +
 +MEDIA DRIVERS FOR FREESCALE IMX
 +M:    Steve Longerbeam <[email protected]>
 +M:    Philipp Zabel <[email protected]>
 +L:    [email protected]
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/media/imx.txt
 +F:    Documentation/media/v4l-drivers/imx.rst
 +F:    drivers/staging/media/imx/
 +F:    include/linux/imx-media.h
 +F:    include/media/imx.h
 +
  MEDIA DRIVERS FOR RENESAS - FCP
  M:    Laurent Pinchart <[email protected]>
  L:    [email protected]
@@@ -8458,11 -8267,6 +8458,11 @@@ L:    [email protected]
  S:    Maintained
  F:    drivers/net/wireless/mediatek/mt7601u/
  
 +MEDIATEK RANDOM NUMBER GENERATOR SUPPORT
 +M:      Sean Wang <[email protected]>
 +S:      Maintained
 +F:      drivers/char/hw_random/mtk-rng.c
 +
  MEGACHIPS STDPXXXX-GE-B850V3-FW LVDS/DP++ BRIDGES
  M:    Peter Senna Tschudin <[email protected]>
  M:    Martin Donnelly <[email protected]>
@@@ -8506,26 -8310,6 +8506,26 @@@ W:    http://www.mellanox.co
  Q:    http://patchwork.ozlabs.org/project/netdev/list/
  F:    drivers/net/ethernet/mellanox/mlx5/core/en_*
  
 +MELLANOX ETHERNET INNOVA DRIVER
 +M:    Ilan Tayari <[email protected]>
 +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/fpga/*
 +F:    include/linux/mlx5/mlx5_ifc_fpga.h
 +
 +MELLANOX ETHERNET INNOVA IPSEC DRIVER
 +M:    Ilan Tayari <[email protected]>
 +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]>
@@@ -8535,14 -8319,6 +8535,14 @@@ W:    http://www.mellanox.co
  Q:    http://patchwork.ozlabs.org/project/netdev/list/
  F:    drivers/net/ethernet/mellanox/mlxsw/
  
 +MELLANOX FIRMWARE FLASH LIBRARY (mlxfw)
 +M:    Yotam Gigi <[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/mlxfw/
 +
  MELLANOX MLXCPLD I2C AND MUX DRIVER
  M:    Vadim Pasternak <[email protected]>
  M:    Michael Shych <[email protected]>
@@@ -8661,7 -8437,7 +8661,7 @@@ T:      git git://git.monstr.eu/linux-2.6-mi
  S:    Supported
  F:    arch/microblaze/
  
 -MICROCHIP / ATMEL AT91 / AT32 SERIAL DRIVER
 +MICROCHIP / ATMEL AT91 SERIAL DRIVER
  M:    Richard Genoud <[email protected]>
  S:    Maintained
  F:    drivers/tty/serial/atmel_serial.c
@@@ -8684,16 -8460,6 +8684,16 @@@ F:    drivers/media/platform/atmel/atmel-i
  F:    drivers/media/platform/atmel/atmel-isc-regs.h
  F:    devicetree/bindings/media/atmel-isc.txt
  
 +MICROCHIP KSZ SERIES ETHERNET SWITCH DRIVER
 +M:    Woojung Huh <[email protected]>
 +M:    Microchip Linux Driver Support <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    net/dsa/tag_ksz.c
 +F:    drivers/net/dsa/microchip/*
 +F:    include/linux/platform_data/microchip-ksz.h
 +F:    Documentation/devicetree/bindings/net/dsa/ksz.txt
 +
  MICROCHIP USB251XB DRIVER
  M:    Richard Leitner <[email protected]>
  L:    [email protected]
@@@ -8949,15 -8715,6 +8949,15 @@@ S:    Orpha
  F:    drivers/mmc/host/mmc_spi.c
  F:    include/linux/spi/mmc_spi.h
  
 +MULTIPLEXER SUBSYSTEM
 +M:    Peter Rosin <[email protected]>
 +S:    Maintained
 +F:    Documentation/ABI/testing/mux/sysfs-class-mux*
 +F:    Documentation/devicetree/bindings/mux/
 +F:    include/linux/dt-bindings/mux/
 +F:    include/linux/mux/
 +F:    drivers/mux/
 +
  MULTISOUND SOUND DRIVER
  M:    Andrew Veliath <[email protected]>
  S:    Maintained
@@@ -9175,7 -8932,9 +9175,7 @@@ F:      lib/random32.
  NETWORKING [IPv4/IPv6]
  M:    "David S. Miller" <[email protected]>
  M:    Alexey Kuznetsov <[email protected]>
 -M:    James Morris <[email protected]>
  M:    Hideaki YOSHIFUJI <[email protected]>
 -M:    Patrick McHardy <[email protected]>
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git
  S:    Maintained
@@@ -9184,16 -8943,6 +9184,16 @@@ F:    net/ipv6
  F:    include/net/ip*
  F:    arch/x86/net/*
  
 +NETWORKING [TLS]
 +M:    Ilya Lesokhin <[email protected]>
 +M:    Aviad Yehezkel <[email protected]>
 +M:    Dave Watson <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    net/tls/*
 +F:    include/uapi/linux/tls.h
 +F:    include/net/tls.h
 +
  NETWORKING [IPSEC]
  M:    Steffen Klassert <[email protected]>
  M:    Herbert Xu <[email protected]>
@@@ -9275,6 -9024,9 +9275,6 @@@ F:      include/uapi/linux/nfc.
  F:    drivers/nfc/
  F:    include/linux/platform_data/nfcmrvl.h
  F:    include/linux/platform_data/nxp-nci.h
 -F:    include/linux/platform_data/pn544.h
 -F:    include/linux/platform_data/st21nfca.h
 -F:    include/linux/platform_data/st-nci.h
  F:    Documentation/devicetree/bindings/net/nfc/
  
  NFS, SUNRPC, AND LOCKD CLIENTS
@@@ -9329,17 -9081,6 +9329,17 @@@ T:    git git://git.kernel.org/pub/scm/lin
  S:    Maintained
  F:    arch/nios2/
  
 +NOHZ, DYNTICKS SUPPORT
 +M:    Frederic Weisbecker <[email protected]>
 +M:    Thomas Gleixner <[email protected]>
 +M:    Ingo Molnar <[email protected]>
 +L:    [email protected]
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/nohz
 +S:    Maintained
 +F:    kernel/time/tick*.*
 +F:    include/linux/tick.h
 +F:    include/linux/sched/nohz.h
 +
  NOKIA N900 CAMERA SUPPORT (ET8EK8 SENSOR, AD5820 FOCUS)
  M:    Pavel Machek <[email protected]>
  M:    Sakari Ailus <[email protected]>
@@@ -9381,6 -9122,12 +9381,12 @@@ F:    include/linux/ntb.
  F:    include/linux/ntb_transport.h
  F:    tools/testing/selftests/ntb/
  
+ NTB IDT DRIVER
+ M:    Serge Semin <[email protected]>
+ L:    [email protected]
+ S:    Supported
+ F:    drivers/ntb/hw/idt/
+ 
  NTB INTEL DRIVER
  M:    Jon Mason <[email protected]>
  M:    Dave Jiang <[email protected]>
@@@ -9677,13 -9424,6 +9683,13 @@@ M:    Harald Welte <[email protected]
  S:    Maintained
  F:    drivers/char/pcmcia/cm4040_cs.*
  
 +OMNIVISION OV5640 SENSOR DRIVER
 +M:    Steve Longerbeam <[email protected]>
 +L:    [email protected]
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    drivers/media/i2c/ov5640.c
 +
  OMNIVISION OV5647 SENSOR DRIVER
  M:    Ramiro Oliveira <[email protected]>
  L:    [email protected]
@@@ -9699,13 -9439,6 +9705,13 @@@ S:    Maintaine
  F:    drivers/media/i2c/ov7670.c
  F:    Documentation/devicetree/bindings/media/i2c/ov7670.txt
  
 +OMNIVISION OV13858 SENSOR DRIVER
 +M:    Sakari Ailus <[email protected]>
 +L:    [email protected]
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    drivers/media/i2c/ov13858.c
 +
  ONENAND FLASH DRIVER
  M:    Kyungmin Park <[email protected]>
  L:    [email protected]
@@@ -9740,7 -9473,6 +9746,7 @@@ S:      Maintaine
  F:    drivers/of/
  F:    include/linux/of*.h
  F:    scripts/dtc/
 +F:    Documentation/ABI/testing/sysfs-firmware-ofw
  
  OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS
  M:    Rob Herring <[email protected]>
@@@ -10209,16 -9941,9 +10215,16 @@@ S:  Maintaine
  F:    Documentation/devicetree/bindings/pci/hisilicon-pcie.txt
  F:    drivers/pci/dwc/pcie-hisi.c
  
 +PCIE DRIVER FOR HISILICON KIRIN
 +M:    Xiaowei Song <[email protected]>
 +M:    Binghui Wang <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/pci/pcie-kirin.txt
 +F:    drivers/pci/dwc/pcie-kirin.c
 +
  PCIE DRIVER FOR ROCKCHIP
  M:    Shawn Lin <[email protected]>
 -M:    Wenrui Li <[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
@@@ -10240,14 -9965,6 +10246,14 @@@ S:  Supporte
  F:    Documentation/devicetree/bindings/pci/pci-thunder-*
  F:    drivers/pci/host/pci-thunder-*
  
 +PCIE DRIVER FOR MEDIATEK
 +M:      Ryder Lee <[email protected]>
 +L:      [email protected]
 +L:      [email protected]
 +S:      Supported
 +F:      Documentation/devicetree/bindings/pci/mediatek*
 +F:      drivers/pci/host/*mediatek*
 +
  PCMCIA SUBSYSTEM
  P:    Linux PCMCIA Team
  L:    [email protected]
@@@ -10372,13 -10089,6 +10378,13 @@@ M: Heikki Krogerus <heikki.krogerus@lin
  S:    Maintained
  F:    drivers/pinctrl/intel/
  
 +PIN CONTROLLER - QUALCOMM
 +M:    Bjorn Andersson <[email protected]>
 +S:    Maintained
 +L:    [email protected]
 +F:    Documentation/devicetree/bindings/pinctrl/qcom,*.txt
 +F:    drivers/pinctrl/qcom/
 +
  PIN CONTROLLER - RENESAS
  M:    Laurent Pinchart <[email protected]>
  M:    Geert Uytterhoeven <[email protected]>
@@@ -10450,7 -10160,7 +10456,7 @@@ T:   git git://git.kernel.org/pub/scm/lin
  S:    Maintained
  F:    Documentation/hwmon/pmbus
  F:    drivers/hwmon/pmbus/
 -F:    include/linux/i2c/pmbus.h
 +F:    include/linux/pmbus.h
  
  PMC SIERRA MaxRAID DRIVER
  L:    [email protected]
@@@ -10579,17 -10289,6 +10585,17 @@@ W: http://wireless.kernel.org/en/users/
  S:    Obsolete
  F:    drivers/net/wireless/intersil/prism54/
  
 +PROC SYSCTL
 +M:    "Luis R. Rodriguez" <[email protected]>
 +M:    Kees Cook <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    fs/proc/proc_sysctl.c
 +F:    include/linux/sysctl.h
 +F:    kernel/sysctl.c
 +F:    tools/testing/selftests/sysctl/
 +
  PS3 NETWORK SUPPORT
  M:    Geoff Levand <[email protected]>
  L:    [email protected]
@@@ -10851,7 -10550,6 +10857,7 @@@ M:   Laurentiu Tudor <laurentiu.tudor@nxp
  L:    [email protected]
  S:    Maintained
  F:    drivers/staging/fsl-mc/
 +F:    Documentation/devicetree/bindings/misc/fsl,qoriq-mc.txt
  
  QT1010 MEDIA DRIVER
  M:    Antti Palosaari <[email protected]>
@@@ -10891,14 -10589,6 +10897,14 @@@ T: git git://git.kernel.org/pub/scm/lin
  S:    Supported
  F:    arch/hexagon/
  
 +QUALCOMM VENUS VIDEO ACCELERATOR DRIVER
 +M:    Stanimir Varbanov <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    drivers/media/platform/qcom/venus/
 +
  QUALCOMM WCN36XX WIRELESS DRIVER
  M:    Eugene Krasnikov <[email protected]>
  L:    [email protected]
@@@ -10914,14 -10604,6 +10920,14 @@@ L: [email protected]
  S:    Maintained
  F:    drivers/firmware/qemu_fw_cfg.c
  
 +QUANTENNA QTNFMAC WIRELESS DRIVER
 +M:   Igor Mitsyanko <[email protected]>
 +M:   Avinash Patil <[email protected]>
 +M:   Sergey Matyukevich <[email protected]>
 +L:   [email protected]
 +S:   Maintained
 +F:   drivers/net/wireless/quantenna
 +
  RADOS BLOCK DEVICE (RBD)
  M:    Ilya Dryomov <[email protected]>
  M:    Sage Weil <[email protected]>
@@@ -11155,11 -10837,11 +11161,11 @@@ L:        [email protected]
  S:    Supported
  F:    drivers/iio/adc/rcar_gyro_adc.c
  
 -RENESAS USB2 PHY DRIVER
 +RENESAS USB PHY DRIVER
  M:    Yoshihiro Shimoda <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/phy/phy-rcar-gen3-usb2.c
 +F:    drivers/phy/renesas/phy-rcar-gen3-usb*.c
  
  RESET CONTROLLER FRAMEWORK
  M:    Philipp Zabel <[email protected]>
@@@ -11316,7 -10998,7 +11322,7 @@@ S:   Supporte
  F:    arch/s390/
  F:    drivers/s390/
  F:    Documentation/s390/
 -F:    Documentation/DocBook/s390*
 +F:    Documentation/driver-api/s390-drivers.rst
  
  S390 COMMON I/O LAYER
  M:    Sebastian Ott <[email protected]>
@@@ -11384,7 -11066,7 +11390,7 @@@ S:   Supporte
  F:    drivers/iommu/s390-iommu.c
  
  S390 VFIO-CCW DRIVER
 -M:    Cornelia Huck <co[email protected].com>
 +M:    Cornelia Huck <cohuck@redhat.com>
  M:    Dong Jia Shi <[email protected]>
  L:    [email protected]
  L:    [email protected]
@@@ -11561,12 -11243,12 +11567,12 @@@ L:        [email protected]
  S:    Supported
  F:    Documentation/devicetree/bindings/phy/samsung-phy.txt
  F:    Documentation/phy/samsung-usb2.txt
 -F:    drivers/phy/phy-exynos4210-usb2.c
 -F:    drivers/phy/phy-exynos4x12-usb2.c
 -F:    drivers/phy/phy-exynos5250-usb2.c
 -F:    drivers/phy/phy-s5pv210-usb2.c
 -F:    drivers/phy/phy-samsung-usb2.c
 -F:    drivers/phy/phy-samsung-usb2.h
 +F:    drivers/phy/samsung/phy-exynos4210-usb2.c
 +F:    drivers/phy/samsung/phy-exynos4x12-usb2.c
 +F:    drivers/phy/samsung/phy-exynos5250-usb2.c
 +F:    drivers/phy/samsung/phy-s5pv210-usb2.c
 +F:    drivers/phy/samsung/phy-samsung-usb2.c
 +F:    drivers/phy/samsung/phy-samsung-usb2.h
  
  SERIAL DRIVERS
  M:    Greg Kroah-Hartman <[email protected]>
@@@ -11650,9 -11332,6 +11656,9 @@@ F:   Documentation/tee.tx
  
  THUNDERBOLT DRIVER
  M:    Andreas Noever <[email protected]>
 +M:    Michael Jamet <[email protected]>
 +M:    Mika Westerberg <[email protected]>
 +M:    Yehezkel Bernat <[email protected]>
  S:    Maintained
  F:    drivers/thunderbolt/
  
@@@ -11680,14 -11359,6 +11686,14 @@@ F: kernel/time/alarmtimer.
  F:    kernel/time/ntp.c
  F:    tools/testing/selftests/timers/
  
 +TI TRF7970A NFC DRIVER
 +M:    Mark Greer <[email protected]>
 +L:    [email protected]
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Supported
 +F:    drivers/nfc/trf7970a.c
 +F:    Documentation/devicetree/bindings/net/nfc/trf7970a.txt
 +
  SC1200 WDT DRIVER
  M:    Zwane Mwaikambo <[email protected]>
  S:    Maintained
@@@ -11828,8 -11499,6 +11834,8 @@@ F:   kernel/seccomp.
  F:    include/uapi/linux/seccomp.h
  F:    include/linux/seccomp.h
  F:    tools/testing/selftests/seccomp/*
 +F:    tools/testing/selftests/kselftest_harness.h
 +F:    Documentation/userspace-api/seccomp_filter.rst
  K:    \bsecure_computing
  K:    \bTIF_SECCOMP\b
  
@@@ -11888,7 -11557,6 +11894,7 @@@ S:   Supporte
  F:    include/linux/selinux*
  F:    security/selinux/
  F:    scripts/selinux/
 +F:    Documentation/admin-guide/LSM/SELinux.rst
  
  APPARMOR SECURITY MODULE
  M:    John Johansen <[email protected]>
@@@ -11897,21 -11565,18 +11903,21 @@@ W:        apparmor.wiki.kernel.or
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jj/apparmor-dev.git
  S:    Supported
  F:    security/apparmor/
 +F:    Documentation/admin-guide/LSM/apparmor.rst
  
  LOADPIN SECURITY MODULE
  M:    Kees Cook <[email protected]>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git lsm/loadpin
  S:    Supported
  F:    security/loadpin/
 +F:    Documentation/admin-guide/LSM/LoadPin.rst
  
  YAMA SECURITY MODULE
  M:    Kees Cook <[email protected]>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git yama/tip
  S:    Supported
  F:    security/yama/
 +F:    Documentation/admin-guide/LSM/Yama.rst
  
  SENSABLE PHANTOM
  M:    Jiri Slaby <[email protected]>
@@@ -12129,13 -11794,6 +12135,13 @@@ S: Maintaine
  F:    drivers/media/platform/davinci/
  F:    include/media/davinci/
  
 +TI DAVINCI SERIES GPIO DRIVER
 +M:    Keerthy <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/gpio/gpio-davinci.txt
 +F:    drivers/gpio/gpio-davinci.c
 +
  TI AM437X VPFE DRIVER
  M:    "Lad, Prabhakar" <[email protected]>
  L:    [email protected]
@@@ -12221,7 -11879,7 +12227,7 @@@ L:   [email protected]
  W:    http://schaufler-ca.com
  T:    git git://github.com/cschaufler/smack-next
  S:    Maintained
 -F:    Documentation/security/Smack.txt
 +F:    Documentation/admin-guide/LSM/Smack.rst
  F:    security/smack/
  
  DRIVERS FOR ADAPTIVE VOLTAGE SCALING (AVS)
@@@ -12311,9 -11969,8 +12317,9 @@@ F:   drivers/leds/leds-net48xx.
  
  SOFTLOGIC 6x10 MPEG CODEC
  M:    Bluecherry Maintainers <[email protected]>
 +M:    Anton Sviridenko <[email protected]>
  M:    Andrey Utkin <[email protected]>
 -M:    Andrey Utkin <andrey.krieger.utkin@gmail.com>
 +M:    Andrey Utkin <andrey_utkin@fastmail.com>
  M:    Ismael Luceno <[email protected]>
  L:    [email protected]
  S:    Supported
@@@ -12470,8 -12127,7 +12476,8 @@@ M:   Marek Vasut <[email protected]
  L:    [email protected]
  W:    http://www.linux-mtd.infradead.org/
  Q:    http://patchwork.ozlabs.org/project/linux-mtd/list/
 -T:    git git://github.com/spi-nor/linux.git
 +T:    git git://git.infradead.org/linux-mtd.git spi-nor/fixes
 +T:    git git://git.infradead.org/l2-mtd.git spi-nor/next
  S:    Maintained
  F:    drivers/mtd/spi-nor/
  F:    include/linux/mtd/spi-nor.h
@@@ -12982,10 -12638,6 +12988,10 @@@ F: include/linux/soc/ti/ti_sci_protocol
  F:    Documentation/devicetree/bindings/soc/ti/sci-pm-domain.txt
  F:    include/dt-bindings/genpd/k2g.h
  F:    drivers/soc/ti/ti_sci_pm_domains.c
 +F:    Documentation/devicetree/bindings/reset/ti,sci-reset.txt
 +F:    Documentation/devicetree/bindings/clock/ti,sci-clk.txt
 +F:    drivers/clk/keystone/sci-clk.c
 +F:    drivers/reset/reset-ti-sci.c
  
  THANKO'S RAREMONO AM/FM/SW RADIO RECEIVER USB DRIVER
  M:    Hans Verkuil <[email protected]>
@@@ -13235,7 -12887,7 +13241,7 @@@ M:   Wolfram Sang <wsa+renesas@sang-engin
  L:    [email protected]
  S:    Supported
  F:    drivers/mmc/host/tmio_mmc*
 -F:    drivers/mmc/host/sh_mobile_sdhi.c
 +F:    drivers/mmc/host/renesas_sdhi*
  F:    include/linux/mfd/tmio.h
  
  TMP401 HARDWARE MONITOR DRIVER
@@@ -13264,7 -12916,6 +13270,7 @@@ F:   Documentation/media/v4l-drivers/tm60
  
  TW5864 VIDEO4LINUX DRIVER
  M:    Bluecherry Maintainers <[email protected]>
 +M:    Anton Sviridenko <[email protected]>
  M:    Andrey Utkin <[email protected]>
  M:    Andrey Utkin <[email protected]>
  L:    [email protected]
@@@ -13817,17 -13468,6 +13823,17 @@@ W: http://en.wikipedia.org/wiki/Util-li
  T:    git git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git
  S:    Maintained
  
 +UUID HELPERS
 +M:    Christoph Hellwig <[email protected]>
 +R:    Andy Shevchenko <[email protected]>
 +L:    [email protected]
 +T:    git git://git.infradead.org/users/hch/uuid.git
 +F:    lib/uuid.c
 +F:    lib/test_uuid.c
 +F:    include/linux/uuid.h
 +F:    include/uapi/linux/uuid.h
 +S:    Maintained
 +
  UVESAFB DRIVER
  M:    Michal Januszewski <[email protected]>
  L:    [email protected]
@@@ -13890,12 -13530,6 +13896,12 @@@ S: Maintaine
  F:    drivers/media/v4l2-core/videobuf2-*
  F:    include/media/videobuf2-*
  
 +VIDEO MULTIPLEXER DRIVER
 +M:    Philipp Zabel <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/media/platform/video-mux.c
 +
  VIRTIO AND VHOST VSOCK DRIVER
  M:    Stefan Hajnoczi <[email protected]>
  L:    [email protected]
@@@ -13941,7 -13575,7 +13947,7 @@@ F:   include/uapi/linux/virtio_*.
  F:    drivers/crypto/virtio/
  
  VIRTIO DRIVERS FOR S390
 -M:    Cornelia Huck <co[email protected].com>
 +M:    Cornelia Huck <cohuck@redhat.com>
  M:    Halil Pasic <[email protected]>
  L:    [email protected]
  L:    [email protected]
@@@ -14140,7 -13774,6 +14146,7 @@@ M:   Evgeniy Polyakov <[email protected]
  S:    Maintained
  F:    Documentation/w1/
  F:    drivers/w1/
 +F:    include/linux/w1.h
  
  W83791D HARDWARE MONITORING DRIVER
  M:    Marc Hulsman <[email protected]>
@@@ -14355,8 -13988,6 +14361,8 @@@ F:   drivers/xen
  F:    arch/x86/include/asm/xen/
  F:    include/xen/
  F:    include/uapi/xen/
 +F:    Documentation/ABI/stable/sysfs-hypervisor-xen
 +F:    Documentation/ABI/testing/sysfs-hypervisor-xen
  
  XEN HYPERVISOR ARM
  M:    Stefano Stabellini <[email protected]>
@@@ -14449,14 -14080,6 +14455,14 @@@ L: [email protected]
  S:    Supported
  F:    drivers/char/xillybus/
  
 +XRA1403 GPIO EXPANDER
 +M:    Nandor Han <[email protected]>
 +M:    Semi Malinen <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/gpio/gpio-xra1403.c
 +F:    Documentation/devicetree/bindings/gpio/gpio-xra1403.txt
 +
  XTENSA XTFPGA PLATFORM SUPPORT
  M:    Max Filippov <[email protected]>
  L:    [email protected]