]> Git Repo - linux.git/commitdiff
projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 92d21ac 5bf75b4 d4ef930 08188ba ccc1256 9398a63)
Merge remote-tracking branches 'regmap/topic/bulk', 'regmap/topic/i2c', 'regmap/topic...
authorMark Brown <[email protected]>
Fri, 15 Jul 2016 12:44:47 +0000 (13:44 +0100)
committerMark Brown <[email protected]>
Fri, 15 Jul 2016 12:44:47 +0000 (13:44 +0100)
1  2  3  4  5  6 
MAINTAINERS patch | diff1 | diff2 | diff3 | diff4 | diff5 | diff6 | blob | history
include/linux/regmap.h patch | diff1 | diff2 | diff3 | diff4 | diff5 | diff6 | blob | history

diff --combined MAINTAINERS
index 1209323b7e43f372b65d0b1db48c0cfc0f6a9973,7304d2e37a9827988f8c816c9d7922adb8a00d9b,7304d2e37a9827988f8c816c9d7922adb8a00d9b,7304d2e37a9827988f8c816c9d7922adb8a00d9b,7304d2e37a9827988f8c816c9d7922adb8a00d9b,94a9af5d7f7dceda3a81e99dc7ee21069c738d63..f98a0c67a67891934d6c0d0aefab792f25c122cb
--- 1/MAINTAINERS
--- 2/MAINTAINERS
--- 3/MAINTAINERS
--- 4/MAINTAINERS
--- 5/MAINTAINERS
--- 6/MAINTAINERS
+++ b/MAINTAINERS
@@@@@@@ -175,6 -175,6 -175,6 -175,6 -175,6 -175,7 +175,6 @@@@@@@ F:     drivers/net/ethernet/realtek/r8169.
      8250/16?50 (AND CLONE UARTS) SERIAL DRIVER
      M:        Greg Kroah-Hartman <[email protected]>
      L:        [email protected]
     -W:        http://serial.sourceforge.net
      S:        Maintained
      T:        git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git
      F:        drivers/tty/serial/8250*
@@@@@@@ -595,10 -595,6 -595,6 -595,6 -595,6 -596,6 +595,10 @@@@@@@ S:   Odd Fixe
      L:        [email protected]
      F:        arch/alpha/
      
 +++++ALPS PS/2 TOUCHPAD DRIVER
 +++++R:        Pali Rohár <[email protected]>
 +++++F:        drivers/input/mouse/alps.*
 +++++
      ALTERA MAILBOX DRIVER
      M:        Ley Foon Tan <[email protected]>
      L:        [email protected] (moderated for non-subscribers)
@@@@@@@ -630,7 -626,7 -626,7 -626,7 -626,7 -627,6 +630,7 @@@@@@@ F:     include/linux/altera_jtaguart.
      
      AMD CRYPTOGRAPHIC COPROCESSOR (CCP) DRIVER
      M:        Tom Lendacky <[email protected]>
     +M:        Gary Hook <[email protected]>
      L:        [email protected]
      S:        Supported
      F:        drivers/crypto/ccp/
@@@@@@@ -780,15 -776,15 -776,15 -776,15 -776,15 -776,6 +780,15 @@@@@@@ S:       Supporte
      F:        drivers/android/
      F:        drivers/staging/android/
      
     +ANDROID ION DRIVER
     +M:        Laura Abbott <[email protected]>
     +M:        Sumit Semwal <[email protected]>
     +L:        [email protected]
     +S:        Supported
     +F:        drivers/staging/android/ion
     +F:        drivers/staging/android/uapi/ion.h
     +F:        drivers/staging/android/uapi/ion_test.h
     +
      AOA (Apple Onboard Audio) ALSA DRIVER
      M:        Johannes Berg <[email protected]>
      L:        [email protected]
@@@@@@@ -860,12 -856,12 -856,12 -856,12 -856,12 -847,6 +860,12 @@@@@@@ S:       Maintaine
      F:        drivers/net/arcnet/
      F:        include/uapi/linux/if_arcnet.h
      
     +ARC PGU DRM DRIVER
     +M:        Alexey Brodkin <[email protected]>
     +S:        Supported
     +F:        drivers/gpu/drm/arc/
     +F:        Documentation/devicetree/bindings/display/snps,arcpgu.txt
     +
      ARM HDLCD DRM DRIVER
      M:        Liviu Dudau <[email protected]>
      S:        Supported
@@@@@@@ -967,15 -963,15 -963,15 -963,15 -963,15 -948,12 +967,15 @@@@@@@ F:      drivers/clk/sunxi
      
      ARM/Amlogic Meson SoC support
      M:        Carlo Caione <[email protected]>
     +M:        Kevin Hilman <[email protected]>
      L:        [email protected] (moderated for non-subscribers)
     -L:        linux-[email protected]
     +L:        linux-[email protected]
      W:        http://linux-meson.com/
      S:        Maintained
      F:        arch/arm/mach-meson/
      F:        arch/arm/boot/dts/meson*
     +F:        arch/arm64/boot/dts/amlogic/
     +F:        drivers/pinctrl/meson/
      N:        meson
      
      ARM/Annapurna Labs ALPINE ARCHITECTURE
@@@@@@@ -995,14 -991,14 -991,14 -991,14 -991,14 -973,7 +995,14 @@@@@@@ S:       Maintaine
      L:        [email protected]
      F:        arch/arm/mach-artpec
      F:        arch/arm/boot/dts/artpec6*
     -F:        drivers/clk/clk-artpec6.c
     +F:        drivers/clk/axis
     +
     +ARM/ASPEED MACHINE SUPPORT
     +M:        Joel Stanley <[email protected]>
     +S:        Maintained
     +F:        arch/arm/mach-aspeed/
     +F:        arch/arm/boot/dts/aspeed-*
     +F:        drivers/*/*aspeed*
      
      ARM/ATMEL AT91RM9200, AT91SAM9 AND SAMA5 SOC SUPPORT
      M:        Nicolas Ferre <[email protected]>
@@@@@@@ -1163,7 -1159,6 -1159,6 -1159,6 -1159,6 -1134,6 +1163,7 @@@@@@@ F:      arch/arm/mach-footbridge
      ARM/FREESCALE IMX / MXC ARM ARCHITECTURE
      M:        Shawn Guo <[email protected]>
      M:        Sascha Hauer <[email protected]>
 +++++R:        Fabio Estevam <[email protected]>
      L:        [email protected] (moderated for non-subscribers)
      S:        Maintained
      T:        git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git
@@@@@@@ -1290,7 -1285,7 -1285,7 -1285,7 -1285,7 -1260,7 +1290,7 @@@@@@@ M:      Santosh Shilimkar <[email protected]
      L:        [email protected] (moderated for non-subscribers)
      S:        Maintained
      F:        arch/arm/mach-keystone/
     -F:        arch/arm/boot/dts/k2*
     +F:        arch/arm/boot/dts/keystone-*
      T:        git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git
      
      ARM/TEXAS INSTRUMENT KEYSTONE CLOCK FRAMEWORK
@@@@@@@ -1318,12 -1313,12 -1313,12 -1313,12 -1313,12 -1288,6 +1318,12 @@@@@@@ L:        [email protected]
      S:        Maintained
      F:        drivers/memory/*emif*
      
     +ARM/LG1K ARCHITECTURE
     +M:        Chanho Min <[email protected]>
     +L:        [email protected] (moderated for non-subscribers)
     +S:        Maintained
     +F:        arch/arm64/boot/dts/lg/
     +
      ARM/LOGICPD PXA270 MACHINE SUPPORT
      M:        Lennert Buytenhek <[email protected]>
      L:        [email protected] (moderated for non-subscribers)
@@@@@@@ -1342,25 -1337,25 -1337,25 -1337,25 -1337,25 -1306,11 +1342,25 @@@@@@@ F:       drivers/mtd/spi-nor/nxp-spifi.
      F:        drivers/rtc/rtc-lpc24xx.c
      N:        lpc18xx
      
     +ARM/LPC32XX SOC SUPPORT
     +M:        Vladimir Zapolskiy <[email protected]>
     +M:        Sylvain Lemieux <[email protected]>
     +L:        [email protected] (moderated for non-subscribers)
     +T:        git git://github.com/vzapolskiy/linux-lpc32xx.git
     +S:        Maintained
     +F:        arch/arm/boot/dts/lpc32*
     +F:        arch/arm/mach-lpc32xx/
     +F:        drivers/i2c/busses/i2c-pnx.c
     +F:        drivers/net/ethernet/nxp/lpc_eth.c
     +F:        drivers/usb/host/ohci-nxp.c
     +F:        drivers/watchdog/pnx4008_wdt.c
     +N:        lpc32xx
     +
      ARM/MAGICIAN MACHINE SUPPORT
      M:        Philipp Zabel <[email protected]>
      S:        Maintained
      
     -ARM/Marvell Kirkwood and Armada 370, 375, 38x, XP SOC support
     +ARM/Marvell Kirkwood and Armada 370, 375, 38x, 39x, XP, 3700, 7K/8K SOC support
      M:        Jason Cooper <[email protected]>
      M:        Andrew Lunn <[email protected]>
      M:        Gregory Clement <[email protected]>
@@@@@@@ -1372,8 -1367,8 -1367,8 -1367,8 -1367,8 -1322,7 +1372,8 @@@@@@@ F:      drivers/rtc/rtc-armada38x.
      F:        arch/arm/boot/dts/armada*
      F:        arch/arm/boot/dts/kirkwood*
      F:        arch/arm64/boot/dts/marvell/armada*
     -
     +F:        drivers/cpufreq/mvebu-cpufreq.c
     +F:        arch/arm/configs/mvebu_*_defconfig
      
      ARM/Marvell Berlin SoC support
      M:        Sebastian Hesselbarth <[email protected]>
@@@@@@@ -1406,15 -1401,15 -1401,15 -1401,15 -1401,15 -1355,6 +1406,15 @@@@@@@ W:        http://www.digriz.org.uk/ts78xx/kern
      S:        Maintained
      F:        arch/arm/mach-orion5x/ts78xx-*
      
     +ARM/OXNAS platform support
     +M:        Neil Armstrong <[email protected]>
     +L:        [email protected] (moderated for non-subscribers)
     +S:        Maintained
     +F:        arch/arm/mach-oxnas/
     +F:        arch/arm/boot/dts/oxnas*
     +F:        arch/arm/boot/dts/wd-mbwe.dts
     +N:        oxnas
     +
      ARM/Mediatek RTC DRIVER
      M:        Eddie Huang <[email protected]>
      L:        [email protected] (moderated for non-subscribers)
@@@@@@@ -1530,10 -1525,10 -1525,10 -1525,10 -1525,10 -1470,7 +1530,10 @@@@@@@ F:        arch/arm/boot/dts/qcom-*.dt
      F:        arch/arm/boot/dts/qcom-*.dtsi
      F:        arch/arm/mach-qcom/
      F:        arch/arm64/boot/dts/qcom/*
     +F:        drivers/i2c/busses/i2c-qup.c
     +F:        drivers/clk/qcom/
      F:        drivers/soc/qcom/
     +F:        drivers/spi/spi-qup.c
      F:        drivers/tty/serial/msm_serial.h
      F:        drivers/tty/serial/msm_serial.c
      F:        drivers/*/pm8???-*
@@@@@@@ -1554,8 -1549,8 -1549,8 -1549,8 -1549,8 -1491,6 +1554,8 @@@@@@@ Q:      http://patchwork.kernel.org/project/
      T:        git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git next
      S:        Supported
      F:        arch/arm64/boot/dts/renesas/
     +F:        drivers/soc/renesas/
     +F:        include/linux/soc/renesas/
      
      ARM/RISCPC ARCHITECTURE
      M:        Russell King <[email protected]>
@@@@@@@ -1605,7 -1600,7 -1600,7 -1600,7 -1600,7 -1540,6 +1605,7 @@@@@@@ F:      arch/arm/mach-s5p*
      F:        arch/arm/mach-exynos*/
      F:        drivers/*/*s3c2410*
      F:        drivers/*/*/*s3c2410*
     +F:        drivers/memory/samsung/*
      F:        drivers/soc/samsung/*
      F:        drivers/spi/spi-s3c*
      F:        sound/soc/samsung/*
@@@@@@@ -1670,8 -1665,8 -1665,8 -1665,8 -1665,8 -1604,6 +1670,8 @@@@@@@ F:      arch/arm/configs/shmobile_defconfi
      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/
      
      ARM/SOCFPGA ARCHITECTURE
      M:        Dinh Nguyen <[email protected]>
@@@@@@@ -1706,7 -1701,7 -1701,7 -1701,7 -1701,7 -1638,6 +1706,7 @@@@@@@ F:      arch/arm/boot/dts/sti
      F:        drivers/char/hw_random/st-rng.c
      F:        drivers/clocksource/arm_global_timer.c
      F:        drivers/clocksource/clksrc_st_lpc.c
     +F:        drivers/cpufreq/sti-cpufreq.c
      F:        drivers/i2c/busses/i2c-st.c
      F:        drivers/media/rc/st_rc.c
      F:        drivers/media/platform/sti/c8sectpfe/
@@@@@@@ -1716,7 -1711,7 -1711,7 -1711,7 -1711,7 -1647,6 +1716,7 @@@@@@@ F:      drivers/phy/phy-miphy365x.
      F:        drivers/phy/phy-stih407-usb.c
      F:        drivers/phy/phy-stih41x-usb.c
      F:        drivers/pinctrl/pinctrl-st.c
     +F:        drivers/remoteproc/st_remoteproc.c
      F:        drivers/reset/sti/
      F:        drivers/rtc/rtc-st-lpc.c
      F:        drivers/tty/serial/st-asc.c
@@@@@@@ -1841,7 -1836,7 -1836,7 -1836,7 -1836,7 -1771,6 +1841,7 @@@@@@@ F:      */*/vexpress
      F:        */*/*/vexpress*
      F:        drivers/clk/versatile/clk-vexpress-osc.c
      F:        drivers/clocksource/versatile.c
     +N:        mps2
      
      ARM/VFP SUPPORT
      M:        Russell King <[email protected]>
@@@@@@@ -1956,16 -1951,16 -1951,16 -1951,16 -1951,16 -1885,6 +1956,16 @@@@@@@ L:        [email protected]
      S:        Maintained
      F:        drivers/platform/x86/asus-wireless.c
      
     +ASYMMETRIC KEYS
     +M:        David Howells <[email protected]>
     +L:        [email protected]
     +S:        Maintained
     +F:        Documentation/crypto/asymmetric-keys.txt
     +F:        include/linux/verification.h
     +F:        include/crypto/public_key.h
     +F:        include/crypto/pkcs7.h
     +F:        crypto/asymmetric_keys/
     +
      ASYNCHRONOUS TRANSFERS/TRANSFORMS (IOAT) API
      R:        Dan Williams <[email protected]>
      W:        http://sourceforge.net/projects/xscaleiop
@@@@@@@ -2077,11 -2072,11 -2072,11 -2072,11 -2072,11 -1996,6 +2077,11 @@@@@@@ M:        Nicolas Ferre <[email protected]
      S:        Supported
      F:        drivers/tty/serial/atmel_serial.c
      
     +ATMEL AT91 SAMA5D2-Compatible Shutdown Controller
     +M:        Nicolas Ferre <[email protected]>
     +S:        Supported
     +F:        drivers/power/reset/at91-sama5d2_shdwc.c
     +
      ATMEL SAMA5D2 ADC DRIVER
      M:        Ludovic Desroches <[email protected]>
      L:        [email protected]
@@@@@@@ -2247,8 -2242,7 -2242,7 -2242,7 -2242,7 -2161,7 +2247,8 @@@@@@@ F:      include/net/ax25.
      F:        net/ax25/
      
      AZ6007 DVB DRIVER
 -----M:        Mauro Carvalho Chehab <[email protected]>
 +++++M:        Mauro Carvalho Chehab <[email protected]>
 +++++M:        Mauro Carvalho Chehab <[email protected]>
      L:        [email protected]
      W:        https://linuxtv.org
      T:        git git://linuxtv.org/media_tree.git
@@@@@@@ -2290,13 -2284,13 -2284,13 -2284,13 -2284,13 -2203,10 +2290,13 @@@@@@@ BATMAN ADVANCE
      M:        Marek Lindner <[email protected]>
      M:        Simon Wunderlich <[email protected]>
      M:        Antonio Quartulli <[email protected]>
     -L:        [email protected]
     +L:        [email protected] (moderated for non-subscribers)
      W:        https://www.open-mesh.org/
      Q:        https://patchwork.open-mesh.org/project/batman/list/
      S:        Maintained
     +F:        Documentation/ABI/testing/sysfs-class-net-batman-adv
     +F:        Documentation/ABI/testing/sysfs-class-net-mesh
     +F:        Documentation/networking/batman-adv.txt
      F:        net/batman-adv/
      
      BAYCOM/HDLCDRV DRIVERS FOR AX.25
@@@@@@@ -2310,7 -2304,7 -2304,7 -2304,7 -2304,7 -2220,7 +2310,7 @@@@@@@ BCACHE (BLOCK LAYER CACHE
      M:        Kent Overstreet <[email protected]>
      L:        [email protected]
      W:        http://bcache.evilpiepirate.org
     -S:        Maintained
     +S:        Orphan
      F:        drivers/md/bcache/
      
      BDISP ST MEDIA DRIVER
@@@@@@@ -2511,7 -2505,7 -2505,7 -2505,7 -2505,7 -2421,6 +2511,7 @@@@@@@ M:      Hauke Mehrtens <[email protected]
      M:        Rafał Miłecki <[email protected]>
      L:        [email protected]
      S:        Maintained
     +F:        Documentation/devicetree/bindings/mips/brcm/
      F:        arch/mips/bcm47xx/*
      F:        arch/mips/include/asm/mach-bcm47xx/*
      
@@@@@@@ -2715,8 -2709,7 -2709,7 -2709,7 -2709,7 -2624,7 +2715,8 @@@@@@@ F:      Documentation/filesystems/btrfs.tx
      F:        fs/btrfs/
      
      BTTV VIDEO4LINUX DRIVER
 -----M:        Mauro Carvalho Chehab <[email protected]>
 +++++M:        Mauro Carvalho Chehab <[email protected]>
 +++++M:        Mauro Carvalho Chehab <[email protected]>
      L:        [email protected]
      W:        https://linuxtv.org
      T:        git git://linuxtv.org/media_tree.git
@@@@@@@ -2780,9 -2773,9 -2773,9 -2773,9 -2773,9 -2688,9 +2780,9 @@@@@@@ F:      include/net/caif
      F:        net/caif/
      
      CALGARY x86-64 IOMMU
 -----M:        Muli Ben-Yehuda <muli@il.ibm.com>
 -----M:        "Jon D. Mason" <[email protected]>
 -----L:        discuss@x86-64.org
 +++++M:        Muli Ben-Yehuda <muli[email protected]>
 +++++M:        Jon Mason <[email protected]>
 +++++L:        [email protected].org
      S:        Maintained
      F:        arch/x86/kernel/pci-calgary_64.c
      F:        arch/x86/kernel/tce_64.c
@@@@@@@ -3093,7 -3086,6 -3086,6 -3086,6 -3086,6 -3001,6 +3093,7 @@@@@@@ M:      Stephen Boyd <[email protected]
      L:        [email protected]
      T:        git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git
      S:        Maintained
 +++++F:        Documentation/devicetree/bindings/clock/
      F:        drivers/clk/
      X:        drivers/clk/clkdev.c
      F:        include/linux/clk-pr*
@@@@@@@ -3351,8 -3343,7 -3343,7 -3343,7 -3343,7 -3258,7 +3351,8 @@@@@@@ S:      Maintaine
      F:        drivers/media/dvb-frontends/cx24120*
      
      CX88 VIDEO4LINUX DRIVER
 -----M:        Mauro Carvalho Chehab <[email protected]>
 +++++M:        Mauro Carvalho Chehab <[email protected]>
 +++++M:        Mauro Carvalho Chehab <[email protected]>
      L:        [email protected]
      W:        https://linuxtv.org
      T:        git git://linuxtv.org/media_tree.git
@@@@@@@ -3442,7 -3433,7 -3433,7 -3433,7 -3433,7 -3348,6 +3442,7 @@@@@@@ F:      Documentation/powerpc/cxlflash.tx
      
      STMMAC ETHERNET DRIVER
      M:        Giuseppe Cavallaro <[email protected]>
     +M:        Alexandre Torgue <[email protected]>
      L:        [email protected]
      W:        http://www.stlinux.com
      S:        Supported
@@@@@@@ -3634,15 -3625,15 -3625,15 -3625,15 -3625,15 -3539,6 +3634,15 @@@@@@@ F:        drivers/devfreq/devfreq-event.
      F:        include/linux/devfreq-event.h
      F:        Documentation/devicetree/bindings/devfreq/event/
      
     +BUS FREQUENCY DRIVER FOR SAMSUNG EXYNOS
     +M:        Chanwoo Choi <[email protected]>
     +L:        [email protected]
     +L:        [email protected]
     +T:        git git://git.kernel.org/pub/scm/linux/kernel/git/mzx/devfreq.git
     +S:        Maintained
     +F:        drivers/devfreq/exynos-bus.c
     +F:        Documentation/devicetree/bindings/devfreq/exynos-bus.txt
     +
      DEVICE NUMBER REGISTRY
      M:        Torben Mathiasen <[email protected]>
      W:        http://lanana.org/docs/device-list/index.html
@@@@@@@ -3782,7 -3773,6 -3773,6 -3773,6 -3773,6 -3678,6 +3782,7 @@@@@@@ Q:      https://patchwork.kernel.org/project
      S:        Maintained
      F:        drivers/dma/
      F:        include/linux/dmaengine.h
 +++++F:        Documentation/devicetree/bindings/dma/
      F:        Documentation/dmaengine/
      T:        git git://git.infradead.org/users/vkoul/slave-dma.git
      
@@@@@@@ -3864,25 -3854,25 -3854,25 -3854,25 -3854,25 -3759,9 +3864,25 @@@@@@@ T:        git git://people.freedesktop.org/~ai
      S:        Maintained
      F:        drivers/gpu/drm/
      F:        drivers/gpu/vga/
     +F:        Documentation/DocBook/gpu.*
      F:        include/drm/
      F:        include/uapi/drm/
      
     +DRM DRIVER FOR AST SERVER GRAPHICS CHIPS
     +M:        Dave Airlie <[email protected]>
     +S:        Odd Fixes
     +F:        drivers/gpu/drm/ast/
     +
     +DRM DRIVER FOR BOCHS VIRTUAL GPU
     +M:        Gerd Hoffmann <[email protected]>
     +S:        Odd Fixes
     +F:        drivers/gpu/drm/bochs/
     +
     +DRM DRIVER FOR QEMU'S CIRRUS DEVICE
     +M:        Dave Airlie <[email protected]>
     +S:        Odd Fixes
     +F:        drivers/gpu/drm/cirrus/
     +
      RADEON and AMDGPU DRM DRIVERS
      M:        Alex Deucher <[email protected]>
      M:        Christian König <[email protected]>
@@@@@@@ -3890,9 -3880,9 -3880,9 -3880,9 -3880,9 -3769,9 +3890,9 @@@@@@@ L:      [email protected]
      T:        git git://people.freedesktop.org/~agd5f/linux
      S:        Supported
      F:        drivers/gpu/drm/radeon/
     -F:        include/uapi/drm/radeon*
     +F:        include/uapi/drm/radeon_drm.h
      F:        drivers/gpu/drm/amd/
     -F:        include/uapi/drm/amdgpu*
     +F:        include/uapi/drm/amdgpu_drm.h
      
      DRM PANEL DRIVERS
      M:        Thierry Reding <[email protected]>
@@@@@@@ -3915,7 -3905,7 -3905,7 -3905,7 -3905,7 -3794,7 +3915,7 @@@@@@@ T:      git git://anongit.freedesktop.org/dr
      S:        Supported
      F:        drivers/gpu/drm/i915/
      F:        include/drm/i915*
     -F:        include/uapi/drm/i915*
     +F:        include/uapi/drm/i915_drm.h
      
      DRM DRIVERS FOR ATMEL HLCDC
      M:        Boris Brezillon <[email protected]>
@@@@@@@ -3924,13 -3914,13 -3914,13 -3914,13 -3914,13 -3803,6 +3924,13 @@@@@@@ S:        Supporte
      F:        drivers/gpu/drm/atmel-hlcdc/
      F:        Documentation/devicetree/bindings/drm/atmel/
      
     +DRM DRIVERS FOR ALLWINNER A10
     +M:        Maxime Ripard  <[email protected]>
     +L:        [email protected]
     +S:        Supported
     +F:        drivers/gpu/drm/sun4i/
     +F:        Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt
     +
      DRM DRIVERS FOR EXYNOS
      M:        Inki Dae <[email protected]>
      M:        Joonyoung Shim <[email protected]>
@@@@@@@ -3940,8 -3930,8 -3930,8 -3930,8 -3930,8 -3812,8 +3940,8 @@@@@@@ L:      [email protected]
      T:        git git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos.git
      S:        Supported
      F:        drivers/gpu/drm/exynos/
     -F:        include/drm/exynos*
     -F:        include/uapi/drm/exynos*
     +F:        include/uapi/drm/exynos_drm.h
     +F:        Documentation/devicetree/bindings/display/exynos/
      
      DRM DRIVERS FOR FREESCALE DCU
      M:        Stefan Agner <[email protected]>
@@@@@@@ -3950,7 -3940,7 -3940,7 -3940,7 -3940,7 -3822,6 +3950,7 @@@@@@@ L:      [email protected]
      S:        Supported
      F:        drivers/gpu/drm/fsl-dcu/
      F:        Documentation/devicetree/bindings/display/fsl,dcu.txt
     +F:        Documentation/devicetree/bindings/display/fsl,tcon.txt
      F:        Documentation/devicetree/bindings/display/panel/nec,nl4827hc19_05b.txt
      
      DRM DRIVERS FOR FREESCALE IMX
@@@@@@@ -3966,45 -3956,45 -3956,45 -3956,45 -3956,45 -3837,12 +3966,45 @@@@@@@ M:       Patrik Jakobsson <patrik.r.jakobsson
      L:        [email protected]
      T:        git git://github.com/patjak/drm-gma500
      S:        Maintained
     -F:        drivers/gpu/drm/gma500
     -F:        include/drm/gma500*
     +F:        drivers/gpu/drm/gma500/
     +
     +DRM DRIVERS FOR HISILICON
     +M:        Xinliang Liu <[email protected]>
     +R:        Xinwei Kong <[email protected]>
     +R:        Chen Feng <[email protected]>
     +L:        [email protected]
     +T:        git git://github.com/xin3liang/linux.git
     +S:        Maintained
     +F:        drivers/gpu/drm/hisilicon/
     +F:        Documentation/devicetree/bindings/display/hisilicon/
     +
     +DRM DRIVER FOR INTEL I810 VIDEO CARDS
     +S:        Orphan / Obsolete
     +F:        drivers/gpu/drm/i810/
     +F:        include/uapi/drm/i810_drm.h
     +
     +DRM DRIVER FOR MSM ADRENO GPU
     +M:        Rob Clark <[email protected]>
     +L:        [email protected]
     +L:        [email protected]
     +L:        [email protected]
     +T:        git git://people.freedesktop.org/~robclark/linux
     +S:        Maintained
     +F:        drivers/gpu/drm/msm/
     +F:        include/uapi/drm/msm_drm.h
     +F:        Documentation/devicetree/bindings/display/msm/
     +
     +DRM DRIVER FOR NVIDIA GEFORCE/QUADRO GPUS
     +M:        Ben Skeggs <[email protected]>
     +L:        [email protected]
     +L:        [email protected]
     +T:        git git://github.com/skeggsb/linux
     +S:        Supported
     +F:        drivers/gpu/drm/nouveau/
     +F:        include/uapi/drm/nouveau_drm.h
      
      DRM DRIVERS FOR NVIDIA TEGRA
      M:        Thierry Reding <[email protected]>
     -M:        Terje Bergström <[email protected]>
      L:        [email protected]
      L:        [email protected]
      T:        git git://anongit.freedesktop.org/tegra/linux.git
@@@@@@@ -4015,54 -4005,54 -4005,54 -4005,54 -4005,54 -3853,22 +4015,54 @@@@@@@ F:       include/linux/host1x.
      F:        include/uapi/drm/tegra_drm.h
      F:        Documentation/devicetree/bindings/display/tegra/nvidia,tegra20-host1x.txt
      
     +DRM DRIVER FOR MATROX G200/G400 GRAPHICS CARDS
     +S:        Orphan / Obsolete
     +F:        drivers/gpu/drm/mga/
     +F:        include/uapi/drm/mga_drm.h
     +
     +DRM DRIVER FOR MGA G200 SERVER GRAPHICS CHIPS
     +M:        Dave Airlie <[email protected]>
     +S:        Odd Fixes
     +F:        drivers/gpu/drm/mgag200/
     +
     +DRM DRIVER FOR RAGE 128 VIDEO CARDS
     +S:        Orphan / Obsolete
     +F:        drivers/gpu/drm/r128/
     +F:        include/uapi/drm/r128_drm.h
     +
      DRM DRIVERS FOR RENESAS
      M:        Laurent Pinchart <[email protected]>
      L:        [email protected]
      L:        [email protected]
     -T:        git git://people.freedesktop.org/~airlied/linux
     +T:        git git://linuxtv.org/pinchartl/fbdev
      S:        Supported
      F:        drivers/gpu/drm/rcar-du/
      F:        drivers/gpu/drm/shmobile/
      F:        include/linux/platform_data/shmob_drm.h
     +F:        Documentation/devicetree/bindings/display/renesas,du.txt
     +
     +DRM DRIVER FOR QXL VIRTUAL GPU
     +M:        Dave Airlie <[email protected]>
     +S:        Odd Fixes
     +F:        drivers/gpu/drm/qxl/
     +F:        include/uapi/drm/qxl_drm.h
      
      DRM DRIVERS FOR ROCKCHIP
      M:        Mark Yao <[email protected]>
      L:        [email protected]
      S:        Maintained
      F:        drivers/gpu/drm/rockchip/
     -F:        Documentation/devicetree/bindings/display/rockchip*
     +F:        Documentation/devicetree/bindings/display/rockchip/
     +
     +DRM DRIVER FOR SAVAGE VIDEO CARDS
     +S:        Orphan / Obsolete
     +F:        drivers/gpu/drm/savage/
     +F:        include/uapi/drm/savage_drm.h
     +
     +DRM DRIVER FOR SIS VIDEO CARDS
     +S:        Orphan / Obsolete
     +F:        drivers/gpu/drm/sis/
     +F:        include/uapi/drm/sis_drm.h
      
      DRM DRIVERS FOR STI
      M:        Benjamin Gaignard <[email protected]>
@@@@@@@ -4073,43 -4063,43 -4063,43 -4063,43 -4063,43 -3879,14 +4073,43 @@@@@@@ S:       Maintaine
      F:        drivers/gpu/drm/sti
      F:        Documentation/devicetree/bindings/display/st,stih4xx.txt
      
     +DRM DRIVER FOR TDFX VIDEO CARDS
     +S:        Orphan / Obsolete
     +F:        drivers/gpu/drm/tdfx/
     +
     +DRM DRIVER FOR USB DISPLAYLINK VIDEO ADAPTERS
     +M:        Dave Airlie <[email protected]>
     +S:        Odd Fixes
     +F:        drivers/gpu/drm/udl/
     +
      DRM DRIVERS FOR VIVANTE GPU IP
      M:        Lucas Stach <[email protected]>
      R:        Russell King <[email protected]>
      R:        Christian Gmeiner <[email protected]>
      L:        [email protected]
      S:        Maintained
     -F:        drivers/gpu/drm/etnaviv
     -F:        Documentation/devicetree/bindings/display/etnaviv
     +F:        drivers/gpu/drm/etnaviv/
     +F:        include/uapi/drm/etnaviv_drm.h
     +F:        Documentation/devicetree/bindings/display/etnaviv/
     +
     +DRM DRIVER FOR VMWARE VIRTUAL GPU
     +M:        "VMware Graphics" <[email protected]>
     +M:        Sinclair Yeh <[email protected]>
     +M:        Thomas Hellstrom <[email protected]>
     +L:        [email protected]
     +T:        git git://people.freedesktop.org/~syeh/repos_linux
     +T:        git git://people.freedesktop.org/~thomash/linux
     +S:        Supported
     +F:        drivers/gpu/drm/vmwgfx/
     +F:        include/uapi/drm/vmwgfx_drm.h
     +
     +DRM DRIVERS FOR VC4
     +M:        Eric Anholt <[email protected]>
     +T:        git git://github.com/anholt/linux
     +S:        Supported
     +F:        drivers/gpu/drm/vc4/
     +F:        include/uapi/drm/vc4_drm.h
     +F:        Documentation/devicetree/bindings/display/brcm,bcm-vc4.txt
      
      DSBR100 USB FM RADIO DRIVER
      M:        Alexey Klimov <[email protected]>
@@@@@@@ -4300,8 -4290,7 -4290,7 -4290,7 -4290,7 -4077,7 +4300,8 @@@@@@@ F:      fs/ecryptfs
      EDAC-CORE
      M:        Doug Thompson <[email protected]>
      M:        Borislav Petkov <[email protected]>
 -----M:        Mauro Carvalho Chehab <[email protected]>
 +++++M:        Mauro Carvalho Chehab <[email protected]>
 +++++M:        Mauro Carvalho Chehab <[email protected]>
      L:        [email protected]
      T:        git git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git for-next
      T:        git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac.git linux_next
@@@@@@@ -4346,8 -4335,7 -4335,7 -4335,7 -4335,7 -4122,7 +4346,8 @@@@@@@ S:      Maintaine
      F:        drivers/edac/e7xxx_edac.c
      
      EDAC-GHES
 -----M:        Mauro Carvalho Chehab <[email protected]>
 +++++M:        Mauro Carvalho Chehab <[email protected]>
 +++++M:        Mauro Carvalho Chehab <[email protected]>
      L:        [email protected]
      S:        Maintained
      F:        drivers/edac/ghes_edac.c
@@@@@@@ -4371,22 -4359,19 -4359,19 -4359,19 -4359,19 -4146,19 +4371,22 @@@@@@@ S:       Maintaine
      F:        drivers/edac/i5000_edac.c
      
      EDAC-I5400
 -----M:        Mauro Carvalho Chehab <[email protected]>
 +++++M:        Mauro Carvalho Chehab <[email protected]>
 +++++M:        Mauro Carvalho Chehab <[email protected]>
      L:        [email protected]
      S:        Maintained
      F:        drivers/edac/i5400_edac.c
      
      EDAC-I7300
 -----M:        Mauro Carvalho Chehab <[email protected]>
 +++++M:        Mauro Carvalho Chehab <[email protected]>
 +++++M:        Mauro Carvalho Chehab <[email protected]>
      L:        [email protected]
      S:        Maintained
      F:        drivers/edac/i7300_edac.c
      
      EDAC-I7CORE
 -----M:        Mauro Carvalho Chehab <[email protected]>
 +++++M:        Mauro Carvalho Chehab <[email protected]>
 +++++M:        Mauro Carvalho Chehab <[email protected]>
      L:        [email protected]
      S:        Maintained
      F:        drivers/edac/i7core_edac.c
@@@@@@@ -4423,8 -4408,7 -4408,7 -4408,7 -4408,7 -4195,7 +4423,8 @@@@@@@ S:      Maintaine
      F:        drivers/edac/r82600_edac.c
      
      EDAC-SBRIDGE
 -----M:        Mauro Carvalho Chehab <[email protected]>
 +++++M:        Mauro Carvalho Chehab <[email protected]>
 +++++M:        Mauro Carvalho Chehab <[email protected]>
      L:        [email protected]
      S:        Maintained
      F:        drivers/edac/sb_edac.c
@@@@@@@ -4483,8 -4467,7 -4467,7 -4467,7 -4467,7 -4254,7 +4483,8 @@@@@@@ S:      Maintaine
      F:        drivers/net/ethernet/ibm/ehea/
      
      EM28XX VIDEO4LINUX DRIVER
 -----M:        Mauro Carvalho Chehab <[email protected]>
 +++++M:        Mauro Carvalho Chehab <[email protected]>
 +++++M:        Mauro Carvalho Chehab <[email protected]>
      L:        [email protected]
      W:        https://linuxtv.org
      T:        git git://linuxtv.org/media_tree.git
@@@@@@@ -4609,12 -4592,12 -4592,12 -4592,12 -4592,12 -4379,6 +4609,12 @@@@@@@ S:        Maintaine
      F:        drivers/video/fbdev/exynos/exynos_mipi*
      F:        include/video/exynos_mipi*
      
     +EZchip NPS platform support
     +M:        Noam Camus <[email protected]>
     +S:        Supported
     +F:        arch/arc/plat-eznps
     +F:        arch/arc/boot/dts/eznps.dts
     +
      F71805F HARDWARE MONITORING DRIVER
      M:        Jean Delvare <[email protected]>
      L:        [email protected]
@@@@@@@ -4897,7 -4880,7 -4880,7 -4880,7 -4880,7 -4661,6 +4897,7 @@@@@@@ FREESCALE SOC SOUND DRIVER
      M:        Timur Tabi <[email protected]>
      M:        Nicolin Chen <[email protected]>
      M:        Xiubo Li <[email protected]>
     +R:        Fabio Estevam <[email protected]>
      L:        [email protected] (moderated for non-subscribers)
      L:        [email protected]
      S:        Maintained
@@@@@@@ -4907,7 -4890,7 -4890,7 -4890,7 -4890,7 -4670,6 +4907,7 @@@@@@@ F:      sound/soc/fsl/mpc8610_hpcd.
      
      FREESCALE QORIQ MANAGEMENT COMPLEX DRIVER
      M:        "J. German Rivera" <[email protected]>
     +M:        Stuart Yoder <[email protected]>
      L:        [email protected]
      S:        Maintained
      F:        drivers/staging/fsl-mc/
@@@@@@@ -4945,7 -4928,7 -4928,7 -4928,7 -4928,7 -4707,7 +4945,7 @@@@@@@ F:      include/linux/fscache*.
      F2FS FILE SYSTEM
      M:        Jaegeuk Kim <[email protected]>
      M:        Changman Lee <[email protected]>
     -R:        Chao Yu <chao2.yu@samsung.com>
     +R:        Chao Yu <yuchao0@huawei.com>
      L:        [email protected]
      W:        http://en.wikipedia.org/wiki/F2FS
      T:        git git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git
@@@@@@@ -5011,7 -4994,7 -4994,7 -4994,7 -4994,7 -4773,6 +5011,7 @@@@@@@ F:      drivers/scsi/gdt
      
      GDB KERNEL DEBUGGING HELPER SCRIPTS
      M:        Jan Kiszka <[email protected]>
     +M:        Kieran Bingham <[email protected]>
      S:        Supported
      F:        scripts/gdb/
      
@@@@@@@ -5123,7 -5106,7 -5106,7 -5106,7 -5106,7 -4884,6 +5123,7 @@@@@@@ M:      Alexandre Courbot <[email protected]
      L:        [email protected]
      T:        git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git
      S:        Maintained
     +F:        Documentation/devicetree/bindings/gpio/
      F:        Documentation/gpio/
      F:        Documentation/ABI/testing/gpio-cdev
      F:        Documentation/ABI/obsolete/sysfs-gpio
@@@@@@@ -5326,13 -5309,13 -5309,13 -5309,13 -5309,13 -5086,6 +5326,13 @@@@@@@ F:        drivers/block/cciss
      F:        include/linux/cciss_ioctl.h
      F:        include/uapi/linux/cciss_ioctl.h
      
     +HFI1 DRIVER
     +M:        Mike Marciniszyn <[email protected]>
     +M:        Dennis Dalessandro <[email protected]>
     +L:        [email protected]
     +S:        Supported
     +F:        drivers/infiniband/hw/hfi1
     +
      HFS FILESYSTEM
      L:        [email protected]
      S:        Orphan
@@@@@@@ -5522,7 -5505,7 -5505,7 -5505,7 -5505,7 -5275,6 +5522,7 @@@@@@@ I2C MUXE
      M:        Peter Rosin <[email protected]>
      L:        [email protected]
      S:        Maintained
     +F:        Documentation/i2c/i2c-topology
      F:        Documentation/i2c/muxes/
      F:        Documentation/devicetree/bindings/i2c/i2c-mux*
      F:        drivers/i2c/i2c-mux.c
@@@@@@@ -5787,7 -5770,7 -5770,7 -5770,7 -5770,7 -5539,7 +5787,7 @@@@@@@ IIO SUBSYSTEM AND DRIVER
      M:        Jonathan Cameron <[email protected]>
      R:        Hartmut Knaack <[email protected]>
      R:        Lars-Peter Clausen <[email protected]>
     -R:        Peter Meerwald <[email protected]>
     +R:        Peter Meerwald-Stadler <[email protected]>
      L:        [email protected]
      S:        Maintained
      F:        drivers/iio/
@@@@@@@ -5862,6 -5845,6 -5845,6 -5845,6 -5845,6 -5614,7 +5862,6 @@@@@@@ T:      git git://git.kernel.org/pub/scm/lin
      S:        Supported
      F:        Documentation/infiniband/
      F:        drivers/infiniband/
     -F:        drivers/staging/rdma/
      F:        include/uapi/linux/if_infiniband.h
      F:        include/uapi/rdma/
      F:        include/rdma/
@@@@@@@ -5991,6 -5974,6 -5974,6 -5974,6 -5974,6 -5744,13 +5991,6 @@@@@@@ F:     drivers/char/hw_random/ixp4xx-rng.
      
      INTEL ETHERNET DRIVERS
      M:        Jeff Kirsher <[email protected]>
     -R:        Jesse Brandeburg <[email protected]>
     -R:        Shannon Nelson <[email protected]>
     -R:        Carolyn Wyborny <[email protected]>
     -R:        Don Skidmore <[email protected]>
     -R:        Bruce Allan <[email protected]>
     -R:        John Ronciak <[email protected]>
     -R:        Mitch Williams <[email protected]>
      L:        [email protected] (moderated for non-subscribers)
      W:        http://www.intel.com/support/feedback.htm
      W:        http://e1000.sourceforge.net/
@@@@@@@ -6070,7 -6053,7 -6053,7 -6053,7 -6053,7 -5830,6 +6070,7 @@@@@@@ F:      drivers/net/wireless/intel/iwlegacy
      INTEL WIRELESS WIFI LINK (iwlwifi)
      M:        Johannes Berg <[email protected]>
      M:        Emmanuel Grumbach <[email protected]>
     +M:        Luca Coelho <[email protected]>
      M:        Intel Linux Wireless <[email protected]>
      L:        [email protected]
      W:        http://intellinuxwireless.org
@@@@@@@ -6120,14 -6103,14 -6103,14 -6103,14 -6103,14 -5879,6 +6120,14 @@@@@@@ S:        Maintaine
      F:        arch/x86/include/asm/intel_telemetry.h
      F:        drivers/platform/x86/intel_telemetry*
      
     +INTEL PMC CORE DRIVER
     +M:        Rajneesh Bhardwaj <[email protected]>
     +M:        Vishwanath Somayaji <[email protected]>
     +L:        [email protected]
     +S:        Maintained
     +F:        arch/x86/include/asm/pmc_core.h
     +F:        drivers/platform/x86/intel_pmc_core*
     +
      IOC3 ETHERNET DRIVER
      M:        Ralf Baechle <[email protected]>
      L:        [email protected]
@@@@@@@ -6244,13 -6227,13 -6227,13 -6227,13 -6227,13 -5995,6 +6244,13 @@@@@@@ F:        include/linux/irqdomain.
      F:        kernel/irq/irqdomain.c
      F:        kernel/irq/msi.c
      
     +ISA
     +M:        William Breathitt Gray <[email protected]>
     +S:        Maintained
     +F:        Documentation/isa.txt
     +F:        drivers/base/isa.c
     +F:        include/linux/isa.h
     +
      ISAPNP
      M:        Jaroslav Kysela <[email protected]>
      S:        Maintained
@@@@@@@ -6431,7 -6414,7 -6414,7 -6414,7 -6414,7 -6175,7 +6431,7 @@@@@@@ S:      Maintaine
      F:        arch/*/include/asm/kasan.h
      F:        arch/*/mm/kasan_init*
      F:        Documentation/kasan.txt
     -F:        include/linux/kasan.h
     +F:        include/linux/kasan*.h
      F:        lib/test_kasan.c
      F:        mm/kasan/
      F:        scripts/Makefile.kasan
@@@@@@@ -6445,9 -6428,9 -6428,9 -6428,9 -6428,9 -6189,8 +6445,9 @@@@@@@ F:      Documentation/kbuild/kconfig-languag
      F:        scripts/kconfig/
      
      KDUMP
     -M:        Vivek Goyal <[email protected]>
     -M:        Haren Myneni <[email protected]>
     +M:        Dave Young <[email protected]>
     +M:        Baoquan He <[email protected]>
     +R:        Vivek Goyal <[email protected]>
      L:        [email protected]
      W:        http://lse.sourceforge.net/kdump/
      S:        Maintained
@@@@@@@ -6503,7 -6486,6 -6486,6 -6486,6 -6486,6 -6246,6 +6503,7 @@@@@@@ F:      include/uapi/linux/sunrpc
      
      KERNEL SELFTEST FRAMEWORK
      M:        Shuah Khan <[email protected]>
 +++++M:        Shuah Khan <[email protected]>
      L:        [email protected]
      T:        git git://git.kernel.org/pub/scm/shuah/linux-kselftest
      S:        Maintained
@@@@@@@ -6525,7 -6507,7 -6507,7 -6507,7 -6507,7 -6267,6 +6525,7 @@@@@@@ F:      arch/*/include/asm/kvm
      F:        include/linux/kvm*
      F:        include/uapi/linux/kvm*
      F:        virt/kvm/
     +F:        tools/kvm/
      
      KERNEL VIRTUAL MACHINE (KVM) FOR AMD-V
      M:        Joerg Roedel <[email protected]>
@@@@@@@ -6594,7 -6576,7 -6576,7 -6576,7 -6576,7 -6335,7 +6594,7 @@@@@@@ L:      [email protected]
      S:        Maintained
      F:        include/linux/kexec.h
      F:        include/uapi/linux/kexec.h
     -F:        kernel/kexec.c
     +F:        kernel/kexec*
      
      KEYS/KEYRINGS:
      M:        David Howells <[email protected]>
@@@@@@@ -6603,8 -6585,8 -6585,8 -6585,8 -6585,8 -6344,6 +6603,8 @@@@@@@ S:      Maintaine
      F:        Documentation/security/keys.txt
      F:        include/linux/key.h
      F:        include/linux/key-type.h
     +F:        include/linux/keyctl.h
     +F:        include/uapi/linux/keyctl.h
      F:        include/keys/
      F:        security/keys/
      
@@@@@@@ -6687,7 -6669,7 -6669,7 -6669,7 -6669,7 -6426,7 +6687,7 @@@@@@@ F:      net/l3mde
      F:        include/net/l3mdev.h
      
      LANTIQ MIPS ARCHITECTURE
     -M:        John Crispin <blogic@openwrt.org>
     +M:        John Crispin <john@phrozen.org>
      L:        [email protected]
      S:        Maintained
      F:        arch/mips/lantiq
@@@@@@@ -6869,19 -6851,19 -6851,19 -6851,19 -6851,19 -6608,6 +6869,19 @@@@@@@ T:        git git://git.kernel.org/pub/scm/lin
      S:        Supported
      F:        Documentation/powerpc/
      F:        arch/powerpc/
     +F:        drivers/char/tpm/tpm_ibmvtpm*
     +F:        drivers/crypto/nx/
     +F:        drivers/crypto/vmx/
     +F:        drivers/net/ethernet/ibm/ibmveth.*
     +F:        drivers/net/ethernet/ibm/ibmvnic.*
     +F:        drivers/pci/hotplug/rpa*
     +F:        drivers/scsi/ibmvscsi/
     +N:        opal
     +N:        /pmac
     +N:        powermac
     +N:        powernv
     +N:        [^a-z0-9]ps3
     +N:        pseries
      
      LINUX FOR POWER MACINTOSH
      M:        Benjamin Herrenschmidt <[email protected]>
@@@@@@@ -6962,7 -6944,7 -6944,7 -6944,7 -6944,7 -6688,6 +6962,7 @@@@@@@ F:      kernel/livepatch
      F:        include/linux/livepatch.h
      F:        arch/x86/include/asm/livepatch.h
      F:        arch/x86/kernel/livepatch.c
     +F:        Documentation/livepatch/
      F:        Documentation/ABI/testing/sysfs-kernel-livepatch
      F:        samples/livepatch/
      L:        [email protected]
@@@@@@@ -7051,6 -7033,6 -7033,6 -7033,6 -7033,6 -6776,12 +7051,6 @@@@@@@ W:     logfs.or
      S:        Maintained
      F:        fs/logfs/
      
     -LPC32XX MACHINE SUPPORT
     -M:        Roland Stigge <[email protected]>
     -L:        [email protected] (moderated for non-subscribers)
     -S:        Maintained
     -F:        arch/arm/mach-lpc32xx/
     -
      LSILOGIC MPT FUSION DRIVERS (FC/SAS/SPI)
      M:        Sathya Prakash <[email protected]>
      M:        Chaitra P B <[email protected]>
@@@@@@@ -7177,8 -7159,8 -7159,8 -7159,8 -7159,8 -6908,6 +7177,8 @@@@@@@ MARVELL ARMADA DRM SUPPOR
      M:        Russell King <[email protected]>
      S:        Maintained
      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]>
@@@@@@@ -7291,9 -7273,9 -7273,9 -7273,9 -7273,9 -7020,9 +7291,9 @@@@@@@ M:      Chanwoo Choi <[email protected]
      M:        Krzysztof Kozlowski <[email protected]>
      L:        [email protected]
      S:        Supported
     -F:        drivers/*/max14577.c
     +F:        drivers/*/max14577*.c
      F:        drivers/*/max77686*.c
     -F:        drivers/*/max77693.c
     +F:        drivers/*/max77693*.c
      F:        drivers/extcon/extcon-max14577.c
      F:        drivers/extcon/extcon-max77693.c
      F:        drivers/rtc/rtc-max77686.c
@@@@@@@ -7375,8 -7357,7 -7357,7 -7357,7 -7357,7 -7104,7 +7375,8 @@@@@@@ S:      Supporte
      F:        drivers/media/pci/netup_unidvb/*
      
      MEDIA INPUT INFRASTRUCTURE (V4L/DVB)
 -----M:        Mauro Carvalho Chehab <[email protected]>
 +++++M:        Mauro Carvalho Chehab <[email protected]>
 +++++M:        Mauro Carvalho Chehab <[email protected]>
      P:        LinuxTV.org Project
      L:        [email protected]
      W:        https://linuxtv.org
@@@@@@@ -7424,7 -7405,7 -7405,7 -7405,7 -7405,7 -7152,7 +7424,7 @@@@@@@ F:      drivers/scsi/megaraid.
      F:        drivers/scsi/megaraid/
      
      MELLANOX ETHERNET DRIVER (mlx4_en)
 -----M:        Eugenia Emantayev <eugenia@mellanox.com>
 +++++M:        Tariq Toukan <tariqt@mellanox.com>
      L:        [email protected]
      S:        Supported
      W:        http://www.mellanox.com
@@@@@@@ -7541,19 -7522,19 -7522,19 -7522,19 -7522,19 -7269,9 +7541,19 @@@@@@@ W:        http://www.linux-mips.org
      T:        git git://git.linux-mips.org/pub/scm/ralf/linux.git
      Q:        http://patchwork.linux-mips.org/project/linux-mips/list/
      S:        Supported
     +F:        Documentation/devicetree/bindings/mips/
      F:        Documentation/mips/
      F:        arch/mips/
      
     +MIPS/LOONGSON1 ARCHITECTURE
     +M:        Keguang Zhang <[email protected]>
     +L:        [email protected]
     +S:        Maintained
     +F:        arch/mips/loongson32/
     +F:        arch/mips/include/asm/mach-loongson32/
     +F:        drivers/*/*loongson1*
     +F:        drivers/*/*/*loongson1*
     +
      MIROSOUND PCM20 FM RADIO RECEIVER DRIVER
      M:        Hans Verkuil <[email protected]>
      L:        [email protected]
@@@@@@@ -7821,10 -7802,10 -7802,10 -7802,10 -7802,10 -7539,10 +7821,10 @@@@@@@ M:       Michael Schmitz <[email protected]
      L:        [email protected]
      S:        Maintained
      F:        Documentation/scsi/g_NCR5380.txt
     +F:        Documentation/scsi/dtc3x80.txt
      F:        drivers/scsi/NCR5380.*
      F:        drivers/scsi/arm/cumana_1.c
      F:        drivers/scsi/arm/oak.c
     -F:        drivers/scsi/atari_NCR5380.c
      F:        drivers/scsi/atari_scsi.*
      F:        drivers/scsi/dmx3191d.c
      F:        drivers/scsi/dtc.*
@@@@@@@ -8008,7 -7989,6 -7989,6 -7989,6 -7989,6 -7726,6 +8008,7 @@@@@@@ Q:      http://patchwork.ozlabs.org/project/
      T:        git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git
      T:        git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git
      S:        Odd Fixes
 +++++F:        Documentation/devicetree/bindings/net/
      F:        drivers/net/
      F:        include/linux/if_*
      F:        include/linux/netdevice.h
@@@@@@@ -8027,7 -8007,6 -8007,6 -8007,6 -8007,6 -7744,6 +8027,7 @@@@@@@ Q:      http://patchwork.kernel.org/project/
      T:        git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git
      T:        git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git
      S:        Maintained
 +++++F:        Documentation/devicetree/bindings/net/wireless/
      F:        drivers/net/wireless/
      
      NETXEN (1/10) GbE SUPPORT
@@@@@@@ -8078,7 -8057,7 -8057,7 -8057,7 -8057,7 -7794,6 +8078,7 @@@@@@@ NILFS2 FILESYSTE
      M:        Ryusuke Konishi <[email protected]>
      L:        [email protected]
      W:        http://nilfs.sourceforge.net/
     +W:        http://nilfs.osdn.jp/
      T:        git git://github.com/konis/nilfs2.git
      S:        Supported
      F:        Documentation/filesystems/nilfs2.txt
@@@@@@@ -8425,9 -8404,10 -8404,10 -8404,10 -8404,10 -8140,10 +8425,9 @@@@@@@ F: drivers/i2c/busses/i2c-ocores.
      OPEN FIRMWARE AND FLATTENED DEVICE TREE
      M:        Rob Herring <[email protected]>
      M:        Frank Rowand <[email protected]>
 -----M:        Grant Likely <[email protected]>
      L:        [email protected]
      W:        http://www.devicetree.org/
 -----T:        git git://git.kernel.org/pub/scm/linux/kernel/git/glikely/linux.git
 +++++T:        git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git
      S:        Maintained
      F:        drivers/of/
      F:        include/linux/of*.h
@@@@@@@ -8435,10 -8415,12 -8415,12 -8415,12 -8415,12 -8151,12 +8435,10 @@@@@@@ F:       scripts/dtc
      
      OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS
      M:        Rob Herring <[email protected]>
 -----M:        Pawel Moll <[email protected]>
      M:        Mark Rutland <[email protected]>
 -----M:        Ian Campbell <[email protected]>
 -----M:        Kumar Gala <[email protected]>
      L:        [email protected]
      T:        git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git
 +++++Q:        http://patchwork.ozlabs.org/project/devicetree-bindings/list/
      S:        Maintained
      F:        Documentation/devicetree/
      F:        arch/*/boot/dts/
@@@@@@@ -8456,6 -8438,6 -8438,6 -8438,6 -8438,6 -8174,7 +8456,6 @@@@@@@ F:      drivers/of/resolver.
      OPENRISC ARCHITECTURE
      M:        Jonas Bonn <[email protected]>
      W:        http://openrisc.net
     -L:        [email protected] (moderated for non-subscribers)
      S:        Maintained
      T:        git git://openrisc.net/~jonas/linux
      F:        arch/openrisc/
@@@@@@@ -8576,6 -8558,6 -8558,6 -8558,6 -8558,6 -8295,7 +8576,6 @@@@@@@ F:      drivers/platform/x86/panasonic-lapto
      
      PANASONIC MN10300/AM33/AM34 PORT
      M:        David Howells <[email protected]>
     -M:        Koichi Yasutake <[email protected]>
      L:        [email protected] (moderated for non-subscribers)
      W:        ftp://ftp.redhat.com/pub/redhat/gnupro/AM33/
      S:        Maintained
@@@@@@@ -8917,7 -8899,7 -8899,7 -8899,7 -8899,7 -8637,6 +8917,7 @@@@@@@ F:      arch/*/kernel/*/perf_event*.
      F:        arch/*/kernel/*/*/perf_event*.c
      F:        arch/*/include/asm/perf_event.h
      F:        arch/*/kernel/perf_callchain.c
     +F:        arch/*/events/*
      F:        tools/perf/
      
      PERSONALITY HANDLING
@@@@@@@ -8962,8 -8944,6 -8944,6 -8944,6 -8944,6 -8681,6 +8962,8 @@@@@@@ M:      Linus Walleij <linus.walleij@linaro.
      L:        [email protected]
      T:        git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git
      S:        Maintained
 +++++F:        Documentation/devicetree/bindings/pinctrl/
 +++++F:        Documentation/pinctrl.txt
      F:        drivers/pinctrl/
      F:        include/linux/pinctrl/
      
@@@@@@@ -9012,6 -8992,6 -8992,6 -8992,6 -8992,6 -8729,7 +9012,6 @@@@@@@ F:      drivers/pinctrl/pinctrl-single.
      
      PIN CONTROLLER - ST SPEAR
      M:        Viresh Kumar <[email protected]>
     -L:        [email protected]
      L:        [email protected] (moderated for non-subscribers)
      W:        http://www.st.com/spear
      S:        Maintained
@@@@@@@ -9473,7 -9453,7 -9453,7 -9453,7 -9453,7 -9191,7 +9473,7 @@@@@@@ S:      Maintaine
      F:        drivers/video/fbdev/aty/aty128fb.c
      
      RALINK MIPS ARCHITECTURE
     -M:        John Crispin <blogic@openwrt.org>
     +M:        John Crispin <john@phrozen.org>
      L:        [email protected]
      S:        Maintained
      F:        arch/mips/ralink
@@@@@@@ -9600,6 -9580,6 -9580,6 -9580,6 -9580,6 -9318,7 +9600,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
      
@@@@@@@ -9771,7 -9751,7 -9751,7 -9751,7 -9751,7 -9490,7 +9772,7 @@@@@@@ F:      drivers/net/wireless/realtek/rtlwifi
      RTL8XXXU WIRELESS DRIVER (rtl8xxxu)
      M:        Jes Sorensen <[email protected]>
      L:        [email protected]
     -T:        git git://git.kernel.org/pub/scm/linux/kernel/git/jes/linux.git rtl8723au-mac80211
     +T:        git git://git.kernel.org/pub/scm/linux/kernel/git/jes/linux.git rtl8xxxu-devel
      S:        Maintained
      F:        drivers/net/wireless/realtek/rtl8xxxu/
      
@@@@@@@ -9871,8 -9851,7 -9851,7 -9851,7 -9851,7 -9590,7 +9872,8 @@@@@@@ S:      Odd Fixe
      F:        drivers/media/i2c/saa6588*
      
      SAA7134 VIDEO4LINUX DRIVER
 -----M:        Mauro Carvalho Chehab <[email protected]>
 +++++M:        Mauro Carvalho Chehab <[email protected]>
 +++++M:        Mauro Carvalho Chehab <[email protected]>
      L:        [email protected]
      W:        https://linuxtv.org
      T:        git git://linuxtv.org/media_tree.git
@@@@@@@ -10037,7 -10016,7 -10016,7 -10016,7 -10016,7 -9755,6 +10038,7 @@@@@@@ F:        drivers/mmc/host/dw_mmc
      SYSTEM TRACE MODULE CLASS
      M:        Alexander Shishkin <[email protected]>
      S:        Maintained
     +T:        git git://git.kernel.org/pub/scm/linux/kernel/git/ash/stm.git
      F:        Documentation/trace/stm.txt
      F:        drivers/hwtracing/stm/
      F:        include/linux/stm.h
@@@@@@@ -10217,6 -10196,6 -10196,6 -10196,6 -10196,6 -9934,7 +10218,6 @@@@@@@ F:        drivers/mmc/host/sdhci-s3c
      
      SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) ST SPEAR DRIVER
      M:        Viresh Kumar <[email protected]>
     -L:        [email protected]
      L:        [email protected]
      S:        Maintained
      F:        drivers/mmc/host/sdhci-spear.c
@@@@@@@ -10254,12 -10233,12 -10233,12 -10233,12 -10233,12 -9972,6 +10255,12 @@@@@@@ T:  git git://git.kernel.org/pub/scm/lin
      S:        Supported
      F:        security/apparmor/
      
     +LOADPIN SECURITY MODULE
     +M:        Kees Cook <[email protected]>
     +T:        git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git lsm/loadpin
     +S:        Supported
     +F:        security/loadpin/
     +
      YAMA SECURITY MODULE
      M:        Kees Cook <[email protected]>
      T:        git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git yama/tip
@@@@@@@ -10391,8 -10370,7 -10370,7 -10370,7 -10370,7 -10103,7 +10392,8 @@@@@@@ S:       Maintaine
      F:        drivers/media/radio/si4713/radio-usb-si4713.c
      
      SIANO DVB DRIVER
 -----M:        Mauro Carvalho Chehab <[email protected]>
 +++++M:        Mauro Carvalho Chehab <[email protected]>
 +++++M:        Mauro Carvalho Chehab <[email protected]>
      L:        [email protected]
      W:        https://linuxtv.org
      T:        git git://linuxtv.org/media_tree.git
@@@@@@@ -10451,8 -10429,8 -10429,8 -10429,8 -10429,8 -10162,8 +10452,8 @@@@@@@ F:       arch/arm/mach-s3c24xx/bast-irq.
      TI DAVINCI MACHINE SUPPORT
      M:        Sekhar Nori <[email protected]>
      M:        Kevin Hilman <[email protected]>
     -T:        git git://gitorious.org/linux-davinci/linux-davinci.git
     -Q:        http://patchwork.kernel.org/project/linux-davinci/list/
     +L:        [email protected] (moderated for non-subscribers)
     +T:        git git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci.git
      S:        Supported
      F:        arch/arm/mach-davinci/
      F:        drivers/i2c/busses/i2c-davinci.c
@@@@@@@ -10780,6 -10758,6 -10758,6 -10758,6 -10758,6 -10491,7 +10781,6 @@@@@@@ F:       include/linux/compiler.
      SPEAR PLATFORM SUPPORT
      M:        Viresh Kumar <[email protected]>
      M:        Shiraz Hashim <[email protected]>
     -L:        [email protected]
      L:        [email protected] (moderated for non-subscribers)
      W:        http://www.st.com/spear
      S:        Maintained
@@@@@@@ -10788,6 -10766,6 -10766,6 -10766,6 -10766,6 -10500,7 +10789,6 @@@@@@@ F:       arch/arm/mach-spear
      
      SPEAR CLOCK FRAMEWORK SUPPORT
      M:        Viresh Kumar <[email protected]>
     -L:        [email protected]
      L:        [email protected] (moderated for non-subscribers)
      W:        http://www.st.com/spear
      S:        Maintained
@@@@@@@ -10950,6 -10928,6 -10928,6 -10928,6 -10928,6 -10663,12 +10951,6 @@@@@@@ M:      Arnaud Patard <arnaud.patard@rtp-net
      S:        Odd Fixes
      F:        drivers/staging/xgifb/
      
     -HFI1 DRIVER
     -M:        Mike Marciniszyn <[email protected]>
     -L:        [email protected]
     -S:        Supported
     -F:        drivers/staging/rdma/hfi1
     -
      STARFIRE/DURALAN NETWORK DRIVER
      M:        Ion Badulescu <[email protected]>
      S:        Odd Fixes
@@@@@@@ -11158,8 -11136,7 -11136,7 -11136,7 -11136,7 -10877,7 +11159,8 @@@@@@@ S:       Maintaine
      F:        drivers/media/i2c/tda9840*
      
      TEA5761 TUNER DRIVER
 -----M:        Mauro Carvalho Chehab <[email protected]>
 +++++M:        Mauro Carvalho Chehab <[email protected]>
 +++++M:        Mauro Carvalho Chehab <[email protected]>
      L:        [email protected]
      W:        https://linuxtv.org
      T:        git git://linuxtv.org/media_tree.git
@@@@@@@ -11167,8 -11144,7 -11144,7 -11144,7 -11144,7 -10885,7 +11168,8 @@@@@@@ S:       Odd fixe
      F:        drivers/media/tuners/tea5761.*
      
      TEA5767 TUNER DRIVER
 -----M:        Mauro Carvalho Chehab <[email protected]>
 +++++M:        Mauro Carvalho Chehab <[email protected]>
 +++++M:        Mauro Carvalho Chehab <[email protected]>
      L:        [email protected]
      W:        https://linuxtv.org
      T:        git git://linuxtv.org/media_tree.git
@@@@@@@ -11226,11 -11202,11 -11202,11 -11202,11 -11202,11 -10943,10 +11227,11 @@@@@@@ M:        Prashant Gaikwad <[email protected]
      S:        Supported
      F:        drivers/clk/tegra/
      
     -TEGRA DMA DRIVER
     +TEGRA DMA DRIVERS
      M:        Laxman Dewangan <[email protected]>
     +M:        Jon Hunter <[email protected]>
      S:        Supported
     -F:        drivers/dma/tegra20-apb-dma.c
     +F:        drivers/dma/tegra*
      
      TEGRA I2C DRIVER
      M:        Laxman Dewangan <[email protected]>
@@@@@@@ -11332,7 -11308,7 -11308,7 -11308,7 -11308,7 -11048,6 +11333,7 @@@@@@@ F:       drivers/platform/x86/thinkpad_acpi.
      
      TI BANDGAP AND THERMAL DRIVER
      M:        Eduardo Valentin <[email protected]>
     +M:        Keerthy <[email protected]>
      L:        [email protected]
      L:        [email protected]
      S:        Maintained
@@@@@@@ -11532,13 -11508,13 -11508,13 -11508,13 -11508,13 -11247,14 +11533,13 @@@@@@@ S:        Maintaine
      F:        drivers/media/i2c/tc358743*
      F:        include/media/i2c/tc358743.h
      
     -TMIO MMC DRIVER
     -M:        Ian Molton <[email protected]>
     +TMIO/SDHI MMC DRIVER
     +M:        Wolfram Sang <[email protected]>
      L:        [email protected]
     -S:        Maintained
     +S:        Supported
      F:        drivers/mmc/host/tmio_mmc*
      F:        drivers/mmc/host/sh_mobile_sdhi.c
     -F:        include/linux/mmc/tmio.h
     -F:        include/linux/mmc/sh_mobile_sdhi.h
     +F:        include/linux/mfd/tmio.h
      
      TMP401 HARDWARE MONITOR DRIVER
      M:        Guenter Roeck <[email protected]>
@@@@@@@ -11555,8 -11531,7 -11531,7 -11531,7 -11531,7 -11271,7 +11556,8 @@@@@@@ F:       include/linux/shmem_fs.
      F:        mm/shmem.c
      
      TM6000 VIDEO4LINUX DRIVER
 -----M:        Mauro Carvalho Chehab <[email protected]>
 +++++M:        Mauro Carvalho Chehab <[email protected]>
 +++++M:        Mauro Carvalho Chehab <[email protected]>
      L:        [email protected]
      W:        https://linuxtv.org
      T:        git git://linuxtv.org/media_tree.git
@@@@@@@ -11571,14 -11546,14 -11546,14 -11546,14 -11546,14 -11286,6 +11572,14 @@@@@@@ W: https://linuxtv.or
      S:        Odd Fixes
      F:        drivers/media/pci/tw68/
      
     +TW686X VIDEO4LINUX DRIVER
     +M:        Ezequiel Garcia <[email protected]>
     +L:        [email protected]
     +T:        git git://linuxtv.org/media_tree.git
     +W:        http://linuxtv.org
     +S:        Maintained
     +F:        drivers/media/pci/tw686x/
     +
      TPM DEVICE DRIVER
      M:        Peter Huewe <[email protected]>
      M:        Marcel Selhorst <[email protected]>
@@@@@@@ -11612,20 -11587,20 -11587,20 -11587,20 -11587,20 -11319,6 +11613,20 @@@@@@@ F: include/trace
      F:        kernel/trace/
      F:        tools/testing/selftests/ftrace/
      
     +TRACING MMIO ACCESSES (MMIOTRACE)
     +M:        Steven Rostedt <[email protected]>
     +M:        Ingo Molnar <[email protected]>
     +R:        Karol Herbst <[email protected]>
     +R:        Pekka Paalanen <[email protected]>
     +S:        Maintained
     +L:        [email protected]
     +L:        [email protected]
     +F:        kernel/trace/trace_mmiotrace.c
     +F:        include/linux/mmiotrace.h
     +F:        arch/x86/mm/kmmio.c
     +F:        arch/x86/mm/mmio-mod.c
     +F:        arch/x86/mm/testmmiotrace.c
     +
      TRIVIAL PATCHES
      M:        Jiri Kosina <[email protected]>
      T:        git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git
@@@@@@@ -11697,8 -11672,8 -11672,8 -11672,8 -11672,8 -11390,7 +11698,8 @@@@@@@ F:       Documentation/filesystems/ubifs.tx
      F:        fs/ubifs/
      
      UCLINUX (M68KNOMMU AND COLDFIRE)
     -M:        Greg Ungerer <[email protected]>
     +M:        Greg Ungerer <[email protected]>
     +W:        http://www.linux-m68k.org/
      W:        http://www.uclinux.org/
      L:        [email protected]
      L:        [email protected]  (subscribers-only)
@@@@@@@ -11910,8 -11885,7 -11885,7 -11885,7 -11885,7 -11602,7 +11911,8 @@@@@@@ F:       drivers/usb/common/usb-otg-fsm.
      
      USB OVER IP DRIVER
      M:        Valentina Manea <[email protected]>
 -----M:        Shuah Khan <[email protected]>
 +++++M:        Shuah Khan <[email protected]>
 +++++M:        Shuah Khan <[email protected]>
      L:        [email protected]
      S:        Maintained
      F:        Documentation/usb/usbip_protocol.txt
@@@@@@@ -11982,7 -11956,6 -11956,6 -11956,6 -11956,6 -11673,6 +11983,7 @@@@@@@ L:       [email protected]
      W:        http://www.linux-usb.org
      T:        git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git
      S:        Supported
 +++++F:        Documentation/devicetree/bindings/usb/
      F:        Documentation/usb/
      F:        drivers/usb/
      F:        include/linux/usb.h
@@@@@@@ -12156,7 -12129,6 -12129,6 -12129,6 -12129,6 -11846,6 +12157,7 @@@@@@@ VIRTIO CORE, NET AND BLOCK DRIVER
      M:        "Michael S. Tsirkin" <[email protected]>
      L:        [email protected]
      S:        Maintained
 +++++F:        Documentation/devicetree/bindings/virtio/
      F:        drivers/virtio/
      F:        tools/virtio/
      F:        drivers/net/virtio_net.c
@@@@@@@ -12309,9 -12281,9 -12281,9 -12281,9 -12281,9 -11998,7 +12310,9 @@@@@@@ L:       [email protected]
      W:        http://www.slimlogic.co.uk/?p=48
      T:        git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git
      S:        Supported
     +F:        Documentation/devicetree/bindings/regulator/
      F:        drivers/regulator/
     +F:        include/dt-bindings/regulator/
      F:        include/linux/regulator/
      
      VRF
@@@@@@@ -12387,7 -12359,7 -12359,7 -12359,7 -12359,7 -12074,6 +12388,7 @@@@@@@ L:       [email protected]
      W:        http://www.linux-watchdog.org/
      T:        git git://www.linux-watchdog.org/linux-watchdog.git
      S:        Maintained
     +F:        Documentation/devicetree/bindings/watchdog/
      F:        Documentation/watchdog/
      F:        drivers/watchdog/
      F:        include/linux/watchdog.h
@@@@@@@ -12492,12 -12464,12 -12464,12 -12464,12 -12464,12 -12178,6 +12493,12 @@@@@@@ F: include/linux/workqueue.
      F:        kernel/workqueue.c
      F:        Documentation/workqueue.txt
      
     +X-POWERS MULTIFUNCTION PMIC DEVICE DRIVERS
     +M:        Chen-Yu Tsai <[email protected]>
     +L:        [email protected]
     +S:        Maintained
     +N:        axp[128]
     +
      X.25 NETWORK LAYER
      M:        Andrew Hendry <[email protected]>
      L:        [email protected]
@@@@@@@ -12545,8 -12517,7 -12517,7 -12517,7 -12517,7 -12225,7 +12546,8 @@@@@@@ S:       Maintaine
      F:        arch/x86/entry/vdso/
      
      XC2028/3028 TUNER DRIVER
 -----M:        Mauro Carvalho Chehab <[email protected]>
 +++++M:        Mauro Carvalho Chehab <[email protected]>
 +++++M:        Mauro Carvalho Chehab <[email protected]>
      L:        [email protected]
      W:        https://linuxtv.org
      T:        git git://linuxtv.org/media_tree.git
diff --combined include/linux/regmap.h
index 3dc08ce15426e67eff3cd1c785544c6877603e97,3dc08ce15426e67eff3cd1c785544c6877603e97,3dc08ce15426e67eff3cd1c785544c6877603e97,26914dfcc9fcc80d636b5aa622a9b2e6d3b2142d,a0bfe481f9abf1a76748f58eaecca5af26e787d6,3dc08ce15426e67eff3cd1c785544c6877603e97..2c12cc5af744d13cbfef6c29e65c0009e748e06f
--- 1/include/linux/regmap.h
--- 2/include/linux/regmap.h
--- 3/include/linux/regmap.h
--- 4/include/linux/regmap.h
--- 5/include/linux/regmap.h
--- 6/include/linux/regmap.h
+++ b/include/linux/regmap.h
@@@@@@@ -95,6 -95,6 -95,6 -95,45 -95,6 -95,6 +95,45 @@@@@@@ struct reg_sequence 
      #define   regmap_fields_force_update_bits(field, id, mask, val) \
        regmap_fields_update_bits_base(field, id, mask, val, NULL, false, true)
      
+++ ++/**
+++ ++ * regmap_read_poll_timeout - Poll until a condition is met or a timeout occurs
+++ ++ * @map: Regmap to read from
+++ ++ * @addr: Address to poll
+++ ++ * @val: Unsigned integer variable to read the value into
+++ ++ * @cond: Break condition (usually involving @val)
+++ ++ * @sleep_us: Maximum time to sleep between reads in us (0
+++ ++ *            tight-loops).  Should be less than ~20ms since usleep_range
+++ ++ *            is used (see Documentation/timers/timers-howto.txt).
+++ ++ * @timeout_us: Timeout in us, 0 means never timeout
+++ ++ *
+++ ++ * Returns 0 on success and -ETIMEDOUT upon a timeout or the regmap_read
+++ ++ * error return value in case of a error read. In the two former cases,
+++ ++ * the last read value at @addr is stored in @val. Must not be called
+++ ++ * from atomic context if sleep_us or timeout_us are used.
+++ ++ *
+++ ++ * This is modelled after the readx_poll_timeout macros in linux/iopoll.h.
+++ ++ */
+++ ++#define regmap_read_poll_timeout(map, addr, val, cond, sleep_us, timeout_us) \
+++ ++({ \
+++ ++  ktime_t timeout = ktime_add_us(ktime_get(), timeout_us); \
+++ ++  int ret; \
+++ ++  might_sleep_if(sleep_us); \
+++ ++  for (;;) { \
+++ ++          ret = regmap_read((map), (addr), &(val)); \
+++ ++          if (ret) \
+++ ++                  break; \
+++ ++          if (cond) \
+++ ++                  break; \
+++ ++          if (timeout_us && ktime_compare(ktime_get(), timeout) > 0) { \
+++ ++                  ret = regmap_read((map), (addr), &(val)); \
+++ ++                  break; \
+++ ++          } \
+++ ++          if (sleep_us) \
+++ ++                  usleep_range((sleep_us >> 2) + 1, sleep_us); \
+++ ++  } \
+++ ++  ret ?: ((cond) ? 0 : -ETIMEDOUT); \
+++ ++})
+++ ++
      #ifdef CONFIG_REGMAP
      
      enum regmap_endian {
@@@@@@@ -851,6 -851,6 -851,6 -890,6 -851,12 -851,6 +890,12 @@@@@@@ struct regmap_irq 
       * @num_type_reg:    Number of type registers.
       * @type_reg_stride: Stride to use for chips where type registers are not
       *                        contiguous.
++++ + * @handle_pre_irq:  Driver specific callback to handle interrupt from device
++++ + *                     before regmap_irq_handler process the interrupts.
++++ + * @handle_post_irq: Driver specific callback to handle interrupt from device
++++ + *                     after handling the interrupts in regmap_irq_handler().
++++ + * @irq_drv_data:    Driver specific IRQ data which is passed as parameter when
++++ + *                     driver specific pre/post interrupt handler is called.
       */
      struct regmap_irq_chip {
        const char *name;
@@@@@@@ -877,6 -877,6 -877,6 -916,6 -883,10 -877,6 +922,10 @@@@@@@
      
        int num_type_reg;
        unsigned int type_reg_stride;
++++ +
++++ +  int (*handle_pre_irq)(void *irq_drv_data);
++++ +  int (*handle_post_irq)(void *irq_drv_data);
++++ +  void *irq_drv_data;
      };
      
      struct regmap_irq_chip_data;
Empty description
This page took 0.150936 seconds and 4 git commands to generate.