Merge tag 'selinux-pr-20170831' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 24f57993d78a371ef3ea46aca7ea94de0c64154b..e57a4eaec077b87ff4c9c29915ae6026c0301b1d 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2101,17 +2101,38 @@ F:      arch/arm/mach-pxa/include/mach/z2.h
 ARM/ZTE ARCHITECTURE
 M:     Jun Nie <jun.nie@linaro.org>
 M:     Baoyou Xie <baoyou.xie@linaro.org>
+M:     Shawn Guo <shawnguo@kernel.org>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
+F:     arch/arm/boot/dts/zx2967*
 F:     arch/arm/mach-zx/
+F:     arch/arm64/boot/dts/zte/
 F:     drivers/clk/zte/
+F:     drivers/dma/zx_dma.c
+F:     drivers/gpio/gpio-zx.c
+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
 F:     Documentation/devicetree/bindings/arm/zte.txt
-F:     Documentation/devicetree/bindings/clock/zx296702-clk.txt
+F:     Documentation/devicetree/bindings/clock/zx2967*.txt
+F:     Documentation/devicetree/bindings/dma/zxdma.txt
+F:     Documentation/devicetree/bindings/gpio/zx296702-gpio.txt
+F:     Documentation/devicetree/bindings/i2c/i2c-zx2967.txt
+F:     Documentation/devicetree/bindings/mmc/zx-dw-mshc.txt
+F:     Documentation/devicetree/bindings/pinctrl/pinctrl-zx.txt
 F:     Documentation/devicetree/bindings/reset/zte,zx2967-reset.txt
 F:     Documentation/devicetree/bindings/soc/zte/
-F:     include/dt-bindings/soc/zx*.h
+F:     Documentation/devicetree/bindings/sound/zte,*.txt
+F:     Documentation/devicetree/bindings/thermal/zx2967-thermal.txt
+F:     Documentation/devicetree/bindings/watchdog/zte,zx2967-wdt.txt
+F:     include/dt-bindings/clock/zx2967*.h
+F:     include/dt-bindings/soc/zte,*.h
+F:     sound/soc/codecs/zx_aud96p22.c
+F:     sound/soc/zte/
 
 ARM/ZYNQ ARCHITECTURE
 M:     Michal Simek <michal.simek@xilinx.com>
@@ -3175,6 +3196,7 @@ S:        Supported
 F:     drivers/crypto/cavium/cpt/
 
 CAVIUM THUNDERX2 ARM64 SOC
+M:     Robert Richter <rrichter@cavium.com>
 M:     Jayachandran C <jnair@caviumnetworks.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
@@ -9184,7 +9206,7 @@ T:        git git://git.infradead.org/linux-mtd.git nand/fixes
 T:     git git://git.infradead.org/l2-mtd.git nand/next
 S:     Maintained
 F:     drivers/mtd/nand/
-F:     include/linux/mtd/nand*.h
+F:     include/linux/mtd/*nand*.h
 
 NATIVE INSTRUMENTS USB SOUND INTERFACE DRIVER
 M:     Daniel Mack <zonque@gmail.com>
@@ -9276,15 +9298,6 @@ F:       net/*/netfilter/
 F:     net/netfilter/
 F:     net/bridge/br_netfilter*.c
 
-NETLABEL
-M:     Paul Moore <paul@paul-moore.com>
-W:     http://netlabel.sf.net
-L:     netdev@vger.kernel.org
-S:     Maintained
-F:     Documentation/netlabel/
-F:     include/net/netlabel.h
-F:     net/netlabel/
-
 NETROM NETWORK LAYER
 M:     Ralf Baechle <ralf@linux-mips.org>
 L:     linux-hams@vger.kernel.org
@@ -9412,10 +9425,23 @@ F:      net/ipv6/
 F:     include/net/ip*
 F:     arch/x86/net/*
 
-NETWORKING [LABELED] (NetLabel, CIPSO, Labeled IPsec, SECMARK)
+NETWORKING [LABELED] (NetLabel, Labeled IPsec, SECMARK)
 M:     Paul Moore <paul@paul-moore.com>
+W:     https://github.com/netlabel
 L:     netdev@vger.kernel.org
+L:     linux-security-module@vger.kernel.org
 S:     Maintained
+F:     Documentation/netlabel/
+F:     include/net/calipso.h
+F:     include/net/cipso_ipv4.h
+F:     include/net/netlabel.h
+F:     include/uapi/linux/netfilter/xt_SECMARK.h
+F:     include/uapi/linux/netfilter/xt_CONNSECMARK.h
+F:     net/netlabel/
+F:     net/ipv4/cipso_ipv4.c
+F:     net/ipv6/calipso.c
+F:     net/netfilter/xt_CONNSECMARK.c
+F:     net/netfilter/xt_SECMARK.c
 
 NETWORKING [TLS]
 M:     Ilya Lesokhin <ilyal@mellanox.com>
@@ -11117,6 +11143,13 @@ T:     git git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux-hexagon-kernel.g
 S:     Supported
 F:     arch/hexagon/
 
+QUALCOMM IOMMU
+M:     Rob Clark <robdclark@gmail.com>
+L:     iommu@lists.linux-foundation.org
+L:     linux-arm-msm@vger.kernel.org
+S:     Maintained
+F:     drivers/iommu/qcom_iommu.c
+
 QUALCOMM VENUS VIDEO ACCELERATOR DRIVER
 M:     Stanimir Varbanov <stanimir.varbanov@linaro.org>
 L:     linux-media@vger.kernel.org
@@ -11994,8 +12027,9 @@ M:      Paul Moore <paul@paul-moore.com>
 M:     Stephen Smalley <sds@tycho.nsa.gov>
 M:     Eric Paris <eparis@parisplace.org>
 L:     selinux@tycho.nsa.gov (moderated for non-subscribers)
-W:     http://selinuxproject.org
-T:     git git://git.infradead.org/users/pcmoore/selinux
+W:     https://selinuxproject.org
+W:     https://github.com/SELinuxProject
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git
 S:     Supported
 F:     include/linux/selinux*
 F:     security/selinux/
@@ -12482,6 +12516,7 @@ F:      drivers/tty/serial/sunsab.h
 F:     drivers/tty/serial/sunsu.c
 F:     drivers/tty/serial/sunzilog.c
 F:     drivers/tty/serial/sunzilog.h
+F:     drivers/tty/vcc.c
 
 SPARSE CHECKER
 M:     "Christopher Li" <sparse@chrisli.org>
@@ -12837,6 +12872,13 @@ L:     linux-mmc@vger.kernel.org
 S:     Maintained
 F:     drivers/mmc/host/dw_mmc*
 
+SYNOPSYS HSDK RESET CONTROLLER DRIVER
+M:     Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>
+S:     Supported
+F:     drivers/reset/reset-hsdk-v1.c
+F:     include/dt-bindings/reset/snps,hsdk-v1-reset.h
+F:     Documentation/devicetree/bindings/reset/snps,hsdk-v1-reset.txt
+
 SYSTEM CONFIGURATION (SYSCON)
 M:     Lee Jones <lee.jones@linaro.org>
 M:     Arnd Bergmann <arnd@arndb.de>