git.samba.org / sfrench / cifs-2.6.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge tag 'apparmor-pr-2018-04-10' of git://git.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git] / MAINTAINERS
diff --git a/MAINTAINERS b/MAINTAINERS
index f840786ef33dff0e06f33efd2e4d5293c492e0ab..9b091ef6579b0f8592e35cac37a4b7889570a347 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -934,8 +934,8 @@ F:  drivers/char/apm-emulation.c
 APPARMOR SECURITY MODULE
 M:     John Johansen <john.johansen@canonical.com>
 L:     apparmor@lists.ubuntu.com (subscribers-only, general discussion)
-W:     apparmor.wiki.kernel.org
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jj/apparmor-dev.git
+W:     wiki.apparmor.net
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor
 S:     Supported
 F:     security/apparmor/
 F:     Documentation/admin-guide/LSM/apparmor.rst
@@ -1232,10 +1232,15 @@ F:      Documentation/devicetree/bindings/i2c/i2c-aspeed.txt
 
 ARM/ASPEED MACHINE SUPPORT
 M:     Joel Stanley <joel@jms.id.au>
-S:     Maintained
+R:     Andrew Jeffery <andrew@aj.id.au>
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+L:     linux-aspeed@lists.ozlabs.org (moderated for non-subscribers)
+Q:     https://patchwork.ozlabs.org/project/linux-aspeed/list/
+S:     Supported
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed.git
 F:     arch/arm/mach-aspeed/
 F:     arch/arm/boot/dts/aspeed-*
-F:     drivers/*/*aspeed*
+N:     aspeed
 
 ARM/ATMEL AT91 Clock Support
 M:     Boris Brezillon <boris.brezillon@bootlin.com>
@@ -1743,7 +1748,7 @@ F:        arch/arm/mach-orion5x/ts78xx-*
 ARM/OXNAS platform support
 M:     Neil Armstrong <narmstrong@baylibre.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
-L:     linux-oxnas@lists.tuxfamily.org (moderated for non-subscribers)
+L:     linux-oxnas@groups.io (moderated for non-subscribers)
 S:     Maintained
 F:     arch/arm/mach-oxnas/
 F:     arch/arm/boot/dts/ox8*.dts*
@@ -5838,7 +5843,7 @@ F:        scripts/Makefile.gcc-plugins
 F:     Documentation/gcc-plugins.txt
 
 GCOV BASED KERNEL PROFILING
-M:     Peter Oberparleiter <oberpar@linux.vnet.ibm.com>
+M:     Peter Oberparleiter <oberpar@linux.ibm.com>
 S:     Maintained
 F:     kernel/gcov/
 F:     Documentation/dev-tools/gcov.rst
@@ -5906,6 +5911,11 @@ S:       Supported
 F:     drivers/phy/
 F:     include/linux/phy/
 
+GENERIC PINCTRL I2C DEMULTIPLEXER DRIVER
+M:     Wolfram Sang <wsa+renesas@sang-engineering.com>
+S:     Supported
+F:     drivers/i2c/muxes/i2c-demux-pinctrl.c
+
 GENERIC PM DOMAINS
 M:     "Rafael J. Wysocki" <rjw@rjwysocki.net>
 M:     Kevin Hilman <khilman@kernel.org>
@@ -7773,7 +7783,7 @@ F:        arch/powerpc/kernel/kvm*
 
 KERNEL VIRTUAL MACHINE for s390 (KVM/s390)
 M:     Christian Borntraeger <borntraeger@de.ibm.com>
-M:     Janosch Frank <frankja@linux.vnet.ibm.com>
+M:     Janosch Frank <frankja@linux.ibm.com>
 R:     David Hildenbrand <david@redhat.com>
 R:     Cornelia Huck <cohuck@redhat.com>
 L:     linux-s390@vger.kernel.org
@@ -11911,6 +11921,11 @@ T:     git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git c
 S:     Supported
 F:     drivers/clk/renesas/
 
+RENESAS EMEV2 I2C DRIVER
+M:     Wolfram Sang <wsa+renesas@sang-engineering.com>
+S:     Supported
+F:     drivers/i2c/busses/i2c-emev2.c
+
 RENESAS ETHERNET DRIVERS
 R:     Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
 L:     netdev@vger.kernel.org
@@ -11926,6 +11941,12 @@ L:     linux-iio@vger.kernel.org
 S:     Supported
 F:     drivers/iio/adc/rcar_gyro_adc.c
 
+RENESAS R-CAR I2C DRIVERS
+M:     Wolfram Sang <wsa+renesas@sang-engineering.com>
+S:     Supported
+F:     drivers/i2c/busses/i2c-rcar.c
+F:     drivers/i2c/busses/i2c-sh_mobile.c
+
 RENESAS USB PHY DRIVER
 M:     Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
 L:     linux-renesas-soc@vger.kernel.org
@@ -12129,16 +12150,16 @@ F:    Documentation/s390/
 F:     Documentation/driver-api/s390-drivers.rst
 
 S390 COMMON I/O LAYER
-M:     Sebastian Ott <sebott@linux.vnet.ibm.com>
-M:     Peter Oberparleiter <oberpar@linux.vnet.ibm.com>
+M:     Sebastian Ott <sebott@linux.ibm.com>
+M:     Peter Oberparleiter <oberpar@linux.ibm.com>
 L:     linux-s390@vger.kernel.org
 W:     http://www.ibm.com/developerworks/linux/linux390/
 S:     Supported
 F:     drivers/s390/cio/
 
 S390 DASD DRIVER
-M:     Stefan Haberland <sth@linux.vnet.ibm.com>
-M:     Jan Hoeppner <hoeppner@linux.vnet.ibm.com>
+M:     Stefan Haberland <sth@linux.ibm.com>
+M:     Jan Hoeppner <hoeppner@linux.ibm.com>
 L:     linux-s390@vger.kernel.org
 W:     http://www.ibm.com/developerworks/linux/linux390/
 S:     Supported
@@ -12153,8 +12174,8 @@ S:      Supported
 F:     drivers/iommu/s390-iommu.c
 
 S390 IUCV NETWORK LAYER
-M:     Julian Wiedmann <jwi@linux.vnet.ibm.com>
-M:     Ursula Braun <ubraun@linux.vnet.ibm.com>
+M:     Julian Wiedmann <jwi@linux.ibm.com>
+M:     Ursula Braun <ubraun@linux.ibm.com>
 L:     linux-s390@vger.kernel.org
 W:     http://www.ibm.com/developerworks/linux/linux390/
 S:     Supported
@@ -12163,15 +12184,15 @@ F:    include/net/iucv/
 F:     net/iucv/
 
 S390 NETWORK DRIVERS
-M:     Julian Wiedmann <jwi@linux.vnet.ibm.com>
-M:     Ursula Braun <ubraun@linux.vnet.ibm.com>
+M:     Julian Wiedmann <jwi@linux.ibm.com>
+M:     Ursula Braun <ubraun@linux.ibm.com>
 L:     linux-s390@vger.kernel.org
 W:     http://www.ibm.com/developerworks/linux/linux390/
 S:     Supported
 F:     drivers/s390/net/
 
 S390 PCI SUBSYSTEM
-M:     Sebastian Ott <sebott@linux.vnet.ibm.com>
+M:     Sebastian Ott <sebott@linux.ibm.com>
 M:     Gerald Schaefer <gerald.schaefer@de.ibm.com>
 L:     linux-s390@vger.kernel.org
 W:     http://www.ibm.com/developerworks/linux/linux390/
@@ -12181,8 +12202,8 @@ F:      drivers/pci/hotplug/s390_pci_hpc.c
 
 S390 VFIO-CCW DRIVER
 M:     Cornelia Huck <cohuck@redhat.com>
-M:     Dong Jia Shi <bjsdjshi@linux.vnet.ibm.com>
-M:     Halil Pasic <pasic@linux.vnet.ibm.com>
+M:     Dong Jia Shi <bjsdjshi@linux.ibm.com>
+M:     Halil Pasic <pasic@linux.ibm.com>
 L:     linux-s390@vger.kernel.org
 L:     kvm@vger.kernel.org
 S:     Supported
@@ -12198,8 +12219,8 @@ S:      Supported
 F:     drivers/s390/crypto/
 
 S390 ZFCP DRIVER
-M:     Steffen Maier <maier@linux.vnet.ibm.com>
-M:     Benjamin Block <bblock@linux.vnet.ibm.com>
+M:     Steffen Maier <maier@linux.ibm.com>
+M:     Benjamin Block <bblock@linux.ibm.com>
 L:     linux-s390@vger.kernel.org
 W:     http://www.ibm.com/developerworks/linux/linux390/
 S:     Supported
@@ -12635,7 +12656,7 @@ S:      Maintained
 F:     drivers/misc/sgi-xp/
 
 SHARED MEMORY COMMUNICATIONS (SMC) SOCKETS
-M:     Ursula Braun <ubraun@linux.vnet.ibm.com>
+M:     Ursula Braun <ubraun@linux.ibm.com>
 L:     linux-s390@vger.kernel.org
 W:     http://www.ibm.com/developerworks/linux/linux390/
 S:     Supported
@@ -14970,7 +14991,7 @@ F:      include/uapi/linux/virtio_crypto.h
 
 VIRTIO DRIVERS FOR S390
 M:     Cornelia Huck <cohuck@redhat.com>
-M:     Halil Pasic <pasic@linux.vnet.ibm.com>
+M:     Halil Pasic <pasic@linux.ibm.com>
 L:     linux-s390@vger.kernel.org
 L:     virtualization@lists.linux-foundation.org
 L:     kvm@vger.kernel.org
Unnamed repository; edit this file 'description' to name the repository.