]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 9 Jul 2017 18:18:59 +0000 (11:18 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 9 Jul 2017 18:18:59 +0000 (11:18 -0700)
Pull timers fixlet from Thomas Gleixner:
 "Add Frederic Weisbecker as NOHZ/dyntick maintainer"

[ And an unmentioned and unrelated typo fix in the same commit? Hmm.. ]

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  MAINTAINERS: Add Frederic Weisbecker as nohz/dyntics maintainer

1  2 
MAINTAINERS

diff --combined MAINTAINERS
index 4f4057c8ffca7363ac1018192fdc4e918c6031ae,a7be0d553dba0f520cd8f1ee4b64a10c1f20798b..01dffc0a9e1fcde81b2e50dcaa7deb2fec70b8f2
@@@ -155,7 -155,7 +155,7 @@@ S: Maintaine
  F:    drivers/scsi/53c700*
  
  6LOWPAN GENERIC (BTLE/IEEE 802.15.4)
 -M:    Alexander Aring <aar@pengutronix.de>
 +M:    Alexander Aring <alex.aring@gmail.com>
  M:    Jukka Rissanen <jukka.rissanen@linux.intel.com>
  L:    linux-bluetooth@vger.kernel.org
  L:    linux-wpan@vger.kernel.org
@@@ -478,7 -478,7 +478,7 @@@ L: linux-hwmon@vger.kernel.or
  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 <colin@colino.net>
@@@ -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 <afaerber@suse.de>
 +L:    linux-arm-kernel@lists.infradead.org (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 <kernel@wantstofly.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -1223,9 -1207,7 +1223,9 @@@ L:      linux-arm-kernel@lists.infradead.or
  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
@@@ -1515,7 -1497,6 +1515,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
@@@ -1682,6 -1663,7 +1682,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
@@@ -1697,13 -1679,6 +1697,13 @@@ M:    Lennert Buytenhek <kernel@wantstofly
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  
 +ARM/REALTEK ARCHITECTURE
 +M:    Andreas Färber <afaerber@suse.de>
 +L:    linux-arm-kernel@lists.infradead.org (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 <horms@verge.net.au>
  M:    Magnus Damm <magnus.damm@gmail.com>
@@@ -1737,7 -1712,6 +1737,7 @@@ L:      linux-rockchip@lists.infradead.or
  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
@@@ -1802,12 -1776,11 +1802,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-arm-kernel@lists.infradead.org
 +M:    Marek Szyprowski <m.szyprowski@samsung.com>
 +L:    linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
  L:    linux-media@vger.kernel.org
  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 <andrzej.p@samsung.com>
@@@ -1870,8 -1843,8 +1870,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
@@@ -2631,21 -2604,6 +2631,21 @@@ S:    Maintaine
  F:    net/bluetooth/
  F:    include/net/bluetooth/
  
 +DMA MAPPING HELPERS
 +M:    Christoph Hellwig <hch@lst.de>
 +M:    Marek Szyprowski <m.szyprowski@samsung.com>
 +R:    Robin Murphy <robin.murphy@arm.com>
 +L:    linux-kernel@vger.kernel.org
 +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 <j.vosburgh@gmail.com>
  M:    Veaceslav Falico <vfalico@gmail.com>
@@@ -2736,6 -2694,7 +2736,6 @@@ N:      kon
  F:    arch/arm/mach-bcm/
  
  BROADCOM BCM2835 ARM ARCHITECTURE
 -M:    Lee Jones <lee@kernel.org>
  M:    Eric Anholt <eric@anholt.net>
  M:    Stefan Wahren <stefan.wahren@i2se.com>
  L:    linux-rpi-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -2835,11 -2794,8 +2835,11 @@@ BROADCOM BRCM80211 IEEE802.11n WIRELES
  M:    Arend van Spriel <arend.vanspriel@broadcom.com>
  M:    Franky Lin <franky.lin@broadcom.com>
  M:    Hante Meuleman <hante.meuleman@broadcom.com>
 +M:    Chi-Hsien Lin <chi-hsien.lin@cypress.com>
 +M:    Wright Feng <wright.feng@cypress.com>
  L:    linux-wireless@vger.kernel.org
  L:    brcm80211-dev-list.pdl@broadcom.com
 +L:    brcm80211-dev-list@cypress.com
  S:    Supported
  F:    drivers/net/wireless/broadcom/brcm80211/
  
@@@ -3190,7 -3146,6 +3190,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 <arnd@arndb.de>
@@@ -3640,6 -3595,7 +3640,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/
@@@ -3766,13 -3722,6 +3766,13 @@@ S:    Supporte
  F:    drivers/infiniband/hw/cxgb4/
  F:    include/uapi/rdma/cxgb4-abi.h
  
 +CXGB4 CRYPTO DRIVER (chcr)
 +M:    Harsh Jain <harsh@chelsio.com>
 +L:    linux-crypto@vger.kernel.org
 +W:    http://www.chelsio.com
 +S:    Supported
 +F:    drivers/crypto/chelsio
 +
  CXGB4VF ETHERNET DRIVER (CXGB4VF)
  M:    Casey Leedom <leedom@chelsio.com>
  L:    netdev@vger.kernel.org
@@@ -3781,8 -3730,8 +3781,8 @@@ S:      Supporte
  F:    drivers/net/ethernet/chelsio/cxgb4vf/
  
  CXL (IBM Coherent Accelerator Processor Interface CAPI) DRIVER
 -M:    Ian Munsie <imunsie@au1.ibm.com>
  M:    Frederic Barrat <fbarrat@linux.vnet.ibm.com>
 +M:    Andrew Donnellan <andrew.donnellan@au1.ibm.com>
  L:    linuxppc-dev@lists.ozlabs.org
  S:    Supported
  F:    arch/powerpc/platforms/powernv/pci-cxl.c
@@@ -3846,12 -3795,6 +3846,12 @@@ S:    Supporte
  F:    drivers/input/touchscreen/cyttsp*
  F:    include/linux/input/cyttsp.h
  
 +D-LINK DIR-685 TOUCHKEYS DRIVER
 +M:    Linus Walleij <linus.walleij@linaro.org>
 +L:    linux-input@vger.kernel.org
 +S:    Supported
 +F:    drivers/input/dlink-dir685-touchkeys.c
 +
  DALLAS/MAXIM DS1685-FAMILY REAL TIME CLOCK
  M:    Joshua Kinard <kumba@gentoo.org>
  S:    Maintained
@@@ -4054,10 -3997,7 +4054,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
@@@ -4072,7 -4012,6 +4072,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
@@@ -4213,7 -4152,8 +4213,7 @@@ M:      Jonathan Corbet <corbet@lwn.net
  L:    linux-doc@vger.kernel.org
  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
@@@ -4761,13 -4701,6 +4761,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 <sakari.ailus@linux.intel.com>
 +L:    linux-media@vger.kernel.org
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    drivers/media/i2c/dw9714.c
 +
  DYNAMIC DEBUG
  M:    Jason Baron <jbaron@akamai.com>
  S:    Maintained
@@@ -5075,12 -5008,6 +5075,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 <jlayton@poochiereds.net>
 +S:    Maintained
 +F:    lib/errseq.c
 +F:    include/linux/errseq.h
 +
  ET131X NETWORK DRIVER
  M:    Mark Einon <mark.einon@gmail.com>
  S:    Odd Fixes
@@@ -5364,7 -5291,7 +5364,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 <zw@zh-kernel.org>
  L:    linuxppc-dev@lists.ozlabs.org
  S:    Maintained
@@@ -5429,11 -5356,11 +5429,11 @@@ S:   Maintaine
  F:    drivers/net/ethernet/freescale/dpaa
  
  FREESCALE SOC DRIVERS
 -M:    Scott Wood <oss@buserror.net>
 +M:    Li Yang <leoyang.li@nxp.com>
  L:    linuxppc-dev@lists.ozlabs.org
  L:    linux-arm-kernel@lists.infradead.org
  S:    Maintained
 -F:    Documentation/devicetree/bindings/powerpc/fsl/
 +F:    Documentation/devicetree/bindings/soc/fsl/
  F:    drivers/soc/fsl/
  F:    include/linux/fsl/
  
@@@ -5446,14 -5373,14 +5446,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:    linux-usb@vger.kernel.org
  L:    linuxppc-dev@lists.ozlabs.org
  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:    netdev@vger.kernel.org
  L:    linuxppc-dev@lists.ozlabs.org
  S:    Maintained
@@@ -5763,15 -5690,6 +5763,15 @@@ F:    include/asm-generic/gpio.
  F:    include/uapi/linux/gpio.h
  F:    tools/gpio/
  
 +GPIO ACPI SUPPORT
 +M:    Mika Westerberg <mika.westerberg@linux.intel.com>
 +M:    Andy Shevchenko <andriy.shevchenko@linux.intel.com>
 +L:    linux-gpio@vger.kernel.org
 +L:    linux-acpi@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/acpi/gpio-properties.txt
 +F:    drivers/gpio/gpiolib-acpi.c
 +
  GRE DEMULTIPLEXER DRIVER
  M:    Dmitry Kozlov <xeb@mail.ru>
  L:    netdev@vger.kernel.org
@@@ -6116,7 -6034,7 +6116,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 <tglx@linutronix.de>
  L:    linux-kernel@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core
@@@ -6124,7 -6042,6 +6124,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
@@@ -6517,7 -6434,7 +6516,7 @@@ F:      Documentation/cdrom/ide-c
  F:    drivers/ide/ide-cd*
  
  IEEE 802.15.4 SUBSYSTEM
 -M:    Alexander Aring <aar@pengutronix.de>
 +M:    Alexander Aring <alex.aring@gmail.com>
  M:    Stefan Schmidt <stefan@osg.samsung.com>
  L:    linux-wpan@vger.kernel.org
  W:    http://wpan.cakelab.org/
@@@ -6571,13 -6488,6 +6570,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 <peda@axentia.se>
 +L:    linux-iio@vger.kernel.org
 +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 <jic23@kernel.org>
  R:    Hartmut Knaack <knaack.h@gmx.de>
@@@ -6695,10 -6605,8 +6694,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 <rydberg@bitmath.org>
@@@ -6708,12 -6616,6 +6707,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 <antoine.tenart@free-electrons.com>
 +F:    drivers/crypto/inside-secure/
 +S:    Maintained
 +L:    linux-crypto@vger.kernel.org
 +
  INTEL ASoC BDW/HSW DRIVERS
  M:    Jie Yang <yang.jie@linux.intel.com>
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
@@@ -6843,7 -6745,6 +6842,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 <faisal.latif@intel.com>
@@@ -7351,10 -7252,9 +7350,10 @@@ KERNEL SELFTEST FRAMEWOR
  M:    Shuah Khan <shuahkh@osg.samsung.com>
  M:    Shuah Khan <shuah@kernel.org>
  L:    linux-kselftest@vger.kernel.org
 -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 <pbonzini@redhat.com>
@@@ -7393,7 -7293,7 +7392,7 @@@ F:      arch/powerpc/kvm
  
  KERNEL VIRTUAL MACHINE for s390 (KVM/s390)
  M:    Christian Borntraeger <borntraeger@de.ibm.com>
 -M:    Cornelia Huck <cornelia.huck@de.ibm.com>
 +M:    Cornelia Huck <cohuck@redhat.com>
  L:    linux-s390@vger.kernel.org
  W:    http://www.ibm.com/developerworks/linux/linux390/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git
@@@ -7456,7 -7356,7 +7455,7 @@@ KEYS/KEYRINGS
  M:    David Howells <dhowells@redhat.com>
  L:    keyrings@vger.kernel.org
  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
@@@ -7470,7 -7370,7 +7469,7 @@@ M:      Mimi Zohar <zohar@linux.vnet.ibm.com
  L:    linux-security-module@vger.kernel.org
  L:    keyrings@vger.kernel.org
  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
@@@ -7481,7 -7381,7 +7480,7 @@@ M:      David Safford <safford@us.ibm.com
  L:    linux-security-module@vger.kernel.org
  L:    keyrings@vger.kernel.org
  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/
  
@@@ -7491,7 -7391,7 +7490,7 @@@ W:      http://kgdb.wiki.kernel.org
  L:    kgdb-bugreport@lists.sourceforge.net
  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
@@@ -7645,15 -7545,6 +7644,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 <linus.walleij@linaro.org>
 +L:    linux-ide@vger.kernel.org
 +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 <hdegoede@redhat.com>
  M:    Tejun Heo <tj@kernel.org>
@@@ -7708,7 -7599,9 +7707,7 @@@ M:      Ross Zwisler <ross.zwisler@linux.int
  L:    linux-nvdimm@lists.01.org
  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 <mb@lightnvm.io>
@@@ -7799,7 -7692,6 +7798,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:    linuxppc-dev@lists.ozlabs.org
@@@ -8093,12 -7985,6 +8092,12 @@@ S:    Maintaine
  F:    drivers/net/ethernet/marvell/mv643xx_eth.*
  F:    include/linux/mv643xx.h
  
 +MARVELL MV88X3310 PHY DRIVER
 +M:    Russell King <rmk@armlinux.org.uk>
 +L:    netdev@vger.kernel.org
 +S:    Maintained
 +F:    drivers/net/phy/marvell10g.c
 +
  MARVELL MVNETA ETHERNET DRIVER
  M:    Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
  L:    netdev@vger.kernel.org
@@@ -8152,16 -8038,6 +8151,16 @@@ S:    Maintaine
  F:    Documentation/hwmon/max20751
  F:    drivers/hwmon/max20751.c
  
 +MAX2175 SDR TUNER DRIVER
 +M:    Ramesh Shanmugasundaram <ramesh.shanmugasundaram@bp.renesas.com>
 +L:    linux-media@vger.kernel.org
 +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:    linux-hwmon@vger.kernel.org
  S:    Orphan
@@@ -8192,11 -8068,11 +8191,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:    linux-kernel@vger.kernel.org
  S:    Supported
 -F:    drivers/*/*max77802*.c
 +F:    drivers/regulator/max77802-regulator.c
  F:    Documentation/devicetree/bindings/*/*max77802.txt
  F:    include/dt-bindings/*/*max77802.h
  
@@@ -8242,27 -8118,6 +8241,27 @@@ L:    linux-iio@vger.kernel.or
  S:    Maintained
  F:    drivers/iio/dac/cio-dac.c
  
 +MEDIA DRIVERS FOR RENESAS - DRIF
 +M:    Ramesh Shanmugasundaram <ramesh.shanmugasundaram@bp.renesas.com>
 +L:    linux-media@vger.kernel.org
 +L:    linux-renesas-soc@vger.kernel.org
 +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 <slongerbeam@gmail.com>
 +M:    Philipp Zabel <p.zabel@pengutronix.de>
 +L:    linux-media@vger.kernel.org
 +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 <laurent.pinchart@ideasonboard.com>
  L:    linux-media@vger.kernel.org
@@@ -8420,11 -8275,6 +8419,11 @@@ L:    linux-wireless@vger.kernel.or
  S:    Maintained
  F:    drivers/net/wireless/mediatek/mt7601u/
  
 +MEDIATEK RANDOM NUMBER GENERATOR SUPPORT
 +M:      Sean Wang <sean.wang@mediatek.com>
 +S:      Maintained
 +F:      drivers/char/hw_random/mtk-rng.c
 +
  MEGACHIPS STDPXXXX-GE-B850V3-FW LVDS/DP++ BRIDGES
  M:    Peter Senna Tschudin <peter.senna@collabora.com>
  M:    Martin Donnelly <martin.donnelly@ge.com>
@@@ -8468,26 -8318,6 +8467,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 <ilant@mellanox.com>
 +R:    Boris Pismenny <borisp@mellanox.com>
 +L:    netdev@vger.kernel.org
 +S:    Supported
 +W:    http://www.mellanox.com
 +Q:    http://patchwork.ozlabs.org/project/netdev/list/
 +F:    drivers/net/ethernet/mellanox/mlx5/core/fpga/*
 +F:    include/linux/mlx5/mlx5_ifc_fpga.h
 +
 +MELLANOX ETHERNET INNOVA IPSEC DRIVER
 +M:    Ilan Tayari <ilant@mellanox.com>
 +R:    Boris Pismenny <borisp@mellanox.com>
 +L:    netdev@vger.kernel.org
 +S:    Supported
 +W:    http://www.mellanox.com
 +Q:    http://patchwork.ozlabs.org/project/netdev/list/
 +F:    drivers/net/ethernet/mellanox/mlx5/core/en_ipsec/*
 +F:    drivers/net/ethernet/mellanox/mlx5/core/ipsec*
 +
  MELLANOX ETHERNET SWITCH DRIVERS
  M:    Jiri Pirko <jiri@mellanox.com>
  M:    Ido Schimmel <idosch@mellanox.com>
@@@ -8497,14 -8327,6 +8496,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 <yotamg@mellanox.com>
 +L:    netdev@vger.kernel.org
 +S:    Supported
 +W:    http://www.mellanox.com
 +Q:    http://patchwork.ozlabs.org/project/netdev/list/
 +F:    drivers/net/ethernet/mellanox/mlxfw/
 +
  MELLANOX MLXCPLD I2C AND MUX DRIVER
  M:    Vadim Pasternak <vadimp@mellanox.com>
  M:    Michael Shych <michaelsh@mellanox.com>
@@@ -8623,7 -8445,7 +8622,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 <richard.genoud@gmail.com>
  S:    Maintained
  F:    drivers/tty/serial/atmel_serial.c
@@@ -8646,16 -8468,6 +8645,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 <Woojung.Huh@microchip.com>
 +M:    Microchip Linux Driver Support <UNGLinuxDriver@microchip.com>
 +L:    netdev@vger.kernel.org
 +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 <richard.leitner@skidata.com>
  L:    linux-usb@vger.kernel.org
@@@ -8911,15 -8723,6 +8910,15 @@@ S:    Orpha
  F:    drivers/mmc/host/mmc_spi.c
  F:    include/linux/spi/mmc_spi.h
  
 +MULTIPLEXER SUBSYSTEM
 +M:    Peter Rosin <peda@axentia.se>
 +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 <andrewtv@usa.net>
  S:    Maintained
@@@ -9137,7 -8940,9 +9136,7 @@@ F:      lib/random32.
  NETWORKING [IPv4/IPv6]
  M:    "David S. Miller" <davem@davemloft.net>
  M:    Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>
 -M:    James Morris <jmorris@namei.org>
  M:    Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
 -M:    Patrick McHardy <kaber@trash.net>
  L:    netdev@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git
  S:    Maintained
@@@ -9146,16 -8951,6 +9145,16 @@@ F:    net/ipv6
  F:    include/net/ip*
  F:    arch/x86/net/*
  
 +NETWORKING [TLS]
 +M:    Ilya Lesokhin <ilyal@mellanox.com>
 +M:    Aviad Yehezkel <aviadye@mellanox.com>
 +M:    Dave Watson <davejwatson@fb.com>
 +L:    netdev@vger.kernel.org
 +S:    Maintained
 +F:    net/tls/*
 +F:    include/uapi/linux/tls.h
 +F:    include/net/tls.h
 +
  NETWORKING [IPSEC]
  M:    Steffen Klassert <steffen.klassert@secunet.com>
  M:    Herbert Xu <herbert@gondor.apana.org.au>
@@@ -9237,6 -9032,9 +9236,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
@@@ -9291,6 -9089,17 +9290,17 @@@ T:    git git://git.kernel.org/pub/scm/lin
  S:    Maintained
  F:    arch/nios2/
  
+ NOHZ, DYNTICKS SUPPORT
+ M:    Frederic Weisbecker <fweisbec@gmail.com>
+ M:    Thomas Gleixner <tglx@linutronix.de>
+ M:    Ingo Molnar <mingo@kernel.org>
+ L:    linux-kernel@vger.kernel.org
+ 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 <pavel@ucw.cz>
  M:    Sakari Ailus <sakari.ailus@iki.fi>
@@@ -9628,13 -9437,6 +9638,13 @@@ M:    Harald Welte <laforge@gnumonks.org
  S:    Maintained
  F:    drivers/char/pcmcia/cm4040_cs.*
  
 +OMNIVISION OV5640 SENSOR DRIVER
 +M:    Steve Longerbeam <slongerbeam@gmail.com>
 +L:    linux-media@vger.kernel.org
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    drivers/media/i2c/ov5640.c
 +
  OMNIVISION OV5647 SENSOR DRIVER
  M:    Ramiro Oliveira <roliveir@synopsys.com>
  L:    linux-media@vger.kernel.org
@@@ -9650,13 -9452,6 +9660,13 @@@ S:    Maintaine
  F:    drivers/media/i2c/ov7670.c
  F:    Documentation/devicetree/bindings/media/i2c/ov7670.txt
  
 +OMNIVISION OV13858 SENSOR DRIVER
 +M:    Sakari Ailus <sakari.ailus@linux.intel.com>
 +L:    linux-media@vger.kernel.org
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    drivers/media/i2c/ov13858.c
 +
  ONENAND FLASH DRIVER
  M:    Kyungmin Park <kyungmin.park@samsung.com>
  L:    linux-mtd@lists.infradead.org
@@@ -9691,7 -9486,6 +9701,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 <robh+dt@kernel.org>
@@@ -10160,16 -9954,9 +10170,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 <songxiaowei@hisilicon.com>
 +M:    Binghui Wang <wangbinghui@hisilicon.com>
 +L:    linux-pci@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/pci/pcie-kirin.txt
 +F:    drivers/pci/dwc/pcie-kirin.c
 +
  PCIE DRIVER FOR ROCKCHIP
  M:    Shawn Lin <shawn.lin@rock-chips.com>
 -M:    Wenrui Li <wenrui.li@rock-chips.com>
  L:    linux-pci@vger.kernel.org
  L:    linux-rockchip@lists.infradead.org
  S:    Maintained
@@@ -10191,14 -9978,6 +10201,14 @@@ S:  Supporte
  F:    Documentation/devicetree/bindings/pci/pci-thunder-*
  F:    drivers/pci/host/pci-thunder-*
  
 +PCIE DRIVER FOR MEDIATEK
 +M:      Ryder Lee <ryder.lee@mediatek.com>
 +L:      linux-pci@vger.kernel.org
 +L:      linux-mediatek@lists.infradead.org
 +S:      Supported
 +F:      Documentation/devicetree/bindings/pci/mediatek*
 +F:      drivers/pci/host/*mediatek*
 +
  PCMCIA SUBSYSTEM
  P:    Linux PCMCIA Team
  L:    linux-pcmcia@lists.infradead.org
@@@ -10323,13 -10102,6 +10333,13 @@@ M: Heikki Krogerus <heikki.krogerus@lin
  S:    Maintained
  F:    drivers/pinctrl/intel/
  
 +PIN CONTROLLER - QUALCOMM
 +M:    Bjorn Andersson <bjorn.andersson@linaro.org>
 +S:    Maintained
 +L:    linux-arm-msm@vger.kernel.org
 +F:    Documentation/devicetree/bindings/pinctrl/qcom,*.txt
 +F:    drivers/pinctrl/qcom/
 +
  PIN CONTROLLER - RENESAS
  M:    Laurent Pinchart <laurent.pinchart@ideasonboard.com>
  M:    Geert Uytterhoeven <geert+renesas@glider.be>
@@@ -10401,7 -10173,7 +10411,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:    linux-scsi@vger.kernel.org
@@@ -10791,7 -10563,6 +10801,7 @@@ M:   Laurentiu Tudor <laurentiu.tudor@nxp
  L:    linux-kernel@vger.kernel.org
  S:    Maintained
  F:    drivers/staging/fsl-mc/
 +F:    Documentation/devicetree/bindings/misc/fsl,qoriq-mc.txt
  
  QT1010 MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
@@@ -10831,14 -10602,6 +10841,14 @@@ T: git git://git.kernel.org/pub/scm/lin
  S:    Supported
  F:    arch/hexagon/
  
 +QUALCOMM VENUS VIDEO ACCELERATOR DRIVER
 +M:    Stanimir Varbanov <stanimir.varbanov@linaro.org>
 +L:    linux-media@vger.kernel.org
 +L:    linux-arm-msm@vger.kernel.org
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    drivers/media/platform/qcom/venus/
 +
  QUALCOMM WCN36XX WIRELESS DRIVER
  M:    Eugene Krasnikov <k.eugene.e@gmail.com>
  L:    wcn36xx@lists.infradead.org
@@@ -10854,14 -10617,6 +10864,14 @@@ L: qemu-devel@nongnu.or
  S:    Maintained
  F:    drivers/firmware/qemu_fw_cfg.c
  
 +QUANTENNA QTNFMAC WIRELESS DRIVER
 +M:   Igor Mitsyanko <imitsyanko@quantenna.com>
 +M:   Avinash Patil <avinashp@quantenna.com>
 +M:   Sergey Matyukevich <smatyukevich@quantenna.com>
 +L:   linux-wireless@vger.kernel.org
 +S:   Maintained
 +F:   drivers/net/wireless/quantenna
 +
  RADOS BLOCK DEVICE (RBD)
  M:    Ilya Dryomov <idryomov@gmail.com>
  M:    Sage Weil <sage@redhat.com>
@@@ -11095,11 -10850,11 +11105,11 @@@ L:        linux-iio@vger.kernel.or
  S:    Supported
  F:    drivers/iio/adc/rcar_gyro_adc.c
  
 -RENESAS USB2 PHY DRIVER
 +RENESAS USB PHY DRIVER
  M:    Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
  L:    linux-renesas-soc@vger.kernel.org
  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 <p.zabel@pengutronix.de>
@@@ -11256,7 -11011,7 +11266,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 <sebott@linux.vnet.ibm.com>
@@@ -11324,7 -11079,7 +11334,7 @@@ S:   Supporte
  F:    drivers/iommu/s390-iommu.c
  
  S390 VFIO-CCW DRIVER
 -M:    Cornelia Huck <cornelia.huck@de.ibm.com>
 +M:    Cornelia Huck <cohuck@redhat.com>
  M:    Dong Jia Shi <bjsdjshi@linux.vnet.ibm.com>
  L:    linux-s390@vger.kernel.org
  L:    kvm@vger.kernel.org
@@@ -11501,12 -11256,12 +11511,12 @@@ L:        linux-kernel@vger.kernel.or
  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 <gregkh@linuxfoundation.org>
@@@ -11590,9 -11345,6 +11600,9 @@@ F:   Documentation/tee.tx
  
  THUNDERBOLT DRIVER
  M:    Andreas Noever <andreas.noever@gmail.com>
 +M:    Michael Jamet <michael.jamet@intel.com>
 +M:    Mika Westerberg <mika.westerberg@linux.intel.com>
 +M:    Yehezkel Bernat <yehezkel.bernat@intel.com>
  S:    Maintained
  F:    drivers/thunderbolt/
  
@@@ -11620,14 -11372,6 +11630,14 @@@ F: kernel/time/alarmtimer.
  F:    kernel/time/ntp.c
  F:    tools/testing/selftests/timers/
  
 +TI TRF7970A NFC DRIVER
 +M:    Mark Greer <mgreer@animalcreek.com>
 +L:    linux-wireless@vger.kernel.org
 +L:    linux-nfc@lists.01.org (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 <zwanem@gmail.com>
  S:    Maintained
@@@ -11768,8 -11512,6 +11778,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
  
@@@ -11828,7 -11570,6 +11838,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 <john.johansen@canonical.com>
@@@ -11837,21 -11578,18 +11847,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 <keescook@chromium.org>
  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 <keescook@chromium.org>
  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 <jirislaby@gmail.com>
@@@ -12069,13 -11807,6 +12079,13 @@@ S: Maintaine
  F:    drivers/media/platform/davinci/
  F:    include/media/davinci/
  
 +TI DAVINCI SERIES GPIO DRIVER
 +M:    Keerthy <j-keerthy@ti.com>
 +L:    linux-gpio@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/gpio/gpio-davinci.txt
 +F:    drivers/gpio/gpio-davinci.c
 +
  TI AM437X VPFE DRIVER
  M:    "Lad, Prabhakar" <prabhakar.csengg@gmail.com>
  L:    linux-media@vger.kernel.org
@@@ -12161,7 -11892,7 +12171,7 @@@ L:   linux-security-module@vger.kernel.or
  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)
@@@ -12251,9 -11982,8 +12261,9 @@@ F:   drivers/leds/leds-net48xx.
  
  SOFTLOGIC 6x10 MPEG CODEC
  M:    Bluecherry Maintainers <maintainers@bluecherrydvr.com>
 +M:    Anton Sviridenko <anton@corp.bluecherry.net>
  M:    Andrey Utkin <andrey.utkin@corp.bluecherry.net>
 -M:    Andrey Utkin <andrey.krieger.utkin@gmail.com>
 +M:    Andrey Utkin <andrey_utkin@fastmail.com>
  M:    Ismael Luceno <ismael@iodev.co.uk>
  L:    linux-media@vger.kernel.org
  S:    Supported
@@@ -12921,10 -12651,6 +12931,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 <hverkuil@xs4all.nl>
@@@ -13174,7 -12900,7 +13184,7 @@@ M:   Wolfram Sang <wsa+renesas@sang-engin
  L:    linux-mmc@vger.kernel.org
  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
@@@ -13203,7 -12929,6 +13213,7 @@@ F:   Documentation/media/v4l-drivers/tm60
  
  TW5864 VIDEO4LINUX DRIVER
  M:    Bluecherry Maintainers <maintainers@bluecherrydvr.com>
 +M:    Anton Sviridenko <anton@corp.bluecherry.net>
  M:    Andrey Utkin <andrey.utkin@corp.bluecherry.net>
  M:    Andrey Utkin <andrey_utkin@fastmail.com>
  L:    linux-media@vger.kernel.org
@@@ -13829,12 -13554,6 +13839,12 @@@ S: Maintaine
  F:    drivers/media/v4l2-core/videobuf2-*
  F:    include/media/videobuf2-*
  
 +VIDEO MULTIPLEXER DRIVER
 +M:    Philipp Zabel <p.zabel@pengutronix.de>
 +L:    linux-media@vger.kernel.org
 +S:    Maintained
 +F:    drivers/media/platform/video-mux.c
 +
  VIRTIO AND VHOST VSOCK DRIVER
  M:    Stefan Hajnoczi <stefanha@redhat.com>
  L:    kvm@vger.kernel.org
@@@ -13880,7 -13599,7 +13890,7 @@@ F:   include/uapi/linux/virtio_*.
  F:    drivers/crypto/virtio/
  
  VIRTIO DRIVERS FOR S390
 -M:    Cornelia Huck <cornelia.huck@de.ibm.com>
 +M:    Cornelia Huck <cohuck@redhat.com>
  M:    Halil Pasic <pasic@linux.vnet.ibm.com>
  L:    linux-s390@vger.kernel.org
  L:    virtualization@lists.linux-foundation.org
@@@ -14079,7 -13798,6 +14089,7 @@@ M:   Evgeniy Polyakov <zbr@ioremap.net
  S:    Maintained
  F:    Documentation/w1/
  F:    drivers/w1/
 +F:    include/linux/w1.h
  
  W83791D HARDWARE MONITORING DRIVER
  M:    Marc Hulsman <m.hulsman@tudelft.nl>
@@@ -14294,8 -14012,6 +14304,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 <sstabellini@kernel.org>
@@@ -14388,14 -14104,6 +14398,14 @@@ L: linux-kernel@vger.kernel.or
  S:    Supported
  F:    drivers/char/xillybus/
  
 +XRA1403 GPIO EXPANDER
 +M:    Nandor Han <nandor.han@ge.com>
 +M:    Semi Malinen <semi.malinen@ge.com>
 +L:    linux-gpio@vger.kernel.org
 +S:    Maintained
 +F:    drivers/gpio/gpio-xra1403.c
 +F:    Documentation/devicetree/bindings/gpio/gpio-xra1403.txt
 +
  XTENSA XTFPGA PLATFORM SUPPORT
  M:    Max Filippov <jcmvbkbc@gmail.com>
  L:    linux-xtensa@linux-xtensa.org