]> Git Repo - linux.git/commitdiff
projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 6ce6d18 af0f6c5 ba6c295 3bb0f7c 93a00c4 c001bf6)
Merge remote-tracking branches 'asoc/topic/ts3a227e', 'asoc/topic/tsc42xx', 'asoc...
authorMark Brown <[email protected]>
Fri, 5 Jan 2018 12:44:13 +0000 (12:44 +0000)
committerMark Brown <[email protected]>
Fri, 5 Jan 2018 12:44:13 +0000 (12:44 +0000)
1  2  3  4  5  6 
MAINTAINERS patch | diff1 | diff2 | diff3 | diff4 | diff5 | diff6 | blob | history
sound/soc/codecs/Kconfig patch | diff1 | diff2 | diff3 | diff4 | diff5 | diff6 | blob | history
sound/soc/codecs/Makefile patch | diff1 | diff2 | diff3 | diff4 | diff5 | diff6 | blob | history

diff --combined MAINTAINERS
index 78b1e02fd01cfed1e0d5380ec39f8264d26a7664,aa71ab52fd76d1607b36f476dde8e0060f500070,8254a90d1cbda3db0930a0ff4fd9edcedc14a3d5,761aa3c063601f0e427dfd7b472fb5c132f60fa0,aa71ab52fd76d1607b36f476dde8e0060f500070,aa71ab52fd76d1607b36f476dde8e0060f500070..acc764baefdadc05bb33fd0aa6cb560aea4d58fb
--- 1/MAINTAINERS
--- 2/MAINTAINERS
--- 3/MAINTAINERS
--- 4/MAINTAINERS
--- 5/MAINTAINERS
--- 6/MAINTAINERS
+++ b/MAINTAINERS
@@@@@@@ -384,7 -384,7 -384,7 -384,6 -384,7 -384,7 +384,7 @@@@@@@ ACPI WMI DRIVE
      L:        [email protected]
      S:        Orphan
      F:        drivers/platform/x86/wmi.c
   +  F:        include/uapi/linux/wmi.h
      
      AD1889 ALSA SOUND DRIVER
      M:        Thibaut Varene <[email protected]>
@@@@@@@ -528,6 -528,6 -528,6 -527,11 -528,6 -528,6 +528,6 @@@@@@@ W:    http://ez.analog.com/community/linux
      S:        Supported
      F:        drivers/input/misc/adxl34x.c
      
   -  AEDSP16 DRIVER
   -  M:        Riccardo Facchetti <[email protected]>
   -  S:        Maintained
   -  F:        sound/oss/aedsp16.c
   -  
      AF9013 MEDIA DRIVER
      M:        Antti Palosaari <[email protected]>
      L:        [email protected]
@@@@@@@ -554,13 -554,13 -554,13 -558,13 -554,13 -554,13 +554,13 @@@@@@@ S:      Orpha
      F:        Documentation/filesystems/affs.txt
      F:        fs/affs/
      
 -----AFS FILESYSTEM & AF_RXRPC SOCKET DOMAIN
 +++++AFS FILESYSTEM
      M:        David Howells <[email protected]>
      L:        [email protected]
      S:        Supported
      F:        fs/afs/
 -----F:        include/net/af_rxrpc.h
 -----F:        net/rxrpc/af_rxrpc.c
 +++++F:        include/trace/events/afs.h
 +++++F:        Documentation/filesystems/afs.txt
      W:        https://www.infradead.org/~dhowells/kafs/
      
      AGPGART DRIVER
@@@@@@@ -696,9 -696,9 -696,9 -700,9 -696,9 -696,9 +696,9 @@@@@@@ F:     include/linux/altera_uart.
      F:        include/linux/altera_jtaguart.h
      
      AMAZON ETHERNET DRIVERS
   -  M:        Netanel Belgazal <netanel@annapurnalabs.com>
   -  R:        Saeed Bishara <saeed@annapurnalabs.com>
   -  R:        Zorik Machulsky <zorik@annapurnalabs.com>
   +  M:        Netanel Belgazal <netanel@amazon.com>
   +  R:        Saeed Bishara <saeedb@amazon.com>
   +  R:        Zorik Machulsky <zorik@amazon.com>
      L:        [email protected]
      S:        Supported
      F:        Documentation/networking/ena.txt
@@@@@@@ -755,6 -755,6 -755,6 -759,8 -755,6 -755,6 +755,6 @@@@@@@ F:     drivers/gpu/drm/amd/amdkfd
      F:        drivers/gpu/drm/amd/include/cik_structs.h
      F:        drivers/gpu/drm/amd/include/kgd_kfd_interface.h
      F:        drivers/gpu/drm/amd/include/vi_structs.h
   -  F:        drivers/gpu/drm/radeon/radeon_kfd.c
   -  F:        drivers/gpu/drm/radeon/radeon_kfd.h
      F:        include/uapi/linux/kfd_ioctl.h
      
      AMD SEATTLE DEVICE TREE SUPPORT
@@@@@@@ -859,8 -859,7 -859,7 -865,7 -859,7 -859,7 +859,8 @@@@@@@ F:     kernel/configs/android
      ANDROID DRIVERS
      M:        Greg Kroah-Hartman <[email protected]>
      M:        Arve Hjønnevåg <[email protected]>
 -----M:        Riley Andrews <[email protected]>
 +++++M:        Todd Kjos <[email protected]>
 +++++M:        Martijn Coenen <[email protected]>
      T:        git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
      L:        [email protected]
      S:        Supported
@@@@@@@ -1221,8 -1220,8 -1220,8 -1226,6 -1220,8 -1220,8 +1221,8 @@@@@@@ L:      [email protected]
      W:        http://www.linux4sam.org
      T:        git git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91.git
      S:        Supported
   +  N:        at91
   +  N:        atmel
      F:        arch/arm/mach-at91/
      F:        include/soc/at91/
      F:        arch/arm/boot/dts/at91*.dts
@@@@@@@ -1231,9 -1230,9 -1230,9 -1234,6 -1230,9 -1230,9 +1231,9 @@@@@@@ F:      arch/arm/boot/dts/sama*.dt
      F:        arch/arm/boot/dts/sama*.dtsi
      F:        arch/arm/include/debug/at91.S
      F:        drivers/memory/atmel*
   +  F:        drivers/watchdog/sama5d4_wdt.c
   +  X:        drivers/input/touchscreen/atmel_mxt_ts.c
   +  X:        drivers/net/wireless/atmel/
      
      ARM/CALXEDA HIGHBANK ARCHITECTURE
      M:        Rob Herring <[email protected]>
@@@@@@@ -1591,13 -1590,13 -1590,13 -1591,10 -1590,13 -1590,13 +1591,13 @@@@@@@ F:       drivers/rtc/rtc-armada38x.
      
      ARM/Mediatek RTC DRIVER
      M:        Eddie Huang <[email protected]>
   +  M:        Sean Wang <[email protected]>
      L:        [email protected] (moderated for non-subscribers)
      L:        [email protected] (moderated for non-subscribers)
      S:        Maintained
   +  F:        Documentation/devicetree/bindings/rtc/rtc-mt7622.txt
      F:        drivers/rtc/rtc-mt6397.c
   +  F:        drivers/rtc/rtc-mt7622.c
      
      ARM/Mediatek SoC support
      M:        Matthias Brugger <[email protected]>
@@@@@@@ -1771,7 -1770,7 -1770,7 -1768,6 -1770,7 -1770,7 +1771,7 @@@@@@@ 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:        Documentation/devicetree/bindings/arm/shmobile.txt
      F:        drivers/soc/renesas/
      F:        include/linux/soc/renesas/
      
@@@@@@@ -1891,7 -1890,7 -1890,7 -1887,6 -1890,7 -1890,7 +1891,7 @@@@@@@ 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:        Documentation/devicetree/bindings/arm/shmobile.txt
      F:        drivers/soc/renesas/
      F:        include/linux/soc/renesas/
      
@@@@@@@ -1966,14 -1965,14 -1965,14 -1961,6 -1965,14 -1965,14 +1966,14 @@@@@@@ M:        Lennert Buytenhek <kernel@wantstofly
      L:        [email protected] (moderated for non-subscribers)
      S:        Maintained
      
   +  ARM/TEGRA HDMI CEC SUBSYSTEM SUPPORT
   +  M:        Hans Verkuil <[email protected]>
   +  L:        [email protected]
   +  L:        [email protected]
   +  S:        Maintained
   +  F:        drivers/media/platform/tegra-cec/
   +  F:        Documentation/devicetree/bindings/media/tegra-cec.txt
   +  
      ARM/TETON BGA MACHINE SUPPORT
      M:        "Mark F. Brown" <[email protected]>
      L:        [email protected] (moderated for non-subscribers)
@@@@@@@ -2042,15 -2041,15 -2041,15 -2029,13 -2041,15 -2041,15 +2042,15 @@@@@@@ M:       Masahiro Yamada <yamada.masahiro@soc
      L:        [email protected] (moderated for non-subscribers)
      T:        git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier.git
      S:        Maintained
   +  F:        Documentation/devicetree/bindings/gpio/gpio-uniphier.txt
      F:        arch/arm/boot/dts/uniphier*
      F:        arch/arm/include/asm/hardware/cache-uniphier.h
      F:        arch/arm/mach-uniphier/
      F:        arch/arm/mm/cache-uniphier.c
 -----F:        arch/arm64/boot/dts/socionext/
 +++++F:        arch/arm64/boot/dts/socionext/uniphier*
      F:        drivers/bus/uniphier-system-bus.c
      F:        drivers/clk/uniphier/
   +  F:        drivers/gpio/gpio-uniphier.c
      F:        drivers/i2c/busses/i2c-uniphier*
      F:        drivers/irqchip/irq-uniphier-aidet.c
      F:        drivers/pinctrl/uniphier/
@@@@@@@ -2151,6 -2150,6 -2150,6 -2136,7 -2150,6 -2150,6 +2151,6 @@@@@@@ F:      drivers/gpio/gpio-zx.
      F:        drivers/i2c/busses/i2c-zx2967.c
      F:        drivers/mmc/host/dw_mmc-zx.*
      F:        drivers/pinctrl/zte/
   -  F:        drivers/reset/reset-zx2967.c
      F:        drivers/soc/zte/
      F:        drivers/thermal/zx2967_thermal.c
      F:        drivers/watchdog/zx2967_wdt.c
@@@@@@@ -2173,6 -2172,6 -2172,6 -2159,7 -2172,6 -2172,6 +2173,6 @@@@@@@ F:      sound/soc/zte
      
      ARM/ZYNQ ARCHITECTURE
      M:        Michal Simek <[email protected]>
   -  R:        Sören Brinkmann <[email protected]>
      L:        [email protected] (moderated for non-subscribers)
      W:        http://wiki.xilinx.com
      T:        git https://github.com/Xilinx/linux-xlnx.git
@@@@@@@ -2260,7 -2259,7 -2259,7 -2247,7 -2259,7 -2259,7 +2260,7 @@@@@@@ F:      include/linux/dmaengine.
      F:        include/linux/async_tx.h
      
      AT24 EEPROM DRIVER
   -  M:        Wolfram Sang <[email protected]>
   +  M:        Bartosz Golaszewski <[email protected]>
      L:        [email protected]
      S:        Maintained
      F:        drivers/misc/eeprom/at24.c
@@@@@@@ -2575,12 -2574,12 -2574,12 -2562,10 -2574,12 -2574,12 +2575,12 @@@@@@@ S:       Maintaine
      F:        drivers/net/hamradio/baycom*
      
      BCACHE (BLOCK LAYER CACHE)
   +  M:        Michael Lyle <[email protected]>
      M:        Kent Overstreet <[email protected]>
      L:        [email protected]
      W:        http://bcache.evilpiepirate.org
   -  S:        Orphan
   +  C:        irc://irc.oftc.net/bcache
   +  S:        Maintained
      F:        drivers/md/bcache/
      
      BDISP ST MEDIA DRIVER
@@@@@@@ -2621,22 -2620,24 -2620,24 -2606,24 -2620,24 -2620,24 +2621,22 @@@@@@@ F:       fs/bfs
      F:        include/uapi/linux/bfs_fs.h
      
      BLACKFIN ARCHITECTURE
 -----M:        Steven Miao <[email protected]>
      L:        [email protected] (moderated for non-subscribers)
      T:        git git://git.code.sf.net/p/adi-linux/code
      W:        http://blackfin.uclinux.org
 -----S:        Supported
 +++++S:        Orphan
      F:        arch/blackfin/
      
      BLACKFIN EMAC DRIVER
      L:        [email protected] (moderated for non-subscribers)
      W:        http://blackfin.uclinux.org
 -----S:        Supported
 +++++S:        Orphan
      F:        drivers/net/ethernet/adi/
      
      BLACKFIN MEDIA DRIVER
 -----M:        Scott Jiang <[email protected]>
      L:        [email protected] (moderated for non-subscribers)
      W:        http://blackfin.uclinux.org/
 -----S:        Supported
 +++++S:        Orphan
      F:        drivers/media/platform/blackfin/
      F:        drivers/media/i2c/adv7183*
      F:        drivers/media/i2c/vs6624*
@@@@@@@ -2644,25 -2645,25 -2645,25 -2631,25 -2645,25 -2645,25 +2644,25 @@@@@@@
      BLACKFIN RTC DRIVER
      L:        [email protected] (moderated for non-subscribers)
      W:        http://blackfin.uclinux.org
 -----S:        Supported
 +++++S:        Orphan
      F:        drivers/rtc/rtc-bfin.c
      
      BLACKFIN SDH DRIVER
      L:        [email protected] (moderated for non-subscribers)
      W:        http://blackfin.uclinux.org
 -----S:        Supported
 +++++S:        Orphan
      F:        drivers/mmc/host/bfin_sdh.c
      
      BLACKFIN SERIAL DRIVER
      L:        [email protected] (moderated for non-subscribers)
      W:        http://blackfin.uclinux.org
 -----S:        Supported
 +++++S:        Orphan
      F:        drivers/tty/serial/bfin_uart.c
      
      BLACKFIN WATCHDOG DRIVER
      L:        [email protected] (moderated for non-subscribers)
      W:        http://blackfin.uclinux.org
 -----S:        Supported
 +++++S:        Orphan
      F:        drivers/watchdog/bfin_wdt.c
      
      BLINKM RGB LED DRIVER
@@@@@@@ -2726,7 -2727,7 -2727,7 -2713,6 -2727,7 -2727,7 +2726,7 @@@@@@@ L:      [email protected]
      S:        Supported
      F:        arch/x86/net/bpf_jit*
      F:        Documentation/networking/filter.txt
   +  F:        Documentation/bpf/
      F:        include/linux/bpf*
      F:        include/linux/filter.h
      F:        include/uapi/linux/bpf*
@@@@@@@ -2739,7 -2740,7 -2740,7 -2725,7 -2740,7 -2740,7 +2739,7 @@@@@@@ F:      net/core/filter.
      F:        net/sched/act_bpf.c
      F:        net/sched/cls_bpf.c
      F:        samples/bpf/
   -  F:        tools/net/bpf*
   +  F:        tools/bpf/
      F:        tools/testing/selftests/bpf/
      
      BROADCOM B44 10/100 ETHERNET DRIVER
@@@@@@@ -2910,15 -2911,15 -2911,15 -2896,7 -2911,15 -2911,15 +2910,15 @@@@@@@ S:        Supporte
      F:        drivers/gpio/gpio-brcmstb.c
      F:        Documentation/devicetree/bindings/gpio/brcm,brcmstb-gpio.txt
      
   +  BROADCOM BRCMSTB USB2 and USB3 PHY DRIVER
   +  M:        Al Cooper <[email protected]>
   +  L:        [email protected]
   +  L:        [email protected]
   +  S:        Maintained
   +  F:        drivers/phy/broadcom/phy-brcm-usb*
   +  
      BROADCOM GENET ETHERNET DRIVER
   +  M:        Doug Berger <[email protected]>
      M:        Florian Fainelli <[email protected]>
      L:        [email protected]
      S:        Supported
@@@@@@@ -2945,7 -2946,7 -2946,7 -2923,6 -2946,7 -2946,7 +2945,7 @@@@@@@ N:      bcm583
      N:        bcm585*
      N:        bcm586*
      N:        bcm88312
   +  N:        hr2
      F:        arch/arm64/boot/dts/broadcom/ns2*
      F:        drivers/clk/bcm/clk-ns*
      F:        drivers/pinctrl/bcm/pinctrl-ns*
@@@@@@@ -2989,14 -2990,14 -2990,14 -2966,6 -2990,14 -2990,14 +2989,14 @@@@@@@ S:        Maintaine
      F:        Documentation/devicetree/bindings/cpufreq/brcm,stb-avs-cpu-freq.txt
      F:        drivers/cpufreq/brcmstb*
      
   +  BROADCOM STB AVS TMON DRIVER
   +  M:        Markus Mayer <[email protected]>
   +  M:        [email protected]
   +  L:        [email protected]
   +  S:        Maintained
   +  F:        Documentation/devicetree/bindings/thermal/brcm,avs-tmon.txt
   +  F:        drivers/thermal/broadcom/brcmstb*
   +  
      BROADCOM STB NAND FLASH DRIVER
      M:        Brian Norris <[email protected]>
      M:        Kamal Dasu <[email protected]>
@@@@@@@ -3005,14 -3006,14 -3006,14 -2974,6 -3006,14 -3006,14 +3005,14 @@@@@@@ L:        [email protected]
      S:        Maintained
      F:        drivers/mtd/nand/brcmnand/
      
   +  BROADCOM STB DPFE DRIVER
   +  M:        Markus Mayer <[email protected]>
   +  M:        [email protected]
   +  L:        [email protected] (moderated for non-subscribers)
   +  S:        Maintained
   +  F:        Documentation/devicetree/bindings/memory-controllers/brcm,dpfe-cpu.txt
   +  F:        drivers/memory/brcmstb_dpfe.c
   +  
      BROADCOM SYSTEMPORT ETHERNET DRIVER
      M:        Florian Fainelli <[email protected]>
      L:        [email protected]
@@@@@@@ -3121,6 -3122,6 -3122,6 -3082,7 -3122,6 -3122,6 +3121,6 @@@@@@@ F:      arch/c6x
      
      CA8210 IEEE-802.15.4 RADIO DRIVER
      M:        Harry Morris <[email protected]>
   -  M:        [email protected]
      L:        [email protected]
      W:        https://github.com/Cascoda/ca8210-linux.git
      S:        Maintained
@@@@@@@ -3295,15 -3296,15 -3296,15 -3257,6 -3296,15 -3296,15 +3295,15 @@@@@@@ F:        include/uapi/linux/cec.
      F:        include/uapi/linux/cec-funcs.h
      F:        Documentation/devicetree/bindings/media/cec.txt
      
   +  CEC GPIO DRIVER
   +  M:        Hans Verkuil <[email protected]>
   +  L:        [email protected]
   +  T:        git git://linuxtv.org/media_tree.git
   +  W:        http://linuxtv.org
   +  S:        Supported
   +  F:        drivers/media/platform/cec-gpio/
   +  F:        Documentation/devicetree/bindings/media/cec-gpio.txt
   +  
      CELL BROADBAND ENGINE ARCHITECTURE
      M:        Arnd Bergmann <[email protected]>
      L:        [email protected]
@@@@@@@ -3376,22 -3377,22 -3377,22 -3329,17 -3377,22 -3377,22 +3376,22 @@@@@@@ S:       Maintaine
      F:        drivers/auxdisplay/cfag12864bfb.c
      F:        include/linux/cfag12864b.h
      
   -  CFG80211 and NL80211
   +  802.11 (including CFG80211/NL80211)
      M:        Johannes Berg <[email protected]>
      L:        [email protected]
      W:        http://wireless.kernel.org/
      T:        git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git
      T:        git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git
      S:        Maintained
   +  F:        net/wireless/
      F:        include/uapi/linux/nl80211.h
   +  F:        include/linux/ieee80211.h
   +  F:        include/net/wext.h
      F:        include/net/cfg80211.h
   -  F:        net/wireless/*
   -  X:        net/wireless/wext*
   +  F:        include/net/iw_handler.h
   +  F:        include/net/ieee80211_radiotap.h
   +  F:        Documentation/driver-api/80211/cfg80211.rst
   +  F:        Documentation/networking/regulatory.txt
      
      CHAR and MISC DRIVERS
      M:        Arnd Bergmann <[email protected]>
@@@@@@@ -3467,7 -3468,7 -3468,7 -3415,7 -3468,7 -3468,7 +3467,7 @@@@@@@ F:      drivers/scsi/snic
      CISCO VIC ETHERNET NIC DRIVER
      M:        Christian Benvenuti <[email protected]>
      M:        Govindarajulu Varadarajan <[email protected]>
   -  M:        Neel Patel <neepatel@cisco.com>
   +  M:        Parvi Kaustubhi <pkaustub@cisco.com>
      S:        Supported
      F:        drivers/net/ethernet/cisco/enic/
      
@@@@@@@ -3496,8 -3497,8 -3497,8 -3444,7 -3497,8 -3497,8 +3496,8 @@@@@@@ M:      Thomas Gleixner <[email protected]
      L:        [email protected]
      T:        git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core
      S:        Supported
   -  F:        drivers/clocksource
   +  F:        drivers/clocksource/
   +  F:        Documentation/devicetree/bindings/timer/
      
      CMPC ACPI DRIVER
      M:        Thadeu Lima de Souza Cascardo <[email protected]>
@@@@@@@ -3518,7 -3519,7 -3519,7 -3465,7 -3519,7 -3519,7 +3518,7 @@@@@@@ COCCINELLE/Semantic Patches (SmPL
      M:        Julia Lawall <[email protected]>
      M:        Gilles Muller <[email protected]>
      M:        Nicolas Palix <[email protected]>
   -  M:        Michal Marek <m[email protected]>
   +  M:        Michal Marek <m[email protected]>
      L:        [email protected] (moderated for non-subscribers)
      T:        git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git misc
      W:        http://coccinelle.lip6.fr/
@@@@@@@ -3632,7 -3633,7 -3633,7 -3579,7 -3633,7 -3633,7 +3632,7 @@@@@@@ T:      git git://git.kernel.org/pub/scm/lin
      S:        Maintained
      F:        Documentation/cgroup-v1/cpusets.txt
      F:        include/linux/cpuset.h
   -  F:        kernel/cpuset.c
   +  F:        kernel/cgroup/cpuset.c
      
      CONTROL GROUP - MEMORY RESOURCE CONTROLLER (MEMCG)
      M:        Johannes Weiner <[email protected]>
@@@@@@@ -3689,8 -3690,8 -3690,8 -3636,6 -3690,8 -3690,8 +3689,8 @@@@@@@ F:      drivers/cpufreq/arm_big_little_dt.
      
      CPU POWER MONITORING SUBSYSTEM
      M:        Thomas Renninger <[email protected]>
   +  M:        Shuah Khan <[email protected]>
   +  M:        Shuah Khan <[email protected]>
      L:        [email protected]
      S:        Maintained
      F:        tools/power/cpupower/
@@@@@@@ -3731,8 -3732,8 -3732,8 -3676,8 -3732,8 -3732,8 +3731,8 @@@@@@@ F:      drivers/cpuidle/
      F:        include/linux/cpuidle.h
      
      CRAMFS FILESYSTEM
   -  W:        http://sourceforge.net/projects/cramfs/
   -  S:        Orphan / Obsolete
   +  M:        Nicolas Pitre <[email protected]>
   +  S:        Maintained
      F:        Documentation/filesystems/cramfs.txt
      F:        fs/cramfs/
      
@@@@@@@ -4033,26 -4034,26 -4034,26 -3978,6 -4034,26 -4034,26 +4033,26 @@@@@@@ M:        "Maciej W. Rozycki" <macro@linux-mip
      S:        Maintained
      F:        drivers/net/fddi/defxx.*
      
   +  DELL SMBIOS DRIVER
   +  M:        Pali Rohár <[email protected]>
   +  M:        Mario Limonciello <[email protected]>
   +  L:        [email protected]
   +  S:        Maintained
   +  F:        drivers/platform/x86/dell-smbios.*
   +  
   +  DELL SMBIOS SMM DRIVER
   +  M:        Mario Limonciello <[email protected]>
   +  L:        [email protected]
   +  S:        Maintained
   +  F:        drivers/platform/x86/dell-smbios-smm.c
   +  
   +  DELL SMBIOS WMI DRIVER
   +  M:        Mario Limonciello <[email protected]>
   +  L:        [email protected]
   +  S:        Maintained
   +  F:        drivers/platform/x86/dell-smbios-wmi.c
   +  F:        tools/wmi/dell-smbios-example.c
   +  
      DELL LAPTOP DRIVER
      M:        Matthew Garrett <[email protected]>
      M:        Pali Rohár <[email protected]>
@@@@@@@ -4082,17 -4083,17 -4083,17 -4007,12 -4083,17 -4083,17 +4082,17 @@@@@@@ S:       Maintaine
      F:        Documentation/dcdbas.txt
      F:        drivers/firmware/dcdbas.*
      
   -  DELL WMI EXTRAS DRIVER
   +  DELL WMI NOTIFICATIONS DRIVER
      M:        Matthew Garrett <[email protected]>
      M:        Pali Rohár <[email protected]>
      S:        Maintained
      F:        drivers/platform/x86/dell-wmi.c
      
   +  DELL WMI DESCRIPTOR DRIVER
   +  M:        Mario Limonciello <[email protected]>
   +  S:        Maintained
   +  F:        drivers/platform/x86/dell-wmi-descriptor.c
   +  
      DELTA ST MEDIA DRIVER
      M:        Hugues Fruchet <[email protected]>
      L:        [email protected]
@@@@@@@ -4171,8 -4172,8 -4172,8 -4091,6 -4172,8 -4172,8 +4171,8 @@@@@@@ T:      git git://git.kernel.org/pub/scm/lin
      T:        quilt http://people.redhat.com/agk/patches/linux/editing/
      S:        Maintained
      F:        Documentation/device-mapper/
   +  F:        drivers/md/Makefile
   +  F:        drivers/md/Kconfig
      F:        drivers/md/dm*
      F:        drivers/md/persistent-data/
      F:        include/linux/device-mapper.h
@@@@@@@ -4196,7 -4197,7 -4197,7 -4114,7 -4197,7 -4197,7 +4196,7 @@@@@@@ F:      Documentation/devicetree/bindings/mf
      F:        Documentation/devicetree/bindings/input/da90??-onkey.txt
      F:        Documentation/devicetree/bindings/thermal/da90??-thermal.txt
      F:        Documentation/devicetree/bindings/regulator/da92*.txt
   -  F:        Documentation/devicetree/bindings/watchdog/da92??-wdt.txt
   +  F:        Documentation/devicetree/bindings/watchdog/da90??-wdt.txt
      F:        Documentation/devicetree/bindings/sound/da[79]*.txt
      F:        drivers/gpio/gpio-da90??.c
      F:        drivers/hwmon/da90??-hwmon.c
@@@@@@@ -4244,7 -4245,7 -4245,7 -4162,7 -4245,7 -4245,7 +4244,7 @@@@@@@ L:      [email protected]
      S:        Maintained
      F:        drivers/i2c/busses/i2c-diolan-u2c.c
      
   -  DIRECT ACCESS (DAX)
   +  FILESYSTEM DIRECT ACCESS (DAX)
      M:        Matthew Wilcox <[email protected]>
      M:        Ross Zwisler <[email protected]>
      L:        [email protected]
@@@@@@@ -4253,12 -4254,12 -4254,12 -4171,6 -4254,12 -4254,12 +4253,12 @@@@@@@ F:        fs/dax.
      F:        include/linux/dax.h
      F:        include/trace/events/fs_dax.h
      
   +  DEVICE DIRECT ACCESS (DAX)
   +  M:        Dan Williams <[email protected]>
   +  L:        [email protected]
   +  S:        Supported
   +  F:        drivers/dax/
   +  
      DIRECTORY NOTIFICATION (DNOTIFY)
      M:        Jan Kara <[email protected]>
      R:        Amir Goldstein <[email protected]>
@@@@@@@ -4322,7 -4323,7 -4323,7 -4234,7 -4323,7 -4323,7 +4322,7 @@@@@@@ S:      Maintaine
      F:        drivers/dma/
      F:        include/linux/dmaengine.h
      F:        Documentation/devicetree/bindings/dma/
   -  F:        Documentation/dmaengine/
   +  F:        Documentation/driver-api/dmaengine/
      T:        git git://git.infradead.org/users/vkoul/slave-dma.git
      
      DMA MAPPING HELPERS
@@@@@@@ -4454,12 -4455,12 -4455,12 -4366,6 -4455,12 -4455,12 +4454,12 @@@@@@@ T:        git git://anongit.freedesktop.org/dr
      S:        Maintained
      F:        drivers/gpu/drm/bochs/
      
   +  DRM DRIVER FOR FARADAY TVE200 TV ENCODER
   +  M:        Linus Walleij <[email protected]>
   +  T:        git git://anongit.freedesktop.org/drm/drm-misc
   +  S:        Maintained
   +  F:        drivers/gpu/drm/tve200/
   +  
      DRM DRIVER FOR INTEL I810 VIDEO CARDS
      S:        Orphan / Obsolete
      F:        drivers/gpu/drm/i810/
@@@@@@@ -4603,7 -4604,7 -4604,7 -4509,7 -4604,7 -4604,7 +4603,7 @@@@@@@ L:      [email protected]
      S:        Supported
      F:        drivers/gpu/drm/sun4i/
      F:        Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt
   -  T:        git git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux.git
   +  T:        git git://anongit.freedesktop.org/drm/drm-misc
      
      DRM DRIVERS FOR AMLOGIC SOCS
      M:        Neil Armstrong <[email protected]>
@@@@@@@ -4787,7 -4788,7 -4788,7 -4693,7 -4788,7 -4788,7 +4787,7 @@@@@@@ T:      git git://anongit.freedesktop.org/dr
      DRM PANEL DRIVERS
      M:        Thierry Reding <[email protected]>
      L:        [email protected]
   -  T:        git git://anongit.freedesktop.org/tegra/linux.git
   +  T:        git git://anongit.freedesktop.org/drm/drm-misc
      S:        Maintained
      F:        drivers/gpu/drm/drm_panel.c
      F:        drivers/gpu/drm/panel/
@@@@@@@ -5000,19 -5001,19 -5001,19 -4906,13 -5001,19 -5001,19 +5000,19 @@@@@@@ L:       [email protected]
      S:        Maintained
      F:        drivers/edac/highbank*
      
   -  EDAC-CAVIUM
   +  EDAC-CAVIUM OCTEON
      M:        Ralf Baechle <[email protected]>
      M:        David Daney <[email protected]>
      L:        [email protected]
      L:        [email protected]
      S:        Supported
      F:        drivers/edac/octeon_edac*
   +  
   +  EDAC-CAVIUM THUNDERX
   +  M:        David Daney <[email protected]>
   +  M:        Jan Glauber <[email protected]>
   +  L:        [email protected]
   +  S:        Supported
      F:        drivers/edac/thunderx_edac*
      
      EDAC-CORE
@@@@@@@ -5252,7 -5253,7 -5253,7 -5152,7 -5253,7 -5253,7 +5252,7 @@@@@@@ F:      drivers/video/fbdev/s1d13xxxfb.
      F:        include/video/s1d13xxxfb.h
      
      ERRSEQ ERROR TRACKING INFRASTRUCTURE
   -  M:        Jeff Layton <jlayton@poochiereds.net>
   +  M:        Jeff Layton <jlayton@kernel.org>
      S:        Maintained
      F:        lib/errseq.c
      F:        include/linux/errseq.h
@@@@@@@ -5313,7 -5314,7 -5314,7 -5213,8 -5314,7 -5314,7 +5313,7 @@@@@@@ F:      fs/ext4
      
      Extended Verification Module (EVM)
      M:        Mimi Zohar <[email protected]>
   -  L:        [email protected]
   -  L:        [email protected]
   +  L:        [email protected]
      S:        Supported
      F:        security/integrity/evm/
      
@@@@@@@ -5429,7 -5430,7 -5430,7 -5330,7 -5430,7 -5430,7 +5429,7 @@@@@@@ F:      drivers/media/tuners/fc2580
      
      FCOE SUBSYSTEM (libfc, libfcoe, fcoe)
      M:        Johannes Thumshirn <[email protected]>
 -----L:        fcoe-devel@open-fcoe.org
 +++++L:        [email protected].org
      W:        www.Open-FCoE.org
      S:        Supported
      F:        drivers/scsi/libfc/
@@@@@@@ -5440,7 -5441,7 -5441,7 -5341,7 -5441,7 -5441,7 +5440,7 @@@@@@@ F:      include/scsi/libfcoe.
      F:        include/uapi/scsi/fc/
      
      FILE LOCKING (flock() and fcntl()/lockf())
   -  M:        Jeff Layton <jlayton@poochiereds.net>
   +  M:        Jeff Layton <jlayton@kernel.org>
      M:        "J. Bruce Fields" <[email protected]>
      L:        [email protected]
      S:        Maintained
@@@@@@@ -5530,7 -5531,7 -5531,7 -5431,7 -5531,7 -5531,7 +5530,7 @@@@@@@ K:      fmc_d.*registe
      
      FPGA MANAGER FRAMEWORK
      M:        Alan Tull <[email protected]>
   -  R:        Moritz Fischer <[email protected]>
   +  M:        Moritz Fischer <[email protected]>
      L:        [email protected]
      S:        Maintained
      T:        git git://git.kernel.org/pub/scm/linux/kernel/git/atull/linux-fpga.git
@@@@@@@ -5555,7 -5556,7 -5556,7 -5456,6 -5556,7 -5556,7 +5555,7 @@@@@@@ F:      drivers/net/wan/sdla.
      
      FRAMEBUFFER LAYER
      M:        Bartlomiej Zolnierkiewicz <[email protected]>
   +  L:        [email protected]
      L:        [email protected]
      T:        git git://github.com/bzolnier/linux.git
      Q:        http://patchwork.kernel.org/project/linux-fbdev/list/
@@@@@@@ -5569,7 -5570,7 -5570,7 -5469,7 -5570,7 -5570,7 +5569,7 @@@@@@@ F:      include/uapi/linux/fb.
      
      FREESCALE CAAM (Cryptographic Acceleration and Assurance Module) DRIVER
      M:        Horia Geantă <[email protected]>
   -  M:        Dan Douglass <dan.douglass@nxp.com>
   +  M:        Aymen Sghaier <aymen.sghaier@nxp.com>
      L:        [email protected]
      S:        Maintained
      F:        drivers/crypto/caam/
@@@@@@@ -5749,7 -5750,7 -5750,7 -5649,6 -5750,7 -5750,7 +5749,7 @@@@@@@ T:      git git://git.kernel.org/pub/scm/lin
      S:        Supported
      F:        fs/crypto/
      F:        include/linux/fscrypt*.h
   +  F:        Documentation/filesystems/fscrypt.rst
      
      FUJITSU FR-V (FRV) PORT
      S:        Orphan
@@@@@@@ -6173,6 -6174,7 -6174,7 -6072,7 -6174,7 -6174,7 +6173,6 @@@@@@@ M:      Jean Delvare <[email protected]
      M:        Guenter Roeck <[email protected]>
      L:        [email protected]
      W:        http://hwmon.wiki.kernel.org/
 -----T:        quilt http://jdelvare.nerim.net/devel/linux/jdelvare-hwmon/
      T:        git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git
      S:        Maintained
      F:        Documentation/hwmon/
@@@@@@@ -6342,13 -6344,13 -6344,13 -6242,6 -6344,13 -6344,13 +6342,13 @@@@@@@ S:        Maintaine
      F:        drivers/net/ethernet/hisilicon/
      F:        Documentation/devicetree/bindings/net/hisilicon*.txt
      
   +  HISILICON PMU DRIVER
   +  M:        Shaokun Zhang <[email protected]>
   +  W:        http://www.hisilicon.com
   +  S:        Supported
   +  F:        drivers/perf/hisilicon
   +  F:        Documentation/perf/hisi-pmu.txt
   +  
      HISILICON ROCE DRIVER
      M:        Lijun Ou <[email protected]>
      M:        Wei Hu(Xavier) <[email protected]>
@@@@@@@ -6882,7 -6884,7 -6884,7 -6775,8 -6884,7 -6884,7 +6882,7 @@@@@@@ F:      drivers/ipack
      
      INFINIBAND SUBSYSTEM
      M:        Doug Ledford <[email protected]>
   -  M:        Sean Hefty <[email protected]>
   -  M:        Hal Rosenstock <[email protected]>
   +  M:        Jason Gunthorpe <[email protected]>
      L:        [email protected]
      W:        http://www.openfabrics.org/
      Q:        http://patchwork.kernel.org/project/linux-rdma/list/
@@@@@@@ -6947,7 -6949,7 -6949,7 -6841,9 -6949,7 -6949,7 +6947,7 @@@@@@@ L:      [email protected]
      INTEGRITY MEASUREMENT ARCHITECTURE (IMA)
      M:        Mimi Zohar <[email protected]>
      M:        Dmitry Kasatkin <[email protected]>
   -  L:        [email protected]
   -  L:        [email protected]
   -  L:        [email protected]
   +  L:        [email protected]
      T:        git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity.git
      S:        Supported
      F:        security/integrity/ima/
@@@@@@@ -7208,11 -7210,11 -7210,11 -7104,6 -7210,11 -7210,11 +7208,11 @@@@@@@ F:        Documentation/wimax/README.i2400
      F:        drivers/net/wimax/i2400m/
      F:        include/uapi/linux/wimax/i2400m.h
      
   +  INTEL WMI THUNDERBOLT FORCE POWER DRIVER
   +  M:        Mario Limonciello <[email protected]>
   +  S:        Maintained
   +  F:        drivers/platform/x86/intel-wmi-thunderbolt.c
   +  
      INTEL(R) TRACE HUB
      M:        Alexander Shishkin <[email protected]>
      S:        Supported
@@@@@@@ -7474,7 -7476,7 -7476,7 -7365,7 -7476,7 -7476,7 +7474,7 @@@@@@@ JFS FILESYSTE
      M:        Dave Kleikamp <[email protected]>
      L:        [email protected]
      W:        http://jfs.sourceforge.net/
   -  T:        git git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git
   +  T:        git git://github.com/kleikamp/linux-shaggy.git
      S:        Maintained
      F:        Documentation/filesystems/jfs.txt
      F:        fs/jfs/
@@@@@@@ -7542,8 -7544,8 -7544,8 -7433,10 -7544,8 -7544,8 +7542,8 @@@@@@@ F:     mm/kasan
      F:        scripts/Makefile.kasan
      
      KCONFIG
   -  M:        "Yann E. MORIN" <[email protected]>
      L:        [email protected]
   -  T:        git git://gitorious.org/linux-kconfig/linux-kconfig
   -  S:        Maintained
   +  S:        Orphan
      F:        Documentation/kbuild/kconfig-language.txt
      F:        scripts/kconfig/
      
@@@@@@@ -7572,7 -7574,7 -7574,7 -7465,7 -7574,7 -7574,7 +7572,7 @@@@@@@ F:      fs/autofs4
      
      KERNEL BUILD + files below scripts/ (unless maintained elsewhere)
      M:        Masahiro Yamada <[email protected]>
   -  M:        Michal Marek <m[email protected]>
   +  M:        Michal Marek <m[email protected]>
      T:        git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git
      L:        [email protected]
      S:        Maintained
@@@@@@@ -7590,7 -7592,7 -7592,7 -7483,7 -7592,7 -7592,7 +7590,7 @@@@@@@ S:      Odd Fixe
      
      KERNEL NFSD, SUNRPC, AND LOCKD SERVERS
      M:        "J. Bruce Fields" <[email protected]>
   -  M:        Jeff Layton <jlayton@poochiereds.net>
   +  M:        Jeff Layton <jlayton@kernel.org>
      L:        [email protected]
      W:        http://nfs.sourceforge.net/
      T:        git git://linux-nfs.org/~bfields/linux.git
@@@@@@@ -7711,7 -7713,7 -7713,7 -7604,6 -7713,7 -7713,7 +7711,7 @@@@@@@ S:      Supporte
      F:        arch/x86/kvm/
      F:        arch/x86/include/uapi/asm/kvm*
      F:        arch/x86/include/asm/kvm*
   +  F:        arch/x86/include/asm/pvclock-abi.h
      F:        arch/x86/kernel/kvm.c
      F:        arch/x86/kernel/kvmclock.c
      
@@@@@@@ -7734,7 -7736,7 -7736,7 -7626,8 -7736,7 -7736,7 +7734,7 @@@@@@@ F:      kernel/kexec
      
      KEYS-ENCRYPTED
      M:        Mimi Zohar <[email protected]>
   -  M:        David Safford <[email protected]>
   -  L:        [email protected]
   +  L:        [email protected]
      L:        [email protected]
      S:        Supported
      F:        Documentation/security/keys/trusted-encrypted.rst
@@@@@@@ -7742,8 -7744,8 -7744,8 -7635,9 -7744,8 -7744,8 +7742,8 @@@@@@@ F:      include/keys/encrypted-type.
      F:        security/keys/encrypted-keys/
      
      KEYS-TRUSTED
   -  M:        David Safford <[email protected]>
      M:        Mimi Zohar <[email protected]>
   -  L:        linux-security-module@vger.kernel.org
   +  L:        linux-integrity@vger.kernel.org
      L:        [email protected]
      S:        Supported
      F:        Documentation/security/keys/trusted-encrypted.rst
@@@@@@@ -7765,7 -7767,6 -7767,6 -7659,6 -7767,6 -7767,6 +7765,7 @@@@@@@ F:      security/keys
      
      KGDB / KDB /debug_core
      M:        Jason Wessel <[email protected]>
 +++++M:        Daniel Thompson <[email protected]>
      W:        http://kgdb.wiki.kernel.org/
      L:        [email protected]
      T:        git git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/kgdb.git
@@@@@@@ -7777,6 -7778,6 -7778,6 -7670,16 -7778,6 -7778,6 +7777,6 @@@@@@@ F:     include/linux/kdb.
      F:        include/linux/kgdb.h
      F:        kernel/debug/
      
   -  KMEMCHECK
   -  M:        Vegard Nossum <[email protected]>
   -  M:        Pekka Enberg <[email protected]>
   -  S:        Maintained
   -  F:        Documentation/dev-tools/kmemcheck.rst
   -  F:        arch/x86/include/asm/kmemcheck.h
   -  F:        arch/x86/mm/kmemcheck/
   -  F:        include/linux/kmemcheck.h
   -  F:        mm/kmemcheck.c
   -  
      KMEMLEAK
      M:        Catalin Marinas <[email protected]>
      S:        Maintained
@@@@@@@ -7842,11 -7843,11 -7843,11 -7745,6 -7843,11 -7843,11 +7842,11 @@@@@@@ S:        Maintaine
      F:        Documentation/scsi/53c700.txt
      F:        drivers/scsi/53c700*
      
   +  LEAKING_ADDRESSES
   +  M:        Tobin C. Harding <[email protected]>
   +  S:        Maintained
   +  F:        scripts/leaking_addresses.pl
   +  
      LED SUBSYSTEM
      M:        Richard Purdie <[email protected]>
      M:        Jacek Anaszewski <[email protected]>
@@@@@@@ -8310,7 -8311,7 -8311,7 -8208,6 -8311,7 -8311,7 +8310,7 @@@@@@@ F:      Documentation/networking/mac80211-in
      F:        include/net/mac80211.h
      F:        net/mac80211/
      F:        drivers/net/wireless/mac80211_hwsim.[ch]
   +  F:        Documentation/networking/mac80211_hwsim/README
      
      MAILBOX API
      M:        Jassi Brar <[email protected]>
@@@@@@@ -9302,6 -9303,6 -9303,6 -9199,12 -9303,6 -9303,6 +9302,6 @@@@@@@ F:     include/linux/dt-bindings/mux
      F:        include/linux/mux/
      F:        drivers/mux/
      
   -  MULTISOUND SOUND DRIVER
   -  M:        Andrew Veliath <[email protected]>
   -  S:        Maintained
   -  F:        Documentation/sound/oss/MultiSound
   -  F:        sound/oss/msnd*
   -  
      MULTITECH MULTIPORT CARD (ISICOM)
      S:        Orphan
      F:        drivers/tty/isicom.c
@@@@@@@ -9330,9 -9331,9 -9331,9 -9233,9 -9331,9 -9331,9 +9330,9 @@@@@@@ F:      drivers/gpu/drm/mxsfb
      F:        Documentation/devicetree/bindings/display/mxsfb-drm.txt
      
      MYRICOM MYRI-10G 10GbE DRIVER (MYRI10GE)
 -----M:        Hyong-Youb Kim <hykim@myri.com>
 +++++M:        Chris Lee <christopher.lee@cspi.com>
      L:        [email protected]
 -----W:        https://www.myricom.com/support/downloads/myri10ge.html
 +++++W:        https://www.cspi.com/ethernet-products/support/downloads/
      S:        Supported
      F:        drivers/net/ethernet/myricom/myri10ge/
      
@@@@@@@ -9505,7 -9506,7 -9506,7 -9408,6 -9506,7 -9506,7 +9505,7 @@@@@@@ M:      Florian Fainelli <[email protected]
      S:        Maintained
      F:        net/dsa/
      F:        include/net/dsa.h
   +  F:        include/linux/dsa/
      F:        drivers/net/dsa/
      
      NETWORKING [GENERAL]
@@@@@@@ -9526,8 -9527,8 -9527,8 -9428,8 -9527,8 -9527,8 +9526,8 @@@@@@@ F:      include/uapi/linux/in.
      F:        include/uapi/linux/net.h
      F:        include/uapi/linux/netdevice.h
      F:        include/uapi/linux/net_namespace.h
   -  F:        tools/net/
      F:        tools/testing/selftests/net/
   +  F:        lib/net_utils.c
      F:        lib/random32.c
      
      NETWORKING [IPSEC]
@@@@@@@ -9728,11 -9729,11 -9729,11 -9630,12 -9729,11 -9729,11 +9728,11 @@@@@@@ S:       Supporte
      F:        drivers/ntb/hw/idt/
      
      NTB INTEL DRIVER
   -  M:        Jon Mason <[email protected]>
      M:        Dave Jiang <[email protected]>
      L:        [email protected]
      S:        Supported
   -  W:        https://github.com/jonmason/ntb/wiki
   -  T:        git git://github.com/jonmason/ntb.git
   +  W:        https://github.com/davejiang/linux/wiki
   +  T:        git https://github.com/davejiang/linux.git
      F:        drivers/ntb/hw/intel/
      
      NTFS FILESYSTEM
@@@@@@@ -9804,7 -9805,6 -9805,6 -9707,6 -9805,6 -9805,6 +9804,7 @@@@@@@ NXP TFA9879 DRIVE
      M:        Peter Rosin <[email protected]>
      L:        [email protected] (moderated for non-subscribers)
      S:        Maintained
 +++++F:        Documentation/devicetree/bindings/sound/tfa9879.txt
      F:        sound/soc/codecs/tfa9879*
      
      NXP-NCI NFC DRIVER
@@@@@@@ -10129,11 -10129,11 -10129,11 -10031,7 -10129,11 -10129,11 +10129,11 @@@@@@@ T: git git://github.com/openrisc/linux.
      L:        [email protected]
      W:        http://openrisc.io
      S:        Maintained
   +  F:        Documentation/devicetree/bindings/openrisc/
   +  F:        Documentation/openrisc/
      F:        arch/openrisc/
   +  F:        drivers/irqchip/irq-ompic.c
   +  F:        drivers/irqchip/irq-or1k-*
      
      OPENVSWITCH
      M:        Pravin Shelar <[email protected]>
@@@@@@@ -10151,7 -10151,7 -10151,7 -10049,7 -10151,7 -10151,7 +10151,7 @@@@@@@ M:       Stephen Boyd <[email protected]
      L:        [email protected]
      S:        Maintained
      T:        git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git
   -  F:        drivers/base/power/opp/
   +  F:        drivers/opp/
      F:        include/linux/pm_opp.h
      F:        Documentation/power/opp.txt
      F:        Documentation/devicetree/bindings/opp/
@@@@@@@ -10438,6 -10438,6 -10438,6 -10336,7 -10438,6 -10438,6 +10438,6 @@@@@@@ F:       drivers/pci/host/vmd.
      
      PCI DRIVER FOR MICROSEMI SWITCHTEC
      M:        Kurt Schwemmer <[email protected]>
   -  M:        Stephen Bates <[email protected]>
      M:        Logan Gunthorpe <[email protected]>
      L:        [email protected]
      S:        Maintained
@@@@@@@ -10445,8 -10445,8 -10445,8 -10344,6 -10445,8 -10445,8 +10445,8 @@@@@@@ F:       Documentation/switchtec.tx
      F:        Documentation/ABI/testing/sysfs-class-switchtec
      F:        drivers/pci/switch/switchtec*
      F:        include/uapi/linux/switchtec_ioctl.h
   +  F:        include/linux/switchtec.h
   +  F:        drivers/ntb/hw/mscc/
      
      PCI DRIVER FOR MVEBU (Marvell Armada 370 and Armada XP SOC support)
      M:        Thomas Petazzoni <[email protected]>
@@@@@@@ -10504,7 -10504,7 -10504,7 -10401,6 -10504,7 -10504,7 +10504,7 @@@@@@@ F:       drivers/pci/dwc/*keystone
      
      PCI ENDPOINT SUBSYSTEM
      M:        Kishon Vijay Abraham I <[email protected]>
   +  M:        Lorenzo Pieralisi <[email protected]>
      L:        [email protected]
      T:        git git://git.kernel.org/pub/scm/linux/kernel/git/kishon/pci-endpoint.git
      S:        Supported
@@@@@@@ -10556,15 -10556,15 -10556,15 -10452,6 -10556,15 -10556,15 +10556,15 @@@@@@@ F: include/linux/pci
      F:        arch/x86/pci/
      F:        arch/x86/kernel/quirks.c
      
   +  PCI NATIVE HOST BRIDGE AND ENDPOINT DRIVERS
   +  M:        Lorenzo Pieralisi <[email protected]>
   +  L:        [email protected]
   +  Q:        http://patchwork.ozlabs.org/project/linux-pci/list/
   +  T:        git git://git.kernel.org/pub/scm/linux/kernel/git/lpieralisi/pci.git/
   +  S:        Supported
   +  F:        drivers/pci/host/
   +  F:        drivers/pci/dwc/
   +  
      PCIE DRIVER FOR AXIS ARTPEC
      M:        Niklas Cassel <[email protected]>
      M:        Jesper Nilsson <[email protected]>
@@@@@@@ -10584,6 -10584,6 -10584,6 -10471,7 -10584,6 -10584,6 +10584,6 @@@@@@@ F:       drivers/pci/host/pci-thunder-
      
      PCIE DRIVER FOR HISILICON
      M:        Zhou Wang <[email protected]>
   -  M:        Gabriele Paoloni <[email protected]>
      L:        [email protected]
      S:        Maintained
      F:        Documentation/devicetree/bindings/pci/hisilicon-pcie.txt
@@@@@@@ -10597,14 -10597,14 -10597,14 -10485,6 -10597,14 -10597,14 +10597,14 @@@@@@@ S: Maintaine
      F:        Documentation/devicetree/bindings/pci/pcie-kirin.txt
      F:        drivers/pci/dwc/pcie-kirin.c
      
   +  PCIE DRIVER FOR HISILICON STB
   +  M:        Jianguo Sun <[email protected]>
   +  M:        Shawn Guo <[email protected]>
   +  L:        [email protected]
   +  S:        Maintained
   +  F:        Documentation/devicetree/bindings/pci/hisilicon-histb-pcie.txt
   +  F:        drivers/pci/dwc/pcie-histb.c
   +  
      PCIE DRIVER FOR MEDIATEK
      M:        Ryder Lee <[email protected]>
      L:        [email protected]
@@@@@@@ -10628,13 -10628,13 -10628,13 -10508,6 -10628,13 -10628,13 +10628,13 @@@@@@@ S: Maintaine
      F:        Documentation/devicetree/bindings/pci/rockchip-pcie.txt
      F:        drivers/pci/host/pcie-rockchip.c
      
   +  PCI DRIVER FOR V3 SEMICONDUCTOR V360EPC
   +  M:        Linus Walleij <[email protected]>
   +  L:        [email protected]
   +  S:        Maintained
   +  F:        Documentation/devicetree/bindings/pci/v3-v360epc-pci.txt
   +  F:        drivers/pci/host/pci-v3-semi.c
   +  
      PCIE DRIVER FOR ST SPEAR13XX
      M:        Pratyush Anand <[email protected]>
      L:        [email protected]
@@@@@@@ -10665,12 -10665,12 -10665,12 -10538,6 -10665,12 -10665,12 +10665,12 @@@@@@@ S: Maintaine
      F:        crypto/pcrypt.c
      F:        include/crypto/pcrypt.h
      
   +  PEAQ WMI HOTKEYS DRIVER
   +  M:        Hans de Goede <[email protected]>
   +  L:        [email protected]
   +  S:        Maintained
   +  F:        drivers/platform/x86/peaq-wmi.c
   +  
      PER-CPU MEMORY ALLOCATOR
      M:        Tejun Heo <[email protected]>
      M:        Christoph Lameter <[email protected]>
@@@@@@@ -10784,7 -10784,7 -10784,7 -10651,6 -10784,7 -10784,7 +10784,7 @@@@@@@ PIN CONTROLLER - RENESA
      M:        Laurent Pinchart <[email protected]>
      M:        Geert Uytterhoeven <[email protected]>
      L:        [email protected]
   +  T:        git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git sh-pfc
      S:        Maintained
      F:        drivers/pinctrl/sh-pfc/
      
@@@@@@@ -11166,6 -11166,6 -11166,6 -11032,7 -11166,6 -11166,6 +11166,6 @@@@@@@ F:       drivers/mtd/nand/pxa3xx_nand.
      
      QAT DRIVER
      M:        Giovanni Cabiddu <[email protected]>
   -  M:        Salvatore Benedetto <[email protected]>
      L:        [email protected]
      S:        Supported
      F:        drivers/crypto/qat/
@@@@@@@ -11213,7 -11213,7 -11213,7 -11080,6 -11213,7 -11213,7 +11213,7 @@@@@@@ F:       drivers/net/ethernet/qlogic/qede
      
      QLOGIC QL4xxx RDMA DRIVER
      M:        Ram Amrani <[email protected]>
   +  M:        Michal Kalderon <[email protected]>
      M:        Ariel Elior <[email protected]>
      L:        [email protected]
      S:        Supported
@@@@@@@ -11584,7 -11584,7 -11584,7 -11450,6 -11584,7 -11584,7 +11584,7 @@@@@@@ F:       include/linux/rpmsg
      RENESAS CLOCK DRIVERS
      M:        Geert Uytterhoeven <[email protected]>
      L:        [email protected]
   +  T:        git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git clk-renesas
      S:        Supported
      F:        drivers/clk/renesas/
      
@@@@@@@ -11627,7 -11627,7 -11627,7 -11492,6 -11627,7 -11627,7 +11627,7 @@@@@@@ T:       git git://git.kernel.org/pub/scm/lin
      T:        git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git
      S:        Maintained
      F:        Documentation/rfkill.txt
   +  F:        Documentation/ABI/stable/sysfs-class-rfkill
      F:        net/rfkill/
      
      RHASHTABLE
@@@@@@@ -11649,16 -11649,16 -11649,16 -11513,6 -11649,16 -11649,16 +11649,16 @@@@@@@ S: Maintaine
      F:        drivers/mtd/nand/r852.c
      F:        drivers/mtd/nand/r852.h
      
   +  RISC-V ARCHITECTURE
   +  M:        Palmer Dabbelt <[email protected]>
   +  M:        Albert Ou <[email protected]>
   +  L:        [email protected]
   +  T:        git https://github.com/riscv/riscv-linux
   +  S:        Supported
   +  F:        arch/riscv/
   +  K:        riscv
   +  N:        riscv
   +  
      ROCCAT DRIVERS
      M:        Stefan Achatz <[email protected]>
      W:        http://sourceforge.net/projects/roccat/
@@@@@@@ -11667,13 -11667,13 -11667,13 -11521,6 -11667,13 -11667,13 +11667,13 @@@@@@@ F: drivers/hid/hid-roccat
      F:        include/linux/hid-roccat*
      F:        Documentation/ABI/*/sysfs-driver-hid-roccat*
      
   +  ROCKCHIP RASTER 2D GRAPHIC ACCELERATION UNIT DRIVER
   +  M:        Jacob chen <[email protected]>
   +  L:        [email protected]
   +  S:        Maintained
   +  F:        drivers/media/platform/rockchip/rga/
   +  F:        Documentation/devicetree/bindings/media/rockchip-rga.txt
   +  
      ROCKER DRIVER
      M:        Jiri Pirko <[email protected]>
      L:        [email protected]
@@@@@@@ -11777,18 -11777,6 -11777,6 -11624,6 -11777,6 -11777,6 +11777,18 @@@@@@@ T:     git git://git.kernel.org/pub/scm/lin
      S:        Maintained
      F:        drivers/net/wireless/realtek/rtl8xxxu/
      
 +++++RXRPC SOCKETS (AF_RXRPC)
 +++++M:        David Howells <[email protected]>
 +++++L:        [email protected]
 +++++S:        Supported
 +++++F:        net/rxrpc/
 +++++F:        include/keys/rxrpc-type.h
 +++++F:        include/net/af_rxrpc.h
 +++++F:        include/trace/events/rxrpc.h
 +++++F:        include/uapi/linux/rxrpc.h
 +++++F:        Documentation/networking/rxrpc.txt
 +++++W:        https://www.infradead.org/~dhowells/kafs/
 +++++
      S3 SAVAGE FRAMEBUFFER DRIVER
      M:        Antonino Daplas <[email protected]>
      L:        [email protected]
@@@@@@@ -11930,7 -11918,7 -11918,7 -11765,7 -11918,7 -11918,7 +11930,7 @@@@@@@ L:       [email protected]
      L:        [email protected]
      S:        Maintained
      F:        drivers/crypto/exynos-rng.c
   -  F:        Documentation/devicetree/bindings/rng/samsung,exynos-rng4.txt
   +  F:        Documentation/devicetree/bindings/crypto/samsung,exynos-rng4.txt
      
      SAMSUNG FRAMEBUFFER DRIVER
      M:        Jingoo Han <[email protected]>
@@@@@@@ -12213,15 -12201,15 -12201,15 -12048,10 -12201,15 -12201,15 +12213,15 @@@@@@@ L:        [email protected]
      S:        Maintained
      F:        drivers/mmc/host/sdhci-spear.c
      
   +  SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) TI OMAP DRIVER
   +  M:        Kishon Vijay Abraham I <[email protected]>
   +  L:        [email protected]
   +  S:        Maintained
   +  F:        drivers/mmc/host/sdhci-omap.c
   +  
      SECURE ENCRYPTING DEVICE (SED) OPAL DRIVER
      M:        Scott Bauer <[email protected]>
      M:        Jonathan Derrick <[email protected]>
   -  M:        Rafael Antognolli <[email protected]>
      L:        [email protected]
      S:        Supported
      F:        block/sed*
@@@@@@@ -12622,10 -12610,10 -12610,10 -12452,7 -12610,10 -12610,10 +12622,10 @@@@@@@ M: Shaohua Li <[email protected]
      L:        [email protected]
      T:        git git://git.kernel.org/pub/scm/linux/kernel/git/shli/md.git
      S:        Supported
   -  F:        drivers/md/
   +  F:        drivers/md/Makefile
   +  F:        drivers/md/Kconfig
   +  F:        drivers/md/md*
   +  F:        drivers/md/raid*
      F:        include/linux/raid/
      F:        include/uapi/linux/raid/
      
@@@@@@@ -12642,14 -12630,6 -12630,6 -12469,6 -12630,6 -12630,6 +12642,14 @@@@@@@ S:     Maintaine
      F:        drivers/ssb/
      F:        include/linux/ssb/
      
 +++++SONY IMX274 SENSOR DRIVER
 +++++M:        Leon Luo <[email protected]>
 +++++L:        [email protected]
 +++++T:        git git://linuxtv.org/media_tree.git
 +++++S:        Maintained
 +++++F:        drivers/media/i2c/imx274.c
 +++++F:        Documentation/devicetree/bindings/media/i2c/imx274.txt
 +++++
      SONY MEMORYSTICK CARD SUPPORT
      M:        Alex Dubov <[email protected]>
      W:        http://tifmxx.berlios.de/
@@@@@@@ -12843,13 -12823,13 -12823,13 -12662,6 -12823,13 -12823,13 +12843,13 @@@@@@@ L: [email protected]
      S:        Supported
      F:        Documentation/process/stable-kernel-rules.rst
      
   +  STAGING - ATOMISP DRIVER
   +  M:        Alan Cox <[email protected]>
   +  M:        Sakari Ailus <[email protected]>
   +  L:        [email protected]
   +  S:        Maintained
   +  F:        drivers/staging/media/atomisp/
   +  
      STAGING - COMEDI
      M:        Ian Abbott <[email protected]>
      M:        H Hartley Sweeten <[email protected]>
@@@@@@@ -13093,22 -13073,22 -13073,22 -12905,9 -13073,22 -13073,22 +13093,22 @@@@@@@ F: arch/arc/plat-axs10
      F:        arch/arc/boot/dts/ax*
      F:        Documentation/devicetree/bindings/arc/axs10*
      
   +  SYNOPSYS AXS10x RESET CONTROLLER DRIVER
   +  M:        Eugeniy Paltsev <[email protected]>
   +  S:        Supported
   +  F:        drivers/reset/reset-axs10x.c
   +  F:        Documentation/devicetree/bindings/reset/snps,axs10x-reset.txt
   +  
   +  SYNOPSYS DESIGNWARE APB GPIO DRIVER
   +  M:        Hoan Tran <[email protected]>
   +  L:        [email protected]
   +  S:        Maintained
   +  F:        drivers/gpio/gpio-dwapb.c
   +  F:        Documentation/devicetree/bindings/gpio/snps-dwapb-gpio.txt
   +  
      SYNOPSYS DESIGNWARE DMAC DRIVER
      M:        Viresh Kumar <[email protected]>
   -  M:        Andy Shevchenko <[email protected]>
   +  R:        Andy Shevchenko <[email protected]>
      S:        Maintained
      F:        include/linux/dma/dw.h
      F:        include/linux/platform_data/dma-dw.h
@@@@@@@ -13116,7 -13096,6 -13096,6 -12915,6 -13096,6 -13096,6 +13116,7 @@@@@@@ F:       drivers/dma/dw
      
      SYNOPSYS DESIGNWARE ENTERPRISE ETHERNET DRIVER
      M:        Jie Deng <[email protected]>
 +++++M:        Jose Abreu <[email protected]>
      L:        [email protected]
      S:        Supported
      F:        drivers/net/ethernet/synopsys/
@@@@@@@ -13490,19 -13469,18 -13469,18 -13288,8 -13469,18 -13469,18 +13490,19 @@@@@@@ M: Andreas Noever <andreas.noever@gmail
      M:        Michael Jamet <[email protected]>
      M:        Mika Westerberg <[email protected]>
      M:        Yehezkel Bernat <[email protected]>
   +  T:        git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git
      S:        Maintained
 +++++F:        Documentation/admin-guide/thunderbolt.rst
      F:        drivers/thunderbolt/
   +  F:        include/linux/thunderbolt.h
   +  
   +  THUNDERBOLT NETWORK DRIVER
   +  M:        Michael Jamet <[email protected]>
   +  M:        Mika Westerberg <[email protected]>
   +  M:        Yehezkel Bernat <[email protected]>
   +  L:        [email protected]
   +  S:        Maintained
   +  F:        drivers/net/thunderbolt.c
      
      THUNDERX GPIO DRIVER
      M:        David Daney <[email protected]>
@@@@@@@ -13670,8 -13648,10 -13648,10 -13457,10 -13648,10 -13648,10 +13670,8 @@@@@@@ F:  drivers/net/wireless/ti
      F:        include/linux/wl12xx.h
      
      TILE ARCHITECTURE
 -----M:        Chris Metcalf <[email protected]>
      W:        http://www.mellanox.com/repository/solutions/tile-scm/
 -----T:        git git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile.git
 -----S:        Supported
 +++++S:        Orphan
      F:        arch/tile/
      F:        drivers/char/tile-srom.c
      F:        drivers/edac/tile_edac.c
@@@@@@@ -13809,14 -13789,14 -13789,14 -13598,23 -13789,14 -13789,14 +13809,14 @@@@@@@ F:        drivers/platform/x86/toshiba-wmi.
      
      TPM DEVICE DRIVER
      M:        Peter Huewe <[email protected]>
   -  M:        Marcel Selhorst <[email protected]>
      M:        Jarkko Sakkinen <[email protected]>
      R:        Jason Gunthorpe <[email protected]>
   -  W:        http://tpmdd.sourceforge.net
   -  L:        [email protected] (moderated for non-subscribers)
   -  Q:        https://patchwork.kernel.org/project/tpmdd-devel/list/
   +  L:        [email protected]
   +  Q:        https://patchwork.kernel.org/project/linux-integrity/list/
      T:        git git://git.infradead.org/users/jjs/linux-tpmdd.git
      S:        Maintained
      F:        drivers/char/tpm/
      
   -  TPM IBM_VTPM DEVICE DRIVER
   -  M:        Ashley Lai <[email protected]>
   -  W:        http://tpmdd.sourceforge.net
   -  L:        [email protected] (moderated for non-subscribers)
   -  S:        Maintained
   -  F:        drivers/char/tpm/tpm_ibmvtpm*
   -  
      TRACING
      M:        Steven Rostedt <[email protected]>
      M:        Ingo Molnar <[email protected]>
@@@@@@@ -13851,6 -13831,6 -13831,13 -13649,6 -13831,6 -13831,6 +13851,13 @@@@@@@ T:     git git://git.kernel.org/pub/scm/lin
      S:        Maintained
      K:        ^Subject:.*(?i)trivial
      
++ +++TEMPO SEMICONDUCTOR DRIVERS
++ +++M:        Steven Eckhoff <[email protected]>
++ +++S:        Maintained
++ +++F:        sound/soc/codecs/tscs*.c
++ +++F:        sound/soc/codecs/tscs*.h
++ +++F:        Documentation/devicetree/bindings/sound/tscs*.txt
++ +++
      TTY LAYER
      M:        Greg Kroah-Hartman <[email protected]>
      M:        Jiri Slaby <[email protected]>
@@@@@@@ -13957,7 -13937,7 -13944,7 -13755,7 -13937,7 -13937,7 +13964,7 @@@@@@@ UDRAW TABLE
      M:        Bastien Nocera <[email protected]>
      L:        [email protected]
      S:        Maintained
   -  F:        drivers/hid/hid-udraw.c
   +  F:        drivers/hid/hid-udraw-ps3.c
      
      UFS FILESYSTEM
      M:        Evgeniy Dushistov <[email protected]>
@@@@@@@ -14480,15 -14460,15 -14467,15 -14278,12 -14460,15 -14460,15 +14487,15 @@@@@@@ S:        Maintaine
      F:        include/linux/virtio_vsock.h
      F:        include/uapi/linux/virtio_vsock.h
      F:        include/uapi/linux/vsockmon.h
   +  F:        include/uapi/linux/vm_sockets_diag.h
   +  F:        net/vmw_vsock/diag.c
      F:        net/vmw_vsock/af_vsock_tap.c
      F:        net/vmw_vsock/virtio_transport_common.c
      F:        net/vmw_vsock/virtio_transport.c
      F:        drivers/net/vsockmon.c
      F:        drivers/vhost/vsock.c
      F:        drivers/vhost/vsock.h
   +  F:        tools/testing/vsock/
      
      VIRTIO CONSOLE DRIVER
      M:        Amit Shah <[email protected]>
@@@@@@@ -14529,7 -14509,7 -14516,7 -14324,6 -14509,7 -14509,7 +14536,7 @@@@@@@ L:       [email protected]
      L:        [email protected]
      S:        Supported
      F:        drivers/s390/virtio/
   +  F:        arch/s390/include/uapi/asm/virtio-ccw.h
      
      VIRTIO GPU DRIVER
      M:        David Airlie <[email protected]>
@@@@@@@ -14585,7 -14565,7 -14572,7 -14379,7 -14565,7 -14565,7 +14592,7 @@@@@@@ M:       Manohar Vanga <[email protected]
      M:        Greg Kroah-Hartman <[email protected]>
      L:        [email protected]
      S:        Maintained
   -  T:        git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git
   +  T:        git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git
      F:        Documentation/driver-api/vme.rst
      F:        drivers/staging/vme/
      F:        drivers/vme/
@@@@@@@ -14752,6 -14732,6 -14739,6 -14546,7 -14732,6 -14732,6 +14759,6 @@@@@@@ L:       [email protected]
      S:        Supported
      W:        http://wireless.kernel.org/en/users/Drivers/wil6210
      F:        drivers/net/wireless/ath/wil6210/
   -  F:        include/uapi/linux/wil6210_uapi.h
      
      WIMAX STACK
      M:        Inaky Perez-Gonzalez <[email protected]>
@@@@@@@ -14936,7 -14916,7 -14923,7 -14731,6 -14916,7 -14916,7 +14943,7 @@@@@@@ F:       arch/x86/xen
      F:        drivers/*/xen-*front.c
      F:        drivers/xen/
      F:        arch/x86/include/asm/xen/
   +  F:        arch/x86/include/asm/pvclock-abi.h
      F:        include/xen/
      F:        include/uapi/xen/
      F:        Documentation/ABI/stable/sysfs-hypervisor-xen
diff --combined sound/soc/codecs/Kconfig
index 9af2588b151617a47fc15283f69ed3b99e7ed572,a42ddbc93f3df1e52bd3f8f188779ddfe198ed1b,fe3bff2f4238a1b8251370fe748053be2864bd78,a42ddbc93f3df1e52bd3f8f188779ddfe198ed1b,a42ddbc93f3df1e52bd3f8f188779ddfe198ed1b,a42ddbc93f3df1e52bd3f8f188779ddfe198ed1b..b228cc13191a7a275b0c1d6742d1a452103d7751
--- 1/sound/soc/codecs/Kconfig
--- 2/sound/soc/codecs/Kconfig
--- 3/sound/soc/codecs/Kconfig
--- 4/sound/soc/codecs/Kconfig
--- 5/sound/soc/codecs/Kconfig
--- 6/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@@@@@@ -95,7 -95,6 -95,6 -95,6 -95,6 -95,6 +95,7 @@@@@@@ config SND_SOC_ALL_CODEC
        select SND_SOC_MAX98925 if I2C
        select SND_SOC_MAX98926 if I2C
        select SND_SOC_MAX98927 if I2C
 +++++  select SND_SOC_MAX98373 if I2C
        select SND_SOC_MAX9850 if I2C
        select SND_SOC_MAX9860 if I2C
        select SND_SOC_MAX9768 if I2C
@@@@@@@ -110,8 -109,6 -109,6 -109,6 -109,6 -109,6 +110,8 @@@@@@@
        select SND_SOC_PCM1681 if I2C
        select SND_SOC_PCM179X_I2C if I2C
        select SND_SOC_PCM179X_SPI if SPI_MASTER
 +++++  select SND_SOC_PCM186X_I2C if I2C
 +++++  select SND_SOC_PCM186X_SPI if SPI_MASTER
        select SND_SOC_PCM3008
        select SND_SOC_PCM3168A_I2C if I2C
        select SND_SOC_PCM3168A_SPI if SPI_MASTER
@@@@@@@ -151,7 -148,6 -148,6 -148,6 -148,6 -148,6 +151,7 @@@@@@@
        select SND_SOC_TAS5086 if I2C
        select SND_SOC_TAS571X if I2C
        select SND_SOC_TAS5720 if I2C
 +++++  select SND_SOC_TAS6424 if I2C
        select SND_SOC_TFA9879 if I2C
        select SND_SOC_TLV320AIC23_I2C if I2C
        select SND_SOC_TLV320AIC23_SPI if SPI_MASTER
@@@@@@@ -162,6 -158,6 -158,7 -158,6 -158,6 -158,6 +162,7 @@@@@@@
        select SND_SOC_TLV320AIC3X if I2C
        select SND_SOC_TPA6130A2 if I2C
        select SND_SOC_TLV320DAC33 if I2C
++ +++  select SND_SOC_TSCS42XX if I2C
        select SND_SOC_TS3A227E if I2C
        select SND_SOC_TWL4030 if TWL4030_CORE
        select SND_SOC_TWL6040 if TWL6040_CORE
@@@@@@@ -627,10 -623,6 -624,6 -623,6 -623,6 -623,6 +628,10 @@@@@@@ config SND_SOC_MAX9892
        tristate "Maxim Integrated MAX98927 Speaker Amplifier"
        depends on I2C
      
 +++++config SND_SOC_MAX98373
 +++++  tristate "Maxim Integrated MAX98373 Speaker Amplifier"
 +++++  depends on I2C
 +++++
      config SND_SOC_MAX9850
        tristate
      
@@@@@@@ -669,21 -661,6 -662,6 -661,6 -661,6 -661,6 +670,21 @@@@@@@ config SND_SOC_PCM179X_SP
          Enable support for Texas Instruments PCM179x CODEC.
          Select this if your PCM179x is connected via an SPI bus.
      
 +++++config SND_SOC_PCM186X
 +++++  tristate
 +++++
 +++++config SND_SOC_PCM186X_I2C
 +++++  tristate "Texas Instruments PCM186x CODECs - I2C"
 +++++  depends on I2C
 +++++  select SND_SOC_PCM186X
 +++++  select REGMAP_I2C
 +++++
 +++++config SND_SOC_PCM186X_SPI
 +++++  tristate "Texas Instruments PCM186x CODECs - SPI"
 +++++  depends on SPI_MASTER
 +++++  select SND_SOC_PCM186X
 +++++  select REGMAP_SPI
 +++++
      config SND_SOC_PCM3008
             tristate
      
@@@@@@@ -906,13 -883,6 -884,6 -883,6 -883,6 -883,6 +907,13 @@@@@@@ config SND_SOC_TAS572
          Enable support for Texas Instruments TAS5720L/M high-efficiency mono
          Class-D audio power amplifiers.
      
 +++++config SND_SOC_TAS6424
 +++++  tristate "Texas Instruments TAS6424 Quad-Channel Audio amplifier"
 +++++  depends on I2C
 +++++  help
 +++++    Enable support for Texas Instruments TAS6424 high-efficiency
 +++++    digital input quad-channel Class-D audio power amplifiers.
 +++++
      config SND_SOC_TFA9879
        tristate "NXP Semiconductors TFA9879 amplifier"
        depends on I2C
@@@@@@@ -943,12 -913,12 -914,12 -913,12 -913,12 -913,12 +944,12 @@@@@@@ config SND_SOC_TLV320AIC32X
        tristate
      
      config SND_SOC_TLV320AIC32X4_I2C
 -----  tristate
 +++++  tristate "Texas Instruments TLV320AIC32x4 audio CODECs - I2C"
        depends on I2C
        select SND_SOC_TLV320AIC32X4
      
      config SND_SOC_TLV320AIC32X4_SPI
 -----  tristate
 +++++  tristate "Texas Instruments TLV320AIC32x4 audio CODECs - SPI"
        depends on SPI_MASTER
        select SND_SOC_TLV320AIC32X4
      
@@@@@@@ -963,6 -933,6 -934,13 -933,6 -933,6 -933,6 +964,13 @@@@@@@ config SND_SOC_TS3A227
        tristate "TI Headset/Mic detect and keypress chip"
        depends on I2C
      
++ +++config SND_SOC_TSCS42XX
++ +++  tristate "Tempo Semiconductor TSCS42xx CODEC"
++ +++  depends on I2C
++ +++  select REGMAP_I2C
++ +++  help
++ +++    Add support for Tempo Semiconductor's TSCS42xx audio CODEC.
++ +++
      config SND_SOC_TWL4030
        select MFD_TWL4030_AUDIO
        tristate
diff --combined sound/soc/codecs/Makefile
index 49db8e93a11f2725c4db766d9e2ffc1bb0ed87ca,0001069ce2a7e2f346cd7775f144864282d622e8,ded86bceca378b8077e5b8802780c4e5659b5e40,0001069ce2a7e2f346cd7775f144864282d622e8,0001069ce2a7e2f346cd7775f144864282d622e8,0001069ce2a7e2f346cd7775f144864282d622e8..fcc5073f6d614a4ee5d01f59434662c3e4bd5e56
--- 1/sound/soc/codecs/Makefile
--- 2/sound/soc/codecs/Makefile
--- 3/sound/soc/codecs/Makefile
--- 4/sound/soc/codecs/Makefile
--- 5/sound/soc/codecs/Makefile
--- 6/sound/soc/codecs/Makefile
+++ b/sound/soc/codecs/Makefile
@@@@@@@ -90,7 -90,6 -90,6 -90,6 -90,6 -90,6 +90,7 @@@@@@@ snd-soc-max9867-objs := max9867.
      snd-soc-max98925-objs := max98925.o
      snd-soc-max98926-objs := max98926.o
      snd-soc-max98927-objs := max98927.o
 +++++snd-soc-max98373-objs := max98373.o
      snd-soc-max9850-objs := max9850.o
      snd-soc-max9860-objs := max9860.o
      snd-soc-mc13783-objs := mc13783.o
@@@@@@@ -106,9 -105,6 -105,6 -105,6 -105,6 -105,6 +106,9 @@@@@@@ snd-soc-pcm1681-objs := pcm1681.
      snd-soc-pcm179x-codec-objs := pcm179x.o
      snd-soc-pcm179x-i2c-objs := pcm179x-i2c.o
      snd-soc-pcm179x-spi-objs := pcm179x-spi.o
 +++++snd-soc-pcm186x-objs := pcm186x.o
 +++++snd-soc-pcm186x-i2c-objs := pcm186x-i2c.o
 +++++snd-soc-pcm186x-spi-objs := pcm186x-spi.o
      snd-soc-pcm3008-objs := pcm3008.o
      snd-soc-pcm3168a-objs := pcm3168a.o
      snd-soc-pcm3168a-i2c-objs := pcm3168a-i2c.o
@@@@@@@ -160,7 -156,6 -156,6 -156,6 -156,6 -156,6 +160,7 @@@@@@@ snd-soc-sti-sas-objs := sti-sas.
      snd-soc-tas5086-objs := tas5086.o
      snd-soc-tas571x-objs := tas571x.o
      snd-soc-tas5720-objs := tas5720.o
 +++++snd-soc-tas6424-objs := tas6424.o
      snd-soc-tfa9879-objs := tfa9879.o
      snd-soc-tlv320aic23-objs := tlv320aic23.o
      snd-soc-tlv320aic23-i2c-objs := tlv320aic23-i2c.o
@@@@@@@ -172,6 -167,6 -167,7 -167,6 -167,6 -167,6 +172,7 @@@@@@@ snd-soc-tlv320aic32x4-i2c-objs := tlv32
      snd-soc-tlv320aic32x4-spi-objs := tlv320aic32x4-spi.o
      snd-soc-tlv320aic3x-objs := tlv320aic3x.o
      snd-soc-tlv320dac33-objs := tlv320dac33.o
++ +++snd-soc-tscs42xx-objs := tscs42xx.o
      snd-soc-ts3a227e-objs := ts3a227e.o
      snd-soc-twl4030-objs := twl4030.o
      snd-soc-twl6040-objs := twl6040.o
@@@@@@@ -335,7 -330,6 -331,6 -330,6 -330,6 -330,6 +336,7 @@@@@@@ obj-$(CONFIG_SND_SOC_MAX9867)  += snd-so
      obj-$(CONFIG_SND_SOC_MAX98925)    += snd-soc-max98925.o
      obj-$(CONFIG_SND_SOC_MAX98926)    += snd-soc-max98926.o
      obj-$(CONFIG_SND_SOC_MAX98927)    += snd-soc-max98927.o
 +++++obj-$(CONFIG_SND_SOC_MAX98373)    += snd-soc-max98373.o
      obj-$(CONFIG_SND_SOC_MAX9850)     += snd-soc-max9850.o
      obj-$(CONFIG_SND_SOC_MAX9860)     += snd-soc-max9860.o
      obj-$(CONFIG_SND_SOC_MC13783)     += snd-soc-mc13783.o
@@@@@@@ -351,9 -345,6 -346,6 -345,6 -345,6 -345,6 +352,9 @@@@@@@ obj-$(CONFIG_SND_SOC_PCM1681)  += snd-so
      obj-$(CONFIG_SND_SOC_PCM179X)     += snd-soc-pcm179x-codec.o
      obj-$(CONFIG_SND_SOC_PCM179X_I2C) += snd-soc-pcm179x-i2c.o
      obj-$(CONFIG_SND_SOC_PCM179X_SPI) += snd-soc-pcm179x-spi.o
 +++++obj-$(CONFIG_SND_SOC_PCM186X)     += snd-soc-pcm186x.o
 +++++obj-$(CONFIG_SND_SOC_PCM186X_I2C) += snd-soc-pcm186x-i2c.o
 +++++obj-$(CONFIG_SND_SOC_PCM186X_SPI) += snd-soc-pcm186x-spi.o
      obj-$(CONFIG_SND_SOC_PCM3008)     += snd-soc-pcm3008.o
      obj-$(CONFIG_SND_SOC_PCM3168A)    += snd-soc-pcm3168a.o
      obj-$(CONFIG_SND_SOC_PCM3168A_I2C)        += snd-soc-pcm3168a-i2c.o
@@@@@@@ -404,7 -395,6 -396,6 -395,6 -395,6 -395,6 +405,7 @@@@@@@ obj-$(CONFIG_SND_SOC_TAS2552)  += snd-so
      obj-$(CONFIG_SND_SOC_TAS5086)     += snd-soc-tas5086.o
      obj-$(CONFIG_SND_SOC_TAS571X)     += snd-soc-tas571x.o
      obj-$(CONFIG_SND_SOC_TAS5720)     += snd-soc-tas5720.o
 +++++obj-$(CONFIG_SND_SOC_TAS6424)     += snd-soc-tas6424.o
      obj-$(CONFIG_SND_SOC_TFA9879)     += snd-soc-tfa9879.o
      obj-$(CONFIG_SND_SOC_TLV320AIC23) += snd-soc-tlv320aic23.o
      obj-$(CONFIG_SND_SOC_TLV320AIC23_I2C)     += snd-soc-tlv320aic23-i2c.o
@@@@@@@ -416,6 -406,6 -407,7 -406,6 -406,6 -406,6 +417,7 @@@@@@@ obj-$(CONFIG_SND_SOC_TLV320AIC32X4_I2C
      obj-$(CONFIG_SND_SOC_TLV320AIC32X4_SPI)   += snd-soc-tlv320aic32x4-spi.o
      obj-$(CONFIG_SND_SOC_TLV320AIC3X) += snd-soc-tlv320aic3x.o
      obj-$(CONFIG_SND_SOC_TLV320DAC33) += snd-soc-tlv320dac33.o
++ +++obj-$(CONFIG_SND_SOC_TSCS42XX)    += snd-soc-tscs42xx.o
      obj-$(CONFIG_SND_SOC_TS3A227E)    += snd-soc-ts3a227e.o
      obj-$(CONFIG_SND_SOC_TWL4030)     += snd-soc-twl4030.o
      obj-$(CONFIG_SND_SOC_TWL6040)     += snd-soc-twl6040.o
Empty description
This page took 0.218287 seconds and 4 git commands to generate.