]> Git Repo - linux.git/commitdiff
projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: c693593 764f216 2e365a7 2932c28 b70cd2d c3ccf35 d0716dd)
Merge remote-tracking branches 'spi/fix/lock', 'spi/fix/maintainers', 'spi/fix/put...
authorMark Brown <[email protected]>
Tue, 6 Sep 2016 11:32:09 +0000 (12:32 +0100)
committerMark Brown <[email protected]>
Tue, 6 Sep 2016 11:32:09 +0000 (12:32 +0100)
1  2  3  4  5  6  7 
MAINTAINERS patch | diff1 | diff2 | diff3 | diff4 | diff5 | diff6 | diff7 | blob | history
drivers/spi/spi.c patch | diff1 | diff2 | diff3 | diff4 | diff5 | diff6 | diff7 | blob | history

diff --combined MAINTAINERS
index db814a89599ce8141cc5b92603623946d5bee325,20bb1d00098c70dacad7a9c778087f9319b0c5c6,5051c2f46d47b18dbf445e13b4740741a49f20d9,7aa632f461dcdf38d28631370cd10e8217f66026,20bb1d00098c70dacad7a9c778087f9319b0c5c6,7aa632f461dcdf38d28631370cd10e8217f66026,20bb1d00098c70dacad7a9c778087f9319b0c5c6..1fbd77d2de77510bd28bc1aac744b71f5d327fd8
--- 1/MAINTAINERS
--- 2/MAINTAINERS
--- 3/MAINTAINERS
--- 4/MAINTAINERS
--- 5/MAINTAINERS
--- 6/MAINTAINERS
--- 7/MAINTAINERS
+++ b/MAINTAINERS
@@@@@@@@ -213,7 -213,7 -213,7 -213,7 -213,7 -213,7 -213,7 +213,7 @@@@@@@@ S:    Maintaine
       F:       drivers/media/dvb-frontends/a8293*
       
       AACRAID SCSI RAID DRIVER
   - - M:       Adaptec OEM Raid Solutions <aacraid@adaptec.com>
   + + M:       Adaptec OEM Raid Solutions <aacraid@microsemi.com>
       L:       [email protected]
       W:       http://www.adaptec.com/
       S:       Supported
@@@@@@@@ -288,7 -288,7 -288,7 -288,6 -288,7 -288,6 -288,7 +288,7 @@@@@@@@ F:    include/linux/acpi.
       F:       include/acpi/
       F:       Documentation/acpi/
       F:       Documentation/ABI/testing/sysfs-bus-acpi
   + + F:       Documentation/ABI/testing/configfs-acpi
       F:       drivers/pci/*acpi*
       F:       drivers/pci/*/*acpi*
       F:       drivers/pci/*/*/*acpi*
@@@@@@@@ -612,13 -612,13 -612,13 -611,6 -612,13 -611,6 -612,13 +612,13 @@@@@@@@ L:      [email protected]
       S:       Maintained
       F:       drivers/gpio/gpio-altera.c
       
   + + ALTERA SYSTEM RESOURCE DRIVER FOR ARRIA10 DEVKIT
   + + M:       Thor Thayer <[email protected]>
   + + S:       Maintained
   + + F:       drivers/gpio/gpio-altera-a10sr.c
   + + F:       drivers/mfd/altera-a10sr.c
   + + F:       include/linux/mfd/altera-a10sr.h
   + + 
       ALTERA TRIPLE SPEED ETHERNET DRIVER
       M:       Vince Bridgers <[email protected]>
       L:       [email protected]
@@@@@@@@ -778,11 -778,11 -778,11 -770,6 -778,11 -770,6 -778,11 +778,11 @@@@@@@@ W:      http://ez.analog.com/community/linux
       S:       Supported
       F:       drivers/dma/dma-axi-dmac.c
       
   + + ANDROID CONFIG FRAGMENTS
   + + M:       Rob Herring <[email protected]>
   + + S:       Supported
   + + F:       kernel/configs/android*
   + + 
       ANDROID DRIVERS
       M:       Greg Kroah-Hartman <[email protected]>
       M:       Arve Hjønnevåg <[email protected]>
@@@@@@@@ -798,7 -798,6 -798,6 -785,6 -798,6 -785,6 -798,6 +798,7 @@@@@@@@ M:    Laura Abbott <[email protected]
       M:       Sumit Semwal <[email protected]>
       L:       [email protected]
       S:       Supported
 ++++++F:       Documentation/devicetree/bindings/staging/ion/
       F:       drivers/staging/android/ion
       F:       drivers/staging/android/uapi/ion.h
       F:       drivers/staging/android/uapi/ion_test.h
@@@@@@@@ -853,9 -852,9 -852,9 -839,7 -852,9 -839,7 -852,9 +853,9 @@@@@@@@ M:    Iyappan Subramanian <isubramanian@ap
       M:       Keyur Chudgar <[email protected]>
       S:       Supported
       F:       drivers/net/ethernet/apm/xgene/
   + + F:       drivers/net/phy/mdio-xgene.c
       F:       Documentation/devicetree/bindings/net/apm-xgene-enet.txt
   + + F:       Documentation/devicetree/bindings/net/apm-xgene-mdio.txt
       
       APTINA CAMERA SENSOR PLL
       M:       Laurent Pinchart <[email protected]>
@@@@@@@@ -882,29 -881,20 -881,20 -866,12 -881,20 -866,12 -881,20 +882,29 @@@@@@@@ S:    Supporte
       F:       drivers/gpu/drm/arc/
       F:       Documentation/devicetree/bindings/display/snps,arcpgu.txt
       
 ++++++ARM ARCHITECTED TIMER DRIVER
 ++++++M:       Mark Rutland <[email protected]>
 ++++++M:       Marc Zyngier <[email protected]>
 ++++++L:       [email protected] (moderated for non-subscribers)
 ++++++S:       Maintained
 ++++++F:       arch/arm/include/asm/arch_timer.h
 ++++++F:       arch/arm64/include/asm/arch_timer.h
 ++++++F:       drivers/clocksource/arm_arch_timer.c
 ++++++
       ARM HDLCD DRM DRIVER
       M:       Liviu Dudau <[email protected]>
       S:       Supported
   - - F:       drivers/gpu/drm/arm/
   + + F:       drivers/gpu/drm/arm/hdlcd_*
       F:       Documentation/devicetree/bindings/display/arm,hdlcd.txt
       
   + + ARM MALI-DP DRM DRIVER
   + + M:       Liviu Dudau <[email protected]>
   + + M:       Brian Starkey <[email protected]>
   + + M:       Mali DP Maintainers <[email protected]>
   + + S:       Supported
   + + F:       drivers/gpu/drm/arm/
   + + F:       Documentation/devicetree/bindings/display/arm,malidp.txt
   + + 
       ARM MFM AND FLOPPY DRIVERS
       M:       Ian Molton <[email protected]>
       S:       Maintained
@@@@@@@@ -1014,7 -1004,6 -1004,6 -981,6 -1004,6 -981,6 -1004,6 +1014,7 @@@@@@@@ N:      meso
       ARM/Annapurna Labs ALPINE ARCHITECTURE
       M:       Tsahee Zidenberg <[email protected]>
       M:       Antoine Tenart <[email protected]>
 ++++++L:       [email protected] (moderated for non-subscribers)
       S:       Maintained
       F:       arch/arm/mach-alpine/
       F:       arch/arm/boot/dts/alpine*
@@@@@@@@ -1560,7 -1549,7 -1549,7 -1526,6 -1549,7 -1526,6 -1549,7 +1560,7 @@@@@@@@ M:    David Brown <[email protected]
       L:       [email protected]
       L:       [email protected]
       S:       Maintained
   + + F:       Documentation/devicetree/bindings/soc/qcom/
       F:       arch/arm/boot/dts/qcom-*.dts
       F:       arch/arm/boot/dts/qcom-*.dtsi
       F:       arch/arm/mach-qcom/
@@@@@@@@ -1638,13 -1627,13 -1627,12 -1603,12 -1627,13 -1603,12 -1627,13 +1638,12 @@@@@@@@ F:    arch/arm/mach-s3c24*
       F:       arch/arm/mach-s3c64xx/
       F:       arch/arm/mach-s5p*/
       F:       arch/arm/mach-exynos*/
   - - F:       drivers/*/*s3c2410*
   - - F:       drivers/*/*/*s3c2410*
   + + F:       drivers/*/*s3c24*
   + + F:       drivers/*/*/*s3c24*
   + + F:       drivers/*/*s3c64xx*
   + + F:       drivers/*/*s5pv210*
       F:       drivers/memory/samsung/*
       F:       drivers/soc/samsung/*
-- ----F:       drivers/spi/spi-s3c*
   - - F:       sound/soc/samsung/*
       F:       Documentation/arm/Samsung/
       F:       Documentation/devicetree/bindings/arm/samsung/
       F:       Documentation/devicetree/bindings/sram/samsung-sram.txt
@@@@@@@@ -1659,8 -1648,8 -1647,8 -1623,7 -1648,8 -1623,7 -1648,8 +1658,8 @@@@@@@@ F:    arch/arm/mach-s5pv210
       
       ARM/SAMSUNG S5P SERIES 2D GRAPHICS ACCELERATION (G2D) SUPPORT
       M:       Kyungmin Park <[email protected]>
   - - M:       Kamil Debski <[email protected]>
   + + M:       Kamil Debski <[email protected]>
   + + M:       Andrzej Hajda <[email protected]>
       L:       [email protected]
       L:       [email protected]
       S:       Maintained
@@@@@@@@ -1668,9 -1657,9 -1656,9 -1631,8 -1657,9 -1631,8 -1657,9 +1667,9 @@@@@@@@ F:    drivers/media/platform/s5p-g2d
       
       ARM/SAMSUNG S5P SERIES Multi Format Codec (MFC) SUPPORT
       M:       Kyungmin Park <[email protected]>
   - - M:       Kamil Debski <k[email protected]>
   + + M:       Kamil Debski <k[email protected]>
       M:       Jeongtae Park <[email protected]>
   + + M:       Andrzej Hajda <[email protected]>
       L:       [email protected]
       L:       [email protected]
       S:       Maintained
@@@@@@@@ -1685,13 -1674,13 -1673,13 -1647,6 -1674,13 -1647,6 -1674,13 +1684,13 @@@@@@@@ L:      [email protected]
       S:       Maintained
       F:       drivers/media/platform/s5p-tv/
       
   + + ARM/SAMSUNG S5P SERIES HDMI CEC SUBSYSTEM SUPPORT
   + + M:       Kyungmin Park <[email protected]>
   + + L:       [email protected]
   + + L:       [email protected]
   + + S:       Maintained
   + + F:       drivers/staging/media/platform/s5p-cec/
   + + 
       ARM/SAMSUNG S5P SERIES JPEG CODEC SUPPORT
       M:       Andrzej Pietrasiewicz <[email protected]>
       M:       Jacek Anaszewski <[email protected]>
@@@@@@@@ -1714,6 -1703,6 -1702,6 -1669,7 -1703,6 -1669,7 -1703,6 +1713,6 @@@@@@@@ F:    arch/arm/boot/dts/sh
       F:       arch/arm/configs/shmobile_defconfig
       F:       arch/arm/include/debug/renesas-scif.S
       F:       arch/arm/mach-shmobile/
   - - F:       drivers/sh/
       F:       drivers/soc/renesas/
       F:       include/linux/soc/renesas/
       
@@@@@@@@ -1781,7 -1770,7 -1769,7 -1737,8 -1770,7 -1737,8 -1770,7 +1780,7 @@@@@@@@ ARM/TANGO ARCHITECTUR
       M:       Marc Gonzalez <[email protected]>
       L:       [email protected]
       S:       Maintained
   - - F:       arch/arm/mach-tango/
   - - F:       arch/arm/boot/dts/tango*
   + + N:       tango
       
       ARM/TECHNOLOGIC SYSTEMS TS7250 MACHINE SUPPORT
       M:       Lennert Buytenhek <[email protected]>
@@@@@@@@ -1868,6 -1857,6 -1856,6 -1825,7 -1857,6 -1825,7 -1857,6 +1867,6 @@@@@@@@ L:    [email protected]
       T:       git git://git.linaro.org/people/ulfh/clk.git
       S:       Maintained
       F:       drivers/clk/ux500/
   - - F:       include/linux/platform_data/clk-ux500.h
       
       ARM/VERSATILE EXPRESS PLATFORM
       M:       Liviu Dudau <[email protected]>
@@@@@@@@ -2338,7 -2327,7 -2326,7 -2296,6 -2327,7 -2296,6 -2327,7 +2337,7 @@@@@@@@ S:    Maintaine
       F:       Documentation/ABI/testing/sysfs-class-net-batman-adv
       F:       Documentation/ABI/testing/sysfs-class-net-mesh
       F:       Documentation/networking/batman-adv.txt
   + + F:       include/uapi/linux/batman_adv.h
       F:       net/batman-adv/
       
       BAYCOM/HDLCDRV DRIVERS FOR AX.25
@@@@@@@@ -2364,10 -2353,10 -2352,10 -2321,7 -2353,10 -2321,7 -2353,10 +2363,10 @@@@@@@@ S:      Supporte
       F:       drivers/media/platform/sti/bdisp
       
       BEFS FILE SYSTEM
   - - S:       Orphan
   + + M:       Luis de Bethencourt <[email protected]>
   + + M:       Salah Triki <[email protected]>
   + + S:       Maintained
   + + T:       git git://github.com/luisbg/linux-befs.git
       F:       Documentation/filesystems/befs.txt
       F:       fs/befs/
       
@@@@@@@@ -2505,14 -2494,14 -2493,14 -2459,6 -2494,14 -2459,6 -2494,14 +2504,14 @@@@@@@@ L:      [email protected]
       S:       Supported
       F:       drivers/net/ethernet/broadcom/b44.*
       
   + + BROADCOM B53 ETHERNET SWITCH DRIVER
   + + M:       Florian Fainelli <[email protected]>
   + + L:       [email protected]
   + + L:       [email protected] (subscribers-only)
   + + S:       Supported
   + + F:       drivers/net/dsa/b53/*
   + + F:       include/linux/platform_data/b53.h
   + + 
       BROADCOM GENET ETHERNET DRIVER
       M:       Florian Fainelli <[email protected]>
       L:       [email protected]
@@@@@@@@ -2537,14 -2526,14 -2525,14 -2483,17 -2526,14 -2483,17 -2526,14 +2536,14 @@@@@@@@ BROADCOM BCM281XX/BCM11XXX/BCM216XX AR
       M:       Florian Fainelli <[email protected]>
       M:       Ray Jui <[email protected]>
       M:       Scott Branden <[email protected]>
   - - L:       [email protected]
   + + M:       [email protected]
       T:       git git://github.com/broadcom/mach-bcm
       S:       Maintained
   + + N:       bcm281*
   + + N:       bcm113*
   + + N:       bcm216*
   + + N:       kona
       F:       arch/arm/mach-bcm/
   - - F:       arch/arm/boot/dts/bcm113*
   - - F:       arch/arm/boot/dts/bcm216*
   - - F:       arch/arm/boot/dts/bcm281*
   - - F:       arch/arm64/boot/dts/broadcom/
   - - F:       arch/arm/configs/bcm_defconfig
   - - F:       drivers/mmc/host/sdhci-bcm-kona.c
   - - F:       drivers/clocksource/bcm_kona_timer.c
       
       BROADCOM BCM2835 ARM ARCHITECTURE
       M:       Stephen Warren <[email protected]>
@@@@@@@@ -2567,21 -2556,21 -2555,21 -2516,20 -2556,21 -2516,20 -2556,21 +2566,21 @@@@@@@@ F:    arch/mips/include/asm/mach-bcm47xx/
       
       BROADCOM BCM5301X ARM ARCHITECTURE
       M:       Hauke Mehrtens <[email protected]>
   + + M:       Rafał Miłecki <[email protected]>
   + + M:       [email protected]
       L:       [email protected]
       S:       Maintained
       F:       arch/arm/mach-bcm/bcm_5301x.c
   - - F:       arch/arm/boot/dts/bcm5301x.dtsi
   + + F:       arch/arm/boot/dts/bcm5301x*.dtsi
       F:       arch/arm/boot/dts/bcm470*
       
       BROADCOM BCM63XX ARM ARCHITECTURE
       M:       Florian Fainelli <[email protected]>
   + + M:       [email protected]
       L:       [email protected] (moderated for non-subscribers)
   - - L:       [email protected]
       T:       git git://github.com/broadcom/stblinux.git
       S:       Maintained
   - - F:       arch/arm/mach-bcm/bcm63xx.c
   - - F:       arch/arm/include/debug/bcm63xx.S
   + + N:       bcm63xx
       
       BROADCOM BCM63XX/BCM33XX UDC DRIVER
       M:       Kevin Cernekee <[email protected]>
@@@@@@@@ -2593,8 -2582,8 -2581,8 -2541,8 -2582,8 -2541,8 -2582,8 +2592,8 @@@@@@@@ BROADCOM BCM7XXX ARM ARCHITECTUR
       M:       Brian Norris <[email protected]>
       M:       Gregory Fong <[email protected]>
       M:       Florian Fainelli <[email protected]>
   + + M:       [email protected]
       L:       [email protected] (moderated for non-subscribers)
   - - L:       [email protected]
       T:       git git://github.com/broadcom/stblinux.git
       S:       Maintained
       F:       arch/arm/mach-bcm/*brcmstb*
@@@@@@@@ -2627,11 -2616,11 -2615,11 -2575,12 -2616,11 -2575,12 -2616,11 +2626,11 @@@@@@@@ S:    Supporte
       F:       drivers/net/ethernet/broadcom/tg3.*
       
       BROADCOM BRCM80211 IEEE802.11n WIRELESS DRIVER
   - - M:       Brett Rudley <[email protected]>
   - - M:       Arend van Spriel <[email protected]>
   - - M:       Franky (Zhenhui) Lin <[email protected]>
   - - M:       Hante Meuleman <[email protected]>
   + + M:       Arend van Spriel <[email protected]>
   + + M:       Franky Lin <[email protected]>
   + + M:       Hante Meuleman <[email protected]>
       L:       [email protected]
   - - L:       [email protected]
   + + L:       brcm80211-dev-list.pdl@broadcom.com
       S:       Supported
       F:       drivers/net/wireless/broadcom/brcm80211/
       
@@@@@@@@ -2651,13 -2640,13 -2639,13 -2600,13 -2640,13 -2600,13 -2640,13 +2650,13 @@@@@@@@ BROADCOM IPROC ARM ARCHITECTUR
       M:       Ray Jui <[email protected]>
       M:       Scott Branden <[email protected]>
       M:       Jon Mason <[email protected]>
   + + M:       [email protected]
       L:       [email protected] (moderated for non-subscribers)
   - - L:       [email protected]
       T:       git git://github.com/broadcom/cygnus-linux.git
       S:       Maintained
       N:       iproc
       N:       cygnus
   - - N:       nsp
   + + N:       bcm[-_]nsp
       N:       bcm9113*
       N:       bcm9583*
       N:       bcm9585*
@@@@@@@@ -2668,9 -2657,9 -2656,9 -2617,6 -2657,9 -2617,6 -2657,9 +2667,9 @@@@@@@@ N:    bcm583
       N:       bcm585*
       N:       bcm586*
       N:       bcm88312
   + + F:       arch/arm64/boot/dts/broadcom/ns2*
   + + F:       drivers/clk/bcm/clk-ns*
   + + F:       drivers/pinctrl/bcm/pinctrl-ns*
       
       BROADCOM BRCMSTB GPIO DRIVER
       M:       Gregory Fong <[email protected]>
@@@@@@@@ -2715,8 -2704,8 -2703,8 -2661,8 -2704,8 -2661,8 -2704,8 +2714,8 @@@@@@@@ F:    drivers/net/ethernet/broadcom/bcmsys
       
       BROADCOM VULCAN ARM64 SOC
       M:       Jayachandran C. <[email protected]>
   + + M:       [email protected]
       L:       [email protected] (moderated for non-subscribers)
   - - L:       [email protected]
       S:       Maintained
       F:       arch/arm64/boot/dts/broadcom/vulcan*
       
@@@@@@@@ -2866,7 -2855,7 -2854,7 -2812,6 -2855,7 -2812,6 -2855,7 +2865,7 @@@@@@@@ W:    https://github.com/linux-ca
       T:       git git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can.git
       T:       git git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next.git
       S:       Maintained
   + + F:       Documentation/devicetree/bindings/net/can/
       F:       drivers/net/can/
       F:       include/linux/can/dev.h
       F:       include/linux/can/platform/
@@@@@@@@ -2874,7 -2863,7 -2862,7 -2819,7 -2863,7 -2819,7 -2863,7 +2873,7 @@@@@@@@ F:    include/uapi/linux/can/error.
       F:       include/uapi/linux/can/netlink.h
       
       CAPABILITIES
   - - M:       Serge Hallyn <serge.hallyn@canonical.com>
   + + M:       Serge Hallyn <serge@hallyn.com>
       L:       [email protected]
       S:       Supported
       F:       include/linux/capability.h
@@@@@@@@ -2906,22 -2895,22 -2894,22 -2851,6 -2895,22 -2851,6 -2895,22 +2905,22 @@@@@@@@ F:      drivers/net/ieee802154/cc2520.
       F:       include/linux/spi/cc2520.h
       F:       Documentation/devicetree/bindings/net/ieee802154/cc2520.txt
       
   + + CEC DRIVER
   + + M:       Hans Verkuil <[email protected]>
   + + L:       [email protected]
   + + T:       git git://linuxtv.org/media_tree.git
   + + W:       http://linuxtv.org
   + + S:       Supported
   + + F:       Documentation/cec.txt
   + + F:       Documentation/DocBook/media/v4l/cec*
   + + F:       drivers/staging/media/cec/
   + + F:       drivers/media/cec-edid.c
   + + F:       drivers/media/rc/keymaps/rc-cec.c
   + + F:       include/media/cec.h
   + + F:       include/media/cec-edid.h
   + + F:       include/linux/cec.h
   + + F:       include/linux/cec-funcs.h
   + + 
       CELL BROADBAND ENGINE ARCHITECTURE
       M:       Arnd Bergmann <[email protected]>
       L:       [email protected]
@@@@@@@@ -3230,7 -3219,7 -3218,7 -3159,7 -3219,7 -3159,7 -3219,7 +3229,7 @@@@@@@@ M:    Johannes Weiner <[email protected]
       L:       [email protected]
       T:       git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git
       S:       Maintained
   - - F:       Documentation/cgroups/
   + + F:       Documentation/cgroup*
       F:       include/linux/cgroup*
       F:       kernel/cgroup*
       
@@@@@@@@ -3241,14 -3230,14 -3229,14 -3170,14 -3230,14 -3170,14 -3230,14 +3240,14 @@@@@@@@ W:    http://www.bullopensource.org/cpuset
       W:       http://oss.sgi.com/projects/cpusets/
       T:       git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git
       S:       Maintained
   - - F:       Documentation/cgroups/cpusets.txt
   + + F:       Documentation/cgroup-v1/cpusets.txt
       F:       include/linux/cpuset.h
       F:       kernel/cpuset.c
       
       CONTROL GROUP - MEMORY RESOURCE CONTROLLER (MEMCG)
       M:       Johannes Weiner <[email protected]>
       M:       Michal Hocko <[email protected]>
 ------M:       Vladimir Davydov <vdavydov@virtuozzo.com>
 ++++++M:       Vladimir Davydov <vdavydov.dev@gmail.com>
       L:       [email protected]
       L:       [email protected]
       S:       Maintained
@@@@@@@@ -3358,7 -3347,7 -3346,7 -3287,6 -3347,7 -3287,6 -3347,7 +3357,7 @@@@@@@@ T:    git git://git.kernel.org/pub/scm/lin
       T:       git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
       S:       Maintained
       F:       Documentation/crypto/
   + + F:       Documentation/devicetree/bindings/crypto/
       F:       Documentation/DocBook/crypto-API.tmpl
       F:       arch/*/crypto/
       F:       crypto/
@@@@@@@@ -3505,7 -3494,7 -3493,7 -3433,6 -3494,7 -3433,6 -3494,7 +3504,7 @@@@@@@@ F:    Documentation/ABI/testing/sysfs-clas
       CXLFLASH (IBM Coherent Accelerator Processor Interface CAPI Flash) SCSI DRIVER
       M:       Manoj N. Kumar <[email protected]>
       M:       Matthew R. Ochs <[email protected]>
   + + M:       Uma Krishnan <[email protected]>
       L:       [email protected]
       S:       Supported
       F:       drivers/scsi/cxlflash/
@@@@@@@@ -3750,8 -3739,8 -3738,8 -3677,6 -3739,8 -3677,6 -3739,8 +3749,8 @@@@@@@@ M:    Support Opensource <support.opensour
       W:       http://www.dialog-semiconductor.com/products
       S:       Supported
       F:       Documentation/hwmon/da90??
   + + F:       Documentation/devicetree/bindings/mfd/da90*.txt
   + + F:       Documentation/devicetree/bindings/regulator/da92*.txt
       F:       Documentation/devicetree/bindings/sound/da[79]*.txt
       F:       drivers/gpio/gpio-da90??.c
       F:       drivers/hwmon/da90??-hwmon.c
@@@@@@@@ -3772,10 -3761,10 -3760,10 -3697,8 -3761,10 -3697,8 -3761,10 +3771,10 @@@@@@@@ F:      drivers/watchdog/da90??_wdt.
       F:       include/linux/mfd/da903x.h
       F:       include/linux/mfd/da9052/
       F:       include/linux/mfd/da9055/
   + + F:       include/linux/mfd/da9062/
       F:       include/linux/mfd/da9063/
       F:       include/linux/mfd/da9150/
   + + F:       include/linux/regulator/da9211.h
       F:       include/sound/da[79]*.h
       F:       sound/soc/codecs/da[79]*.[ch]
       
@@@@@@@@ -3851,17 -3840,17 -3839,17 -3774,6 -3840,17 -3774,6 -3840,17 +3850,17 @@@@@@@@ F:      include/linux/*fence.
       F:       Documentation/dma-buf-sharing.txt
       T:       git git://git.linaro.org/people/sumitsemwal/linux-dma-buf.git
       
   + + SYNC FILE FRAMEWORK
   + + M:       Sumit Semwal <[email protected]>
   + + R:       Gustavo Padovan <[email protected]>
   + + S:       Maintained
   + + L:       [email protected]
   + + L:       [email protected]
   + + F:       drivers/dma-buf/sync_file.c
   + + F:       include/linux/sync_file.h
   + + F:       Documentation/sync_file.txt
   + + T:       git git://git.linaro.org/people/sumitsemwal/linux-dma-buf.git
   + + 
       DMA GENERIC OFFLOAD ENGINE SUBSYSTEM
       M:       Vinod Koul <[email protected]>
       L:       [email protected]
@@@@@@@@ -3951,10 -3940,10 -3939,10 -3863,7 -3940,10 -3863,7 -3940,10 +3950,10 @@@@@@@@ T:      git git://people.freedesktop.org/~ai
       S:       Maintained
       F:       drivers/gpu/drm/
       F:       drivers/gpu/vga/
   - - F:       Documentation/DocBook/gpu.*
   + + F:       Documentation/devicetree/bindings/display/
   + + F:       Documentation/devicetree/bindings/gpu/
   + + F:       Documentation/devicetree/bindings/video/
   + + F:       Documentation/gpu/
       F:       include/drm/
       F:       include/uapi/drm/
       
@@@@@@@@ -4006,7 -3995,7 -3994,7 -3915,6 -3995,7 -3915,6 -3995,7 +4005,7 @@@@@@@@ S:    Supporte
       F:       drivers/gpu/drm/i915/
       F:       include/drm/i915*
       F:       include/uapi/drm/i915_drm.h
   + + F:       Documentation/gpu/i915.rst
       
       DRM DRIVERS FOR ATMEL HLCDC
       M:       Boris Brezillon <[email protected]>
@@@@@@@@ -4202,21 -4191,21 -4190,21 -4110,6 -4191,21 -4110,6 -4191,21 +4201,21 @@@@@@@@ F:      drivers/gpu/drm/vc4
       F:       include/uapi/drm/vc4_drm.h
       F:       Documentation/devicetree/bindings/display/brcm,bcm-vc4.txt
       
   + + DRM DRIVERS FOR TI OMAP
   + + M:       Tomi Valkeinen <[email protected]>
   + + L:       [email protected]
   + + S:       Maintained
   + + F:       drivers/gpu/drm/omapdrm/
   + + F:       Documentation/devicetree/bindings/display/ti/
   + + 
   + + DRM DRIVERS FOR TI LCDC
   + + M:       Jyri Sarha <[email protected]>
   + + R:       Tomi Valkeinen <[email protected]>
   + + L:       [email protected]
   + + S:       Maintained
   + + F:       drivers/gpu/drm/tilcdc/
   + + F:       Documentation/devicetree/bindings/display/tilcdc/
   + + 
       DSBR100 USB FM RADIO DRIVER
       M:       Alexey Klimov <[email protected]>
       L:       [email protected]
@@@@@@@@ -4535,12 -4524,6 -4523,6 -4428,6 -4524,6 -4428,6 -4524,6 +4534,12 @@@@@@@@ L:  [email protected]
       S:       Maintained
       F:       drivers/edac/sb_edac.c
       
 ++++++EDAC-SKYLAKE
 ++++++M:       Tony Luck <[email protected]>
 ++++++L:       [email protected]
 ++++++S:       Maintained
 ++++++F:       drivers/edac/skx_edac.c
 ++++++
       EDAC-XGENE
       APPLIED MICRO (APM) X-GENE SOC EDAC
       M:     Loc Ho <[email protected]>
@@@@@@@@ -4777,7 -4760,7 -4759,7 -4664,7 -4760,7 -4664,7 -4760,7 +4776,7 @@@@@@@@ S:    Maintaine
       F:       drivers/staging/fbtft/
       
       FCOE SUBSYSTEM (libfc, libfcoe, fcoe)
   - - M:       Vasu Dev <[email protected]>
   + + M:       Johannes Thumshirn <[email protected]>
       L:       [email protected]
       W:       www.Open-FCoE.org
       S:       Supported
@@@@@@@@ -4999,13 -4982,13 -4981,13 -4886,6 -4982,13 -4886,6 -4982,13 +4998,13 @@@@@@@@ F:      drivers/net/ethernet/freescale/gianf
       X:       drivers/net/ethernet/freescale/gianfar_ptp.c
       F:       Documentation/devicetree/bindings/net/fsl-tsec-phy.txt
       
   + + FREESCALE QUICC ENGINE UCC HDLC DRIVER
   + + M:       Zhao Qiang <[email protected]>
   + + L:       [email protected]
   + + L:       [email protected]
   + + S:       Maintained
   + + F:       drivers/net/wan/fsl_ucc_hdlc*
   + + 
       FREESCALE QUICC ENGINE UCC UART DRIVER
       M:       Timur Tabi <[email protected]>
       L:       [email protected]
@@@@@@@@ -5061,13 -5044,13 -5043,13 -4941,6 -5044,13 -4941,6 -5044,13 +5060,13 @@@@@@@@ F:      Documentation/filesystems/caching
       F:       fs/fscache/
       F:       include/linux/fscache*.h
       
   + + FS-CRYPTO: FILE SYSTEM LEVEL ENCRYPTION SUPPORT
   + + M:       Theodore Y. Ts'o <[email protected]>
   + + M:       Jaegeuk Kim <[email protected]>
   + + S:       Supported
   + + F:       fs/crypto/
   + + F:       include/linux/fscrypto.h
   + + 
       F2FS FILE SYSTEM
       M:       Jaegeuk Kim <[email protected]>
       M:       Changman Lee <[email protected]>
@@@@@@@@ -5122,15 -5105,15 -5104,15 -4995,6 -5105,15 -4995,6 -5105,15 +5121,15 @@@@@@@@ L:      [email protected]
       S:       Odd Fixes (e.g., new signatures)
       F:       drivers/scsi/fdomain.*
       
   + + GCC PLUGINS
   + + M:       Kees Cook <[email protected]>
   + + R:       Emese Revfy <[email protected]>
   + + L:       [email protected]
   + + S:       Maintained
   + + F:       scripts/gcc-plugins/
   + + F:       scripts/gcc-plugin.sh
   + + F:       Documentation/gcc-plugins.txt
   + + 
       GCOV BASED KERNEL PROFILING
       M:       Peter Oberparleiter <[email protected]>
       S:       Maintained
@@@@@@@@ -5305,10 -5288,10 -5287,10 -5169,10 -5288,10 -5169,10 -5288,10 +5304,10 @@@@@@@@ S:    Maintaine
       F:       drivers/media/usb/gspca/m5602/
       
       GSPCA PAC207 SONIXB SUBDRIVER
   - - M:       Hans de Goede <[email protected]>
   + + M:       Hans Verkuil <[email protected]>
       L:       [email protected]
       T:       git git://linuxtv.org/media_tree.git
   - - S:       Maintained
   + + S:       Odd Fixes
       F:       drivers/media/usb/gspca/pac207.c
       
       GSPCA SN9C20X SUBDRIVER
@@@@@@@@ -5326,10 -5309,10 -5308,10 -5190,10 -5309,10 -5190,10 -5309,10 +5325,10 @@@@@@@@ S:    Maintaine
       F:       drivers/media/usb/gspca/t613.c
       
       GSPCA USB WEBCAM DRIVER
   - - M:       Hans de Goede <[email protected]>
   + + M:       Hans Verkuil <[email protected]>
       L:       [email protected]
       T:       git git://linuxtv.org/media_tree.git
   - - S:       Maintained
   + + S:       Odd Fixes
       F:       drivers/media/usb/gspca/
       
       GUID PARTITION TABLE (GPT)
@@@@@@@@ -5410,7 -5393,7 -5392,7 -5274,6 -5393,7 -5274,6 -5393,7 +5409,7 @@@@@@@@ M:    Matt Mackall <[email protected]
       M:       Herbert Xu <[email protected]>
       L:       [email protected]
       S:       Odd fixes
   + + F:       Documentation/devicetree/bindings/rng/
       F:       Documentation/hw_random.txt
       F:       drivers/char/hw_random/
       F:       include/linux/hw_random.h
@@@@@@@@ -5421,9 -5404,9 -5403,9 -5284,8 -5404,9 -5284,8 -5404,9 +5420,9 @@@@@@@@ M:    Bjorn Andersson <bjorn.andersson@lin
       L:       [email protected]
       S:       Maintained
       T:       git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock.git
   + + F:       Documentation/devicetree/bindings/hwlock/
       F:       Documentation/hwspinlock.txt
   - - F:       drivers/hwspinlock/hwspinlock_*
   + + F:       drivers/hwspinlock/
       F:       include/linux/hwspinlock.h
       
       HARMONY SOUND DRIVER
@@@@@@@@ -5441,12 -5424,12 -5423,12 -5303,6 -5424,12 -5303,6 -5424,12 +5440,12 @@@@@@@@ T:      git git://linuxtv.org/anttip/media_t
       S:       Maintained
       F:       drivers/media/dvb-frontends/hd29l2*
       
   + + HEWLETT PACKARD ENTERPRISE ILO NMI WATCHDOG DRIVER
   + + M:       Brian Boylston <[email protected]>
   + + S:       Supported
   + + F:       Documentation/watchdog/hpwdt.txt
   + + F:       drivers/watchdog/hpwdt.c
   + + 
       HEWLETT-PACKARD SMART ARRAY RAID DRIVER (hpsa)
       M:       Don Brace <[email protected]>
       L:       [email protected]
@@@@@@@@ -5565,15 -5548,15 -5547,15 -5421,6 -5548,15 -5421,6 -5548,15 +5564,15 @@@@@@@@ F:      include/uapi/linux/if_hippi.
       F:       net/802/hippi.c
       F:       drivers/net/hippi/
       
   + + HISILICON NETWORK SUBSYSTEM DRIVER
   + + M:       Yisen Zhuang <[email protected]>
   + + M:       Salil Mehta <[email protected]>
   + + L:       [email protected]
   + + W:       http://www.hisilicon.com
   + + S:       Maintained
   + + F:       drivers/net/ethernet/hisilicon/
   + + F:       Documentation/devicetree/bindings/net/hisilicon*.txt
   + + 
       HISILICON SAS Controller
       M:       John Garry <[email protected]>
       W:       http://www.hisilicon.com
@@@@@@@@ -5849,15 -5832,15 -5831,15 -5696,7 -5832,15 -5696,7 -5832,15 +5848,15 @@@@@@@@ M:      Tyrel Datwyler <[email protected]
       L:       [email protected]
       S:       Supported
       F:       drivers/scsi/ibmvscsi/ibmvscsi*
   - - F:       drivers/scsi/ibmvscsi/viosrp.h
   + + F:       include/scsi/viosrp.h
   + + 
   + + IBM Power Virtual SCSI Device Target Driver
   + + M:       Bryant G. Ly <[email protected]>
   + + M:       Michael Cyr <[email protected]>
   + + L:       [email protected]
   + + L:       [email protected]
   + + S:       Supported
   + + F:       drivers/scsi/ibmvscsi_tgt/
       
       IBM Power Virtual FC Device Drivers
       M:       Tyrel Datwyler <[email protected]>
@@@@@@@@ -5949,9 -5932,9 -5931,9 -5788,7 -5932,9 -5788,7 -5932,9 +5948,9 @@@@@@@@ R:    Hartmut Knaack <[email protected]
       R:       Lars-Peter Clausen <[email protected]>
       R:       Peter Meerwald-Stadler <[email protected]>
       L:       [email protected]
   + + T:       git git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git
       S:       Maintained
   + + F:       Documentation/devicetree/bindings/iio/
       F:       drivers/iio/
       F:       drivers/staging/iio/
       F:       include/linux/iio/
@@@@@@@@ -6081,12 -6064,12 -6063,12 -5918,6 -6064,12 -5918,6 -6064,12 +6080,12 @@@@@@@@ L:      [email protected]
       S:       Maintained
       F:       drivers/platform/x86/intel-hid.c
       
   + + INTEL VIRTUAL BUTTON DRIVER
   + + M:       AceLan Kao <[email protected]>
   + + L:       [email protected]
   + + S:       Maintained
   + + F:       drivers/platform/x86/intel-vbtn.c
   + + 
       INTEL IDLE DRIVER
       M:       Len Brown <[email protected]>
       L:       [email protected]
@@@@@@@@ -6189,12 -6172,12 -6171,12 -6020,6 -6172,12 -6020,6 -6172,12 +6188,12 @@@@@@@@ L:     [email protected]
       S:     Supported
       F:     drivers/infiniband/hw/i40iw/
       
   + + INTEL MERRIFIELD GPIO DRIVER
   + + M:       Andy Shevchenko <[email protected]>
   + + L:       [email protected]
   + + S:       Maintained
   + + F:       drivers/gpio/gpio-merrifield.c
   + + 
       INTEL-MID GPIO DRIVER
       M:       David Cohen <[email protected]>
       L:       [email protected]
@@@@@@@@ -6319,7 -6302,7 -6301,7 -6144,6 -6302,7 -6144,6 -6302,7 +6318,7 @@@@@@@@ M:    Joerg Roedel <[email protected]
       L:       [email protected]
       T:       git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git
       S:       Maintained
   + + F:       Documentation/devicetree/bindings/iommu/
       F:       drivers/iommu/
       
       IP MASQUERADING
@@@@@@@@ -6410,6 -6393,6 -6392,6 -6234,7 -6393,6 -6234,7 -6393,6 +6409,6 @@@@@@@@ F:    Documentation/devicetree/bindings/in
       F:       drivers/irqchip/
       
       IRQ DOMAINS (IRQ NUMBER MAPPING LIBRARY)
   - - M:       Jiang Liu <[email protected]>
       M:       Marc Zyngier <[email protected]>
       S:       Maintained
       T:       git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core
@@@@@@@@ -6886,7 -6869,7 -6868,7 -6711,6 -6869,7 -6711,6 -6869,7 +6885,7 @@@@@@@@ M:    Jacek Anaszewski <j.anaszewski@samsu
       L:       [email protected]
       T:       git git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds.git
       S:       Maintained
   + + F:       Documentation/devicetree/bindings/leds/
       F:       drivers/leds/
       F:       include/linux/leds.h
       
@@@@@@@@ -6942,7 -6925,7 -6924,7 -6766,6 -6925,7 -6766,6 -6925,7 +6941,7 @@@@@@@@ S:    Maintaine
       F:       drivers/ata/
       F:       include/linux/ata.h
       F:       include/linux/libata.h
   + + F:       Documentation/devicetree/bindings/ata/
       
       LIBATA PATA ARASAN COMPACT FLASH CONTROLLER
       M:       Viresh Kumar <[email protected]>
@@@@@@@@ -7050,7 -7033,7 -7032,7 -6873,6 -7033,7 -6873,6 -7033,7 +7049,7 @@@@@@@@ F:    drivers/crypto/nx
       F:       drivers/crypto/vmx/
       F:       drivers/net/ethernet/ibm/ibmveth.*
       F:       drivers/net/ethernet/ibm/ibmvnic.*
   + + F:       drivers/pci/hotplug/pnv_php.c
       F:       drivers/pci/hotplug/rpa*
       F:       drivers/scsi/ibmvscsi/
       N:       opal
@@@@@@@@ -7148,7 -7131,7 -7130,7 -6970,7 -7131,7 -6970,7 -7131,7 +7147,7 @@@@@@@@ T:    git git://git.kernel.org/pub/scm/lin
       LINUX KERNEL DUMP TEST MODULE (LKDTM)
       M:       Kees Cook <[email protected]>
       S:       Maintained
   - - F:       drivers/misc/lkdtm.c
   + + F:       drivers/misc/lkdtm*
       
       LLC (802.2)
       M:       Arnaldo Carvalho de Melo <[email protected]>
@@@@@@@@ -7201,23 -7184,23 -7183,23 -7023,15 -7184,23 -7023,15 -7184,23 +7200,23 @@@@@@@@ Q:    http://patchwork.linuxtv.org/project
       S:       Maintained
       F:       drivers/media/usb/dvb-usb-v2/lmedm04*
       
   - - LOCKDEP AND LOCKSTAT
   + + LOCKING PRIMITIVES
       M:       Peter Zijlstra <[email protected]>
       M:       Ingo Molnar <[email protected]>
       L:       [email protected]
   - - T:       git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git core/locking
   + + T:       git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git locking/core
       S:       Maintained
   - - F:       Documentation/locking/lockdep*.txt
   - - F:       Documentation/locking/lockstat.txt
   + + F:       Documentation/locking/
       F:       include/linux/lockdep.h
   + + F:       include/linux/spinlock*.h
   + + F:       arch/*/include/asm/spinlock*.h
   + + F:       include/linux/rwlock*.h
   + + F:       include/linux/mutex*.h
   + + F:       arch/*/include/asm/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/
       
       LOGICAL DISK MANAGER SUPPORT (LDM, Windows 2000/XP/Vista Dynamic Disks)
@@@@@@@@ -7358,12 -7341,12 -7340,12 -7172,6 -7341,12 -7172,6 -7341,12 +7357,12 @@@@@@@@ W:      http://www.kernel.org/doc/man-page
       L:       [email protected]
       S:       Maintained
       
   + + MARVELL 88E6XXX ETHERNET SWITCH FABRIC DRIVER
   + + M:       Andrew Lunn <[email protected]>
   + + M:       Vivien Didelot <[email protected]>
   + + S:       Maintained
   + + F:       drivers/net/dsa/mv88e6xxx/
   + + 
       MARVELL ARMADA DRM SUPPORT
       M:       Russell King <[email protected]>
       S:       Maintained
@@@@@@@@ -7371,6 -7354,6 -7353,6 -7179,11 -7354,6 -7179,11 -7354,6 +7370,6 @@@@@@@@ F:  drivers/gpu/drm/armada
       F:       include/uapi/drm/armada_drm.h
       F:       Documentation/devicetree/bindings/display/armada/
       
   - - MARVELL 88E6352 DSA support
   - - M:       Guenter Roeck <[email protected]>
   - - S:       Maintained
   - - F:       drivers/net/dsa/mv88e6352.c
   - - 
       MARVELL CRYPTO DRIVER
       M:       Boris Brezillon <[email protected]>
       M:       Arnaud Ebalard <[email protected]>
@@@@@@@@ -7457,13 -7440,13 -7439,13 -7270,6 -7440,13 -7270,6 -7440,13 +7456,13 @@@@@@@@ F:      Documentation/devicetree/bindings/i2
       F:       drivers/hwmon/max6697.c
       F:       include/linux/platform_data/max6697.h
       
   + + MAX9860 MONO AUDIO VOICE CODEC DRIVER
   + + M:       Peter Rosin <[email protected]>
   + + L:       [email protected] (moderated for non-subscribers)
   + + S:       Maintained
   + + F:       Documentation/devicetree/bindings/sound/max9860.txt
   + + F:       sound/soc/codecs/max9860.*
   + + 
       MAXIM MUIC CHARGER DRIVERS FOR EXYNOS BASED BOARDS
       M:       Krzysztof Kozlowski <[email protected]>
       L:       [email protected]
@@@@@@@@ -7513,16 -7496,16 -7495,16 -7319,6 -7496,16 -7319,6 -7496,16 +7512,16 @@@@@@@@ L:      [email protected]
       S:       Maintained
       F:       drivers/iio/potentiometer/mcp4531.c
       
   + + MEDIA DRIVERS FOR RENESAS - FCP
   + + M:       Laurent Pinchart <[email protected]>
   + + L:       [email protected]
   + + L:       [email protected]
   + + T:       git git://linuxtv.org/media_tree.git
   + + S:       Supported
   + + F:       Documentation/devicetree/bindings/media/renesas,fcp.txt
   + + F:       drivers/media/platform/rcar-fcp.c
   + + F:       include/media/rcar-fcp.h
   + + 
       MEDIA DRIVERS FOR RENESAS - VSP1
       M:       Laurent Pinchart <[email protected]>
       L:       [email protected]
@@@@@@@@ -7532,18 -7515,18 -7514,18 -7328,8 -7515,18 -7328,8 -7515,18 +7531,18 @@@@@@@@ S:      Supporte
       F:       Documentation/devicetree/bindings/media/renesas,vsp1.txt
       F:       drivers/media/platform/vsp1/
       
   + + MEDIA DRIVERS FOR HELENE
   + + M:       Abylay Ospan <[email protected]>
   + + L:       [email protected]
   + + W:       https://linuxtv.org
   + + W:       http://netup.tv/
   + + T:       git git://linuxtv.org/media_tree.git
   + + S:       Supported
   + + F:       drivers/media/dvb-frontends/helene*
   + + 
       MEDIA DRIVERS FOR ASCOT2E
       M:       Sergey Kozlov <[email protected]>
   + + M:       Abylay Ospan <[email protected]>
       L:       [email protected]
       W:       https://linuxtv.org
       W:       http://netup.tv/
@@@@@@@@ -7553,7 -7536,7 -7535,7 -7339,6 -7536,7 -7339,6 -7536,7 +7552,7 @@@@@@@@ F:    drivers/media/dvb-frontends/ascot2e
       
       MEDIA DRIVERS FOR CXD2841ER
       M:       Sergey Kozlov <[email protected]>
   + + M:       Abylay Ospan <[email protected]>
       L:       [email protected]
       W:       https://linuxtv.org
       W:       http://netup.tv/
@@@@@@@@ -7563,7 -7546,7 -7545,7 -7348,6 -7546,7 -7348,6 -7546,7 +7562,7 @@@@@@@@ F:    drivers/media/dvb-frontends/cxd2841e
       
       MEDIA DRIVERS FOR HORUS3A
       M:       Sergey Kozlov <[email protected]>
   + + M:       Abylay Ospan <[email protected]>
       L:       [email protected]
       W:       https://linuxtv.org
       W:       http://netup.tv/
@@@@@@@@ -7573,7 -7556,7 -7555,7 -7357,6 -7556,7 -7357,6 -7556,7 +7572,7 @@@@@@@@ F:    drivers/media/dvb-frontends/horus3a
       
       MEDIA DRIVERS FOR LNBH25
       M:       Sergey Kozlov <[email protected]>
   + + M:       Abylay Ospan <[email protected]>
       L:       [email protected]
       W:       https://linuxtv.org
       W:       http://netup.tv/
@@@@@@@@ -7583,7 -7566,7 -7565,7 -7366,6 -7566,7 -7366,6 -7566,7 +7582,7 @@@@@@@@ F:    drivers/media/dvb-frontends/lnbh25
       
       MEDIA DRIVERS FOR NETUP PCI UNIVERSAL DVB devices
       M:       Sergey Kozlov <[email protected]>
   + + M:       Abylay Ospan <[email protected]>
       L:       [email protected]
       W:       https://linuxtv.org
       W:       http://netup.tv/
@@@@@@@@ -7665,15 -7648,15 -7647,15 -7447,6 -7648,15 -7447,6 -7648,15 +7664,15 @@@@@@@@ W:      http://www.mellanox.co
       Q:       http://patchwork.ozlabs.org/project/netdev/list/
       F:       drivers/net/ethernet/mellanox/mlxsw/
       
 -- - -F:       drivers/infiniband/hw/rxe/
   + + SOFT-ROCE DRIVER (rxe)
   + + M:       Moni Shoua <[email protected]>
   + + L:       [email protected]
   + + S:       Supported
   + + W:       https://github.com/SoftRoCE/rxe-dev/wiki/rxe-dev:-Home
   + + Q:       http://patchwork.kernel.org/project/linux-rdma/list/
 ++++++F:       drivers/infiniband/sw/rxe/
   + + F:       include/uapi/rdma/rdma_user_rxe.h
   + + 
       MEMBARRIER SUPPORT
       M:       Mathieu Desnoyers <[email protected]>
       M:       "Paul E. McKenney" <[email protected]>
@@@@@@@@ -7842,8 -7825,8 -7824,8 -7615,10 -7825,8 -7615,10 -7825,8 +7841,8 @@@@@@@@ L:  [email protected]
       W:       https://linuxtv.org
       W:       http://palosaari.fi/linux/
       Q:       http://patchwork.linuxtv.org/project/linux-media/list/
   - - T:       git git://linuxtv.org/anttip/media_tree.git
       S:       Maintained
   - - F:       drivers/staging/media/mn88472/
   - - F:       drivers/media/dvb-frontends/mn88472.h
   + + F:       drivers/media/dvb-frontends/mn88472*
       
       MN88473 MEDIA DRIVER
       M:       Antti Palosaari <[email protected]>
@@@@@@@@ -7969,7 -7952,7 -7951,7 -7744,6 -7952,7 -7744,6 -7952,7 +7968,7 @@@@@@@@ M:    Ulf Hansson <[email protected]
       L:       [email protected]
       T:       git git://git.linaro.org/people/ulf.hansson/mmc.git
       S:       Maintained
   + + F:       Documentation/devicetree/bindings/mmc/
       F:       drivers/mmc/
       F:       include/linux/mmc/
       F:       include/uapi/linux/mmc/
@@@@@@@@ -8309,9 -8292,9 -8291,9 -8083,8 -8292,9 -8083,8 -8292,9 +8308,9 @@@@@@@@ T:    git git://github.com/konis/nilfs2.gi
       S:       Supported
       F:       Documentation/filesystems/nilfs2.txt
       F:       fs/nilfs2/
   - - F:       include/linux/nilfs2_fs.h
       F:       include/trace/events/nilfs2.h
   + + F:       include/uapi/linux/nilfs2_api.h
   + + F:       include/uapi/linux/nilfs2_ondisk.h
       
       NINJA SCSI-3 / NINJA SCSI-32Bi (16bit/CardBus) PCMCIA SCSI HOST ADAPTER DRIVER
       M:       YOKOTA Hiroshi <[email protected]>
@@@@@@@@ -8358,7 -8341,7 -8340,7 -8131,6 -8341,7 -8131,6 -8341,7 +8357,7 @@@@@@@@ F:    drivers/ntb
       F:       drivers/net/ntb_netdev.c
       F:       include/linux/ntb.h
       F:       include/linux/ntb_transport.h
   + + F:       tools/testing/selftests/ntb/
       
       NTB INTEL DRIVER
       M:       Jon Mason <[email protected]>
@@@@@@@@ -8401,13 -8384,13 -8383,13 -8173,6 -8384,13 -8173,6 -8384,13 +8400,13 @@@@@@@@ S:      Supporte
       F:       drivers/nvme/host/
       F:       include/linux/nvme.h
       
   + + NVM EXPRESS TARGET DRIVER
   + + M:       Christoph Hellwig <[email protected]>
   + + M:       Sagi Grimberg <[email protected]>
   + + L:       [email protected]
   + + S:       Supported
   + + F:       drivers/nvme/target/
   + + 
       NVMEM FRAMEWORK
       M:       Srinivas Kandagatla <[email protected]>
       M:       Maxime Ripard <[email protected]>
@@@@@@@@ -8930,7 -8913,7 -8912,7 -8695,6 -8913,7 -8695,6 -8913,7 +8929,7 @@@@@@@@ L:    [email protected]
       Q:       http://patchwork.ozlabs.org/project/linux-pci/list/
       T:       git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git
       S:       Supported
   + + F:       Documentation/devicetree/bindings/pci/
       F:       Documentation/PCI/
       F:       drivers/pci/
       F:       include/linux/pci*
@@@@@@@@ -8994,13 -8977,13 -8976,13 -8758,6 -8977,13 -8758,6 -8977,13 +8993,13 @@@@@@@@ L:      [email protected]
       S:       Maintained
       F:       drivers/pci/host/*mvebu*
       
   + + PCI DRIVER FOR AARDVARK (Marvell Armada 3700)
   + + M:       Thomas Petazzoni <[email protected]>
   + + L:       [email protected]
   + + L:       [email protected] (moderated for non-subscribers)
   + + S:       Maintained
   + + F:       drivers/pci/host/pci-aardvark.c
   + + 
       PCI DRIVER FOR NVIDIA TEGRA
       M:       Thierry Reding <[email protected]>
       L:       [email protected]
@@@@@@@@ -9083,15 -9066,15 -9065,15 -8840,6 -9066,15 -8840,6 -9066,15 +9082,15 @@@@@@@@ S:      Maintaine
       F:       Documentation/devicetree/bindings/pci/xgene-pci-msi.txt
       F:       drivers/pci/host/pci-xgene-msi.c
       
   + + PCIE DRIVER FOR AXIS ARTPEC
   + + M:       Niklas Cassel <[email protected]>
   + + M:       Jesper Nilsson <[email protected]>
   + + L:       [email protected]
   + + L:       [email protected]
   + + S:       Maintained
   + + F:       Documentation/devicetree/bindings/pci/axis,artpec*
   + + F:       drivers/pci/host/*artpec*
   + + 
       PCIE DRIVER FOR HISILICON
       M:       Zhou Wang <[email protected]>
       M:       Gabriele Paoloni <[email protected]>
@@@@@@@@ -9269,16 -9252,16 -9251,16 -9017,6 -9252,16 -9017,6 -9252,16 +9268,16 @@@@@@@@ W:      http://www.st.com/spea
       S:       Maintained
       F:       drivers/pinctrl/spear/
       
   + + PISTACHIO SOC SUPPORT
   + + M:      James Hartley <[email protected]>
   + + M:      Ionela Voinescu <[email protected]>
   + + L:      [email protected]
   + + S:      Maintained
   + + F:      arch/mips/pistachio/
   + + F:      arch/mips/include/asm/mach-pistachio/
   + + F:      arch/mips/boot/dts/pistachio/
   + + F:      arch/mips/configs/pistachio*_defconfig
   + + 
       PKTCDVD DRIVER
       M:       Jiri Kosina <[email protected]>
       S:       Maintained
@@@@@@@@ -9348,8 -9331,8 -9330,8 -9086,6 -9331,8 -9086,6 -9331,8 +9347,8 @@@@@@@@ M:    David Woodhouse <[email protected]
       L:       [email protected]
       T:       git git://git.infradead.org/battery-2.6.git
       S:       Maintained
   + + F:       Documentation/devicetree/bindings/power/
   + + F:       Documentation/devicetree/bindings/power_supply/
       F:       include/linux/power_supply.h
       F:       drivers/power/
       X:       drivers/power/avs/
@@@@@@@@ -9363,12 -9346,12 -9345,12 -9099,6 -9346,12 -9099,6 -9346,12 +9362,12 @@@@@@@@ F:      drivers/firmware/psci.
       F:       include/linux/psci.h
       F:       include/uapi/linux/psci.h
       
   + + POWERNV OPERATOR PANEL LCD DISPLAY DRIVER
   + + M:       Suraj Jitindar Singh <[email protected]>
   + + L:       [email protected]
   + + S:       Maintained
   + + F:       drivers/char/powernv-op-panel.c
   + + 
       PNP SUPPORT
       M:       "Rafael J. Wysocki" <[email protected]>
       S:       Maintained
@@@@@@@@ -9493,13 -9476,13 -9475,13 -9223,6 -9476,13 -9223,6 -9476,13 +9492,13 @@@@@@@@ F:      include/linux/tracehook.
       F:       include/uapi/linux/ptrace.h
       F:       kernel/ptrace.c
       
   + + PULSE8-CEC DRIVER
   + + M:       Hans Verkuil <[email protected]>
   + + L:       [email protected]
   + + T:       git git://linuxtv.org/media_tree.git
   + + S:       Maintained
   + + F:       drivers/staging/media/pulse8-cec
   + + 
       PVRUSB2 VIDEO4LINUX DRIVER
       M:       Mike Isely <[email protected]>
       L:       [email protected]       (subscribers-only)
@@@@@@@@ -9511,15 -9494,15 -9493,15 -9234,14 -9494,15 -9234,14 -9494,15 +9510,15 @@@@@@@@ F:    Documentation/video4linux/README.pvr
       F:       drivers/media/usb/pvrusb2/
       
       PWC WEBCAM DRIVER
   - - M:       Hans de Goede <[email protected]>
   + + M:       Hans Verkuil <[email protected]>
       L:       [email protected]
       T:       git git://linuxtv.org/media_tree.git
   - - S:       Maintained
   + + S:       Odd Fixes
       F:       drivers/media/usb/pwc/*
       
       PWM FAN DRIVER
   - - M:       Kamil Debski <[email protected]>
   + + M:       Kamil Debski <[email protected]>
   + + M:       Lukasz Majewski <[email protected]>
       L:       [email protected]
       S:       Supported
       F:       Documentation/devicetree/bindings/hwmon/pwm-fan.txt
@@@@@@@@ -9588,8 -9571,8 -9570,8 -9310,7 -9571,8 -9310,7 -9571,8 +9587,8 @@@@@@@@ L:    [email protected]
       S:       Maintained
       
       QAT DRIVER
   - - M:       Tadeusz Struk <[email protected]>
   + + M:       Giovanni Cabiddu <[email protected]>
   + + M:       Salvatore Benedetto <[email protected]>
       L:       [email protected]
       S:       Supported
       F:       drivers/crypto/qat/
@@@@@@@@ -9731,14 -9714,14 -9713,14 -9452,14 -9714,14 -9452,14 -9714,14 +9730,14 @@@@@@@@ F:    drivers/video/fbdev/aty/radeon
       F:       include/uapi/linux/radeonfb.h
       
       RADIOSHARK RADIO DRIVER
   - - M:       Hans de Goede <[email protected]>
   + + M:       Hans Verkuil <[email protected]>
       L:       [email protected]
       T:       git git://linuxtv.org/media_tree.git
       S:       Maintained
       F:       drivers/media/radio/radio-shark.c
       
       RADIOSHARK2 RADIO DRIVER
   - - M:       Hans de Goede <[email protected]>
   + + M:       Hans Verkuil <[email protected]>
       L:       [email protected]
       T:       git git://linuxtv.org/media_tree.git
       S:       Maintained
@@@@@@@@ -9812,7 -9795,7 -9794,7 -9533,7 -9795,7 -9533,7 -9795,7 +9811,7 @@@@@@@@ M:    Florian Fainelli <[email protected]
       S:       Maintained
       
       RDC R6040 FAST ETHERNET DRIVER
   - - M:       Florian Fainelli <f[email protected]>
   + + M:       Florian Fainelli <f[email protected]>
       L:       [email protected]
       S:       Maintained
       F:       drivers/net/ethernet/rdc/r6040.c
@@@@@@@@ -9857,14 -9840,14 -9839,14 -9578,10 -9840,14 -9578,10 -9840,14 +9856,14 @@@@@@@@ L:    [email protected]
       Q:       http://patchwork.ozlabs.org/project/rtc-linux/list/
       T:       git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git
       S:       Maintained
   + + F:       Documentation/devicetree/bindings/rtc/
       F:       Documentation/rtc.txt
       F:       drivers/rtc/
       F:       include/linux/rtc.h
       F:       include/uapi/linux/rtc.h
   + + F:       include/linux/rtc/
   + + F:       include/linux/platform_data/rtc-*
   + + F:       tools/testing/selftests/timers/rtctest.c
       
       REALTEK AUDIO CODECS
       M:       Bard Liao <[email protected]>
@@@@@@@@ -9883,7 -9866,7 -9865,7 -9600,6 -9866,7 -9600,6 -9866,7 +9882,7 @@@@@@@@ M:    Mark Brown <[email protected]
       L:       [email protected]
       T:       git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git
       S:       Supported
   + + F:       Documentation/devicetree/bindings/regmap/
       F:       drivers/base/regmap/
       F:       include/linux/regmap.h
       
@@@@@@@@ -9893,9 -9876,9 -9875,9 -9609,8 -9876,9 -9609,8 -9876,9 +9892,9 @@@@@@@@ M:    Bjorn Andersson <bjorn.andersson@lin
       L:       [email protected]
       T:       git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc.git
       S:       Maintained
   - - F:       drivers/remoteproc/
   + + F:       Documentation/devicetree/bindings/remoteproc/
       F:       Documentation/remoteproc.txt
   + + F:       drivers/remoteproc/
       F:       include/linux/remoteproc.h
       
       REMOTE PROCESSOR MESSAGING (RPMSG) SUBSYSTEM
@@@@@@@@ -9969,6 -9952,6 -9951,6 -9684,7 -9952,6 -9684,7 -9952,6 +9968,6 @@@@@@@@ F:    Documentation/ABI/*/sysfs-driver-hid
       
       ROCKER DRIVER
       M:       Jiri Pirko <[email protected]>
   - - M:       Scott Feldman <[email protected]>
       L:       [email protected]
       S:       Supported
       F:       drivers/net/ethernet/rocker/
@@@@@@@@ -10180,9 -10163,9 -10162,9 -9896,7 -10163,9 -9896,7 -10163,9 +10179,9 @@@@@@@@ S:      Maintaine
       F:       drivers/platform/x86/samsung-laptop.c
       
       SAMSUNG AUDIO (ASoC) DRIVERS
   + + M:       Krzysztof Kozlowski <[email protected]>
       M:       Sangbeom Kim <[email protected]>
   + + M:       Sylwester Nawrocki <[email protected]>
       L:       [email protected] (moderated for non-subscribers)
       S:       Supported
       F:       sound/soc/samsung/
@@@@@@@@ -10254,6 -10237,6 -10236,17 -9968,6 -10237,6 -9968,6 -10237,6 +10253,17 @@@@@@@@ S:    Supporte
       L:       [email protected] (moderated for non-subscribers)
       F:       drivers/clk/samsung/
       
++ ++++SAMSUNG SPI DRIVERS
++ ++++M:       Kukjin Kim <[email protected]>
++ ++++M:       Krzysztof Kozlowski <[email protected]>
++ ++++M:       Andi Shyti <[email protected]>
++ ++++L:       [email protected]
++ ++++L:       [email protected] (moderated for non-subscribers)
++ ++++S:       Maintained
++ ++++F:       Documentation/devicetree/bindings/spi/spi-samsung.txt
++ ++++F:       drivers/spi/spi-s3c*
++ ++++F:       include/linux/platform_data/spi-s3c64xx.h
++ ++++
       SAMSUNG SXGBE DRIVERS
       M:       Byungho An <[email protected]>
       M:       Girish K S <[email protected]>
@@@@@@@@ -10271,8 -10254,8 -10264,8 -9985,7 -10254,8 -9985,7 -10254,8 +10281,8 @@@@@@@@ T:      git https://github.com/lmajewski/lin
       F:       drivers/thermal/samsung/
       
       SAMSUNG USB2 PHY DRIVER
   - - M:       Kamil Debski <[email protected]>
   + + M:       Kamil Debski <[email protected]>
   + + M:       Sylwester Nawrocki <[email protected]>
       L:       [email protected]
       S:       Supported
       F:       Documentation/devicetree/bindings/phy/samsung-phy.txt
@@@@@@@@ -10288,7 -10271,7 -10281,7 -10001,6 -10271,7 -10001,6 -10271,7 +10298,7 @@@@@@@@ SERIAL DRIVER
       M:       Greg Kroah-Hartman <[email protected]>
       L:       [email protected]
       S:       Maintained
   + + F:       Documentation/devicetree/bindings/serial/
       F:       drivers/tty/serial/
       
       SYNOPSYS DESIGNWARE DMAC DRIVER
@@@@@@@@ -10425,7 -10408,7 -10418,7 -10137,6 -10408,7 -10137,6 -10408,7 +10435,7 @@@@@@@@ M:    "Martin K. Petersen" <martin.peterse
       T:       git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git
       L:       [email protected]
       S:       Maintained
   + + F:       Documentation/devicetree/bindings/scsi/
       F:       drivers/scsi/
       F:       include/scsi/
       
@@@@@@@@ -10497,13 -10480,13 -10490,13 -10208,6 -10480,13 -10208,6 -10480,13 +10507,13 @@@@@@@@ F:      tools/testing/selftests/seccomp/
       K:       \bsecure_computing
       K:       \bTIF_SECCOMP\b
       
   + + SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) Broadcom BRCMSTB DRIVER
   + + M:       Al Cooper <[email protected]>
   + + L:       [email protected]
   + + L:       [email protected]
   + + S:       Maintained
   + + F:       drivers/mmc/host/sdhci-brcmstb*
   + + 
       SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) SAMSUNG DRIVER
       M:       Ben Dooks <[email protected]>
       M:       Jaehoon Chung <[email protected]>
@@@@@@@@ -10577,9 -10560,9 -10570,9 -10281,10 -10560,9 -10281,10 -10560,9 +10587,9 @@@@@@@@ W:  http://www.avagotech.co
       S:       Supported
       F:       drivers/scsi/be2iscsi/
       
   - - Emulex 10Gbps NIC BE2, BE3-R, Lancer, Skyhawk-R DRIVER
   + + Emulex 10Gbps NIC BE2, BE3-R, Lancer, Skyhawk-R DRIVER (be2net)
       M:       Sathya Perla <[email protected]>
       M:       Ajit Khaparde <[email protected]>
   - - M:       Padmanabh Ratnakar <[email protected]>
       M:       Sriharsha Basavapatna <[email protected]>
       M:       Somnath Kotur <[email protected]>
       L:       [email protected]
@@@@@@@@ -10845,7 -10828,7 -10838,7 -10550,7 -10828,7 -10550,7 -10828,7 +10855,7 @@@@@@@@ SMACK SECURITY MODUL
       M:       Casey Schaufler <[email protected]>
       L:       [email protected]
       W:       http://schaufler-ca.com
   - - T:       git git://git.gitorious.org/smack-next/kernel.git
   + + T:       git git://github.com/cschaufler/smack-next
       S:       Maintained
       F:       Documentation/security/Smack.txt
       F:       security/smack/
@@@@@@@@ -11019,7 -11002,7 -11012,7 -10724,6 -11002,7 -10724,6 -11002,7 +11029,7 @@@@@@@@ T:    git git://git.kernel.org/pub/scm/lin
       L:       [email protected] (moderated for non-subscribers)
       W:       http://alsa-project.org/main/index.php/ASoC
       S:       Supported
   + + F:       Documentation/devicetree/bindings/sound/
       F:       Documentation/sound/alsa/soc/
       F:       sound/soc/
       F:       include/sound/soc*
@@@@@@@@ -11158,7 -11141,7 -11151,7 -10862,6 -11141,7 -10862,6 -11141,7 +11168,7 @@@@@@@@ STAGING - INDUSTRIAL I
       M:       Jonathan Cameron <[email protected]>
       L:       [email protected]
       S:       Odd Fixes
   + + F:       Documentation/devicetree/bindings/staging/iio/
       F:       drivers/staging/iio/
       
       STAGING - LIRC (LINUX INFRARED REMOTE CONTROL) DRIVERS
@@@@@@@@ -11233,8 -11216,12 -11226,12 -10936,12 -11216,12 -10936,12 -11216,12 +11243,8 @@@@@@@@ S:      Odd Fixe
       F:       drivers/staging/vt665?/
       
       STAGING - WILC1000 WIFI DRIVER
 ------M:       Johnny Kim <[email protected]>
 ------M:       Austin Shin <[email protected]>
 ------M:       Chris Park <[email protected]>
 ------M:       Tony Cho <[email protected]>
 ------M:       Glen Lee <[email protected]>
 ------M:       Leo Kim <[email protected]>
 ++++++M:       Aditya Shankar <[email protected]>
 ++++++M:       Ganesh Krishna <[email protected]>
       L:       [email protected]
       S:       Supported
       F:       drivers/staging/wilc1000/
@@@@@@@@ -11609,6 -11596,6 -11606,6 -11316,11 -11596,6 -11316,11 -11596,6 +11619,6 @@@@@@@@ F:  Documentation/thermal/cpu-cooling-ap
       F:       drivers/thermal/cpu_cooling.c
       F:       include/linux/cpu_cooling.h
       
   - - THINGM BLINK(1) USB RGB LED DRIVER
   - - M:       Vivien Didelot <[email protected]>
   - - S:       Maintained
   - - F:       drivers/hid/hid-thingm.c
   - - 
       THINKPAD ACPI EXTRAS DRIVER
       M:       Henrique de Moraes Holschuh <[email protected]>
       L:       [email protected]
@@@@@@@@ -12059,12 -12046,12 -12056,12 -11771,6 -12046,12 -11771,6 -12046,12 +12069,12 @@@@@@@@ S:      Supporte
       F:       Documentation/scsi/ufs.txt
       F:       drivers/scsi/ufs/
       
   + + UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER DWC HOOKS
   + + M:       Joao Pinto <[email protected]>
   + + L:       [email protected]
   + + S:       Supported
   + + F:       drivers/scsi/ufs/*dwc*
   + + 
       UNSORTED BLOCK IMAGES (UBI)
       M:       Artem Bityutskiy <[email protected]>
       M:       Richard Weinberger <[email protected]>
@@@@@@@@ -12090,7 -12077,7 -12087,7 -11796,8 -12077,7 -11796,8 -12077,7 +12100,7 @@@@@@@@ S:    Maintaine
       F:       drivers/net/wireless/ath/ar5523/
       
       USB ATTACHED SCSI
   - - M:       Hans de Goede <[email protected]>
   - - M:       Gerd Hoffmann <[email protected]>
   + + M:       Oliver Neukum <[email protected]>
       L:       [email protected]
       L:       [email protected]
       S:       Maintained
@@@@@@@@ -12432,19 -12419,19 -12429,19 -12139,6 -12419,19 -12139,6 -12419,19 +12442,19 @@@@@@@@ S:      Maintaine
       F:       drivers/media/v4l2-core/videobuf2-*
       F:       include/media/videobuf2-*
       
   + + VIRTIO AND VHOST VSOCK DRIVER
   + + M:       Stefan Hajnoczi <[email protected]>
   + + L:       [email protected]
   + + L:       [email protected]
   + + L:       [email protected]
   + + S:       Maintained
   + + F:       include/linux/virtio_vsock.h
   + + F:       include/uapi/linux/virtio_vsock.h
   + + F:       net/vmw_vsock/virtio_transport_common.c
   + + F:       net/vmw_vsock/virtio_transport.c
   + + F:       drivers/vhost/vsock.c
   + + F:       drivers/vhost/vsock.h
   + + 
       VIRTUAL SERIO DEVICE DRIVER
       M:       Stephen Chandler Paul <[email protected]>
       S:       Maintained
@@@@@@@@ -12602,7 -12589,7 -12599,7 -12296,7 -12589,7 -12296,7 -12589,7 +12612,7 @@@@@@@@ S:    Maintaine
       F:       drivers/net/vmxnet3/
       
       VMware PVSCSI driver
   - - M:       Arvind Kumar <arvindkumar@vmware.com>
   + + M:       Jim Gill <jgill@vmware.com>
       M:       VMware PV-Drivers <[email protected]>
       L:       [email protected]
       S:       Maintained
diff --combined drivers/spi/spi.c
index 51ad42fad567913339ab8d9deaf531b779865a87,57179d5eea9a7d40bf66bdffdd96561a85dbd845,51ad42fad567913339ab8d9deaf531b779865a87,d2e7f1350ef6cc6b56c64e782557629fa45c4e27,51ad42fad567913339ab8d9deaf531b779865a87,d2e7f1350ef6cc6b56c64e782557629fa45c4e27,ac889df9b1f347c96fd52a28f1b87c339a24e6c0..200ca228d8851980d5e755eed5a82c6df4c6dc9b
--- 1/drivers/spi/spi.c
--- 2/drivers/spi/spi.c
--- 3/drivers/spi/spi.c
--- 4/drivers/spi/spi.c
--- 5/drivers/spi/spi.c
--- 6/drivers/spi/spi.c
--- 7/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@@@@@@@ -622,8 -622,8 -622,8 -622,6 -622,8 -622,6 -622,8 +622,8 @@@@@@@@ void spi_unregister_device(struct spi_d
       
        if (spi->dev.of_node)
                of_node_clear_flag(spi->dev.of_node, OF_POPULATED);
   + +  if (ACPI_COMPANION(&spi->dev))
   + +          acpi_device_clear_enumerated(ACPI_COMPANION(&spi->dev));
        device_unregister(&spi->dev);
       }
       EXPORT_SYMBOL_GPL(spi_unregister_device);
@@@@@@@@ -960,7 -960,7 -960,7 -958,7 -960,7 -958,7 -960,7 +960,7 @@@@@@@@ static int spi_transfer_one_message(str
        struct spi_transfer *xfer;
        bool keep_cs = false;
        int ret = 0;
------  unsigned long ms = 1;
++++++  unsigned long long ms = 1;
        struct spi_statistics *statm = &master->statistics;
        struct spi_statistics *stats = &msg->spi->statistics;
       
@@@@@@@@ -991,9 -991,9 -991,9 -989,9 -991,9 -989,9 -991,13 +991,13 @@@@@@@@
       
                        if (ret > 0) {
                                ret = 0;
------                          ms = xfer->len * 8 * 1000 / xfer->speed_hz;
++++++                          ms = 8LL * 1000LL * xfer->len;
++++++                          do_div(ms, xfer->speed_hz);
                                ms += ms + 100; /* some tolerance */
       
++++++                          if (ms > UINT_MAX)
++++++                                  ms = UINT_MAX;
++++++ 
                                ms = wait_for_completion_timeout(&master->xfer_completion,
                                                                 msecs_to_jiffies(ms));
                        }
@@@@@@@@ -1159,6 -1159,7 -1159,6 -1157,6 -1159,6 -1157,6 -1163,6 +1163,7 @@@@@@@@ static void __spi_pump_messages(struct 
                if (ret < 0) {
                        dev_err(&master->dev, "Failed to power device: %d\n",
                                ret);
+ +++++                 mutex_unlock(&master->io_mutex);
                        return;
                }
        }
@@@@@@@@ -1174,6 -1175,7 -1174,6 -1172,6 -1174,6 -1172,6 -1178,6 +1179,7 @@@@@@@@
       
                        if (master->auto_runtime_pm)
                                pm_runtime_put(master->dev.parent);
+ +++++                 mutex_unlock(&master->io_mutex);
                        return;
                }
        }
@@@@@@@@ -1658,15 -1660,15 -1658,15 -1656,18 -1658,15 -1656,18 -1662,15 +1664,15 @@@@@@@@ static int acpi_spi_add_resource(struc
        return 1;
       }
       
   - - static acpi_status acpi_spi_add_device(acpi_handle handle, u32 level,
   - -                                 void *data, void **return_value)
   + + static acpi_status acpi_register_spi_device(struct spi_master *master,
   + +                                      struct acpi_device *adev)
       {
   - -  struct spi_master *master = data;
        struct list_head resource_list;
   - -  struct acpi_device *adev;
        struct spi_device *spi;
        int ret;
       
   - -  if (acpi_bus_get_device(handle, &adev))
   - -          return AE_OK;
   - -  if (acpi_bus_get_status(adev) || !adev->status.present)
   + +  if (acpi_bus_get_status(adev) || !adev->status.present ||
   + +      acpi_device_enumerated(adev))
                return AE_OK;
       
        spi = spi_alloc_device(master);
@@@@@@@@ -1692,8 -1694,8 -1692,8 -1693,6 -1692,8 -1693,6 -1696,8 +1698,8 @@@@@@@@
        if (spi->irq < 0)
                spi->irq = acpi_dev_gpio_irq_get(adev, 0);
       
   + +  acpi_device_set_enumerated(adev);
   + + 
        adev->power.flags.ignore_parent = true;
        strlcpy(spi->modalias, acpi_device_hid(adev), sizeof(spi->modalias));
        if (spi_add_device(spi)) {
@@@@@@@@ -1706,18 -1708,18 -1706,18 -1705,6 -1706,18 -1705,6 -1710,18 +1712,18 @@@@@@@@
        return AE_OK;
       }
       
   + + static acpi_status acpi_spi_add_device(acpi_handle handle, u32 level,
   + +                                 void *data, void **return_value)
   + + {
   + +  struct spi_master *master = data;
   + +  struct acpi_device *adev;
   + + 
   + +  if (acpi_bus_get_device(handle, &adev))
   + +          return AE_OK;
   + + 
   + +  return acpi_register_spi_device(master, adev);
   + + }
   + + 
       static void acpi_register_spi_devices(struct spi_master *master)
       {
        acpi_status status;
@@@@@@@@ -3146,77 -3148,77 -3146,77 -3133,6 -3146,77 -3133,6 -3150,77 +3152,77 @@@@@@@@ static struct notifier_block spi_of_not
       extern struct notifier_block spi_of_notifier;
       #endif /* IS_ENABLED(CONFIG_OF_DYNAMIC) */
       
   + + #if IS_ENABLED(CONFIG_ACPI)
   + + static int spi_acpi_master_match(struct device *dev, const void *data)
   + + {
   + +  return ACPI_COMPANION(dev->parent) == data;
   + + }
   + + 
   + + static int spi_acpi_device_match(struct device *dev, void *data)
   + + {
   + +  return ACPI_COMPANION(dev) == data;
   + + }
   + + 
   + + static struct spi_master *acpi_spi_find_master_by_adev(struct acpi_device *adev)
   + + {
   + +  struct device *dev;
   + + 
   + +  dev = class_find_device(&spi_master_class, NULL, adev,
   + +                          spi_acpi_master_match);
   + +  if (!dev)
   + +          return NULL;
   + + 
   + +  return container_of(dev, struct spi_master, dev);
   + + }
   + + 
   + + static struct spi_device *acpi_spi_find_device_by_adev(struct acpi_device *adev)
   + + {
   + +  struct device *dev;
   + + 
   + +  dev = bus_find_device(&spi_bus_type, NULL, adev, spi_acpi_device_match);
   + + 
   + +  return dev ? to_spi_device(dev) : NULL;
   + + }
   + + 
   + + static int acpi_spi_notify(struct notifier_block *nb, unsigned long value,
   + +                     void *arg)
   + + {
   + +  struct acpi_device *adev = arg;
   + +  struct spi_master *master;
   + +  struct spi_device *spi;
   + + 
   + +  switch (value) {
   + +  case ACPI_RECONFIG_DEVICE_ADD:
   + +          master = acpi_spi_find_master_by_adev(adev->parent);
   + +          if (!master)
   + +                  break;
   + + 
   + +          acpi_register_spi_device(master, adev);
   + +          put_device(&master->dev);
   + +          break;
   + +  case ACPI_RECONFIG_DEVICE_REMOVE:
   + +          if (!acpi_device_enumerated(adev))
   + +                  break;
   + + 
   + +          spi = acpi_spi_find_device_by_adev(adev);
   + +          if (!spi)
   + +                  break;
   + + 
   + +          spi_unregister_device(spi);
   + +          put_device(&spi->dev);
   + +          break;
   + +  }
   + + 
   + +  return NOTIFY_OK;
   + + }
   + + 
   + + static struct notifier_block spi_acpi_notifier = {
   + +  .notifier_call = acpi_spi_notify,
   + + };
   + + #else
   + + extern struct notifier_block spi_acpi_notifier;
   + + #endif
   + + 
       static int __init spi_init(void)
       {
        int     status;
@@@@@@@@ -3237,8 -3239,8 -3237,8 -3153,6 -3237,8 -3153,6 -3241,8 +3243,8 @@@@@@@@
       
        if (IS_ENABLED(CONFIG_OF_DYNAMIC))
                WARN_ON(of_reconfig_notifier_register(&spi_of_notifier));
   + +  if (IS_ENABLED(CONFIG_ACPI))
   + +          WARN_ON(acpi_reconfig_notifier_register(&spi_acpi_notifier));
       
        return 0;
       
Empty description
This page took 0.210809 seconds and 4 git commands to generate.