diff options
author | David S. Miller <davem@davemloft.net> | 2018-04-21 16:31:52 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-04-21 16:32:48 -0400 |
commit | e0ada51db907ed2db5d46ad7ff86a8b5df68e59b (patch) | |
tree | 858966cee69ad8a50e59c4e02dcbde6ba2916151 /MAINTAINERS | |
parent | 0638eb573cde5888c0886c7f35da604e5db209a6 (diff) | |
parent | 83beed7b2b26f232d782127792dd0cd4362fdc41 (diff) | |
download | linux-e0ada51db907ed2db5d46ad7ff86a8b5df68e59b.tar.bz2 |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts were simple overlapping changes in microchip
driver.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 90 |
1 files changed, 66 insertions, 24 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 81465707d8a8..fc812fb5857a 100644 --- 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 @@ -2426,7 +2426,6 @@ T: git git://github.com/ndyer/linux.git S: Maintained F: Documentation/devicetree/bindings/input/atmel,maxtouch.txt F: drivers/input/touchscreen/atmel_mxt_ts.c -F: include/linux/platform_data/atmel_mxt_ts.h ATMEL SAMA5D2 ADC DRIVER M: Ludovic Desroches <ludovic.desroches@microchip.com> @@ -5784,6 +5783,14 @@ F: fs/crypto/ F: include/linux/fscrypt*.h F: Documentation/filesystems/fscrypt.rst +FSNOTIFY: FILESYSTEM NOTIFICATION INFRASTRUCTURE +M: Jan Kara <jack@suse.cz> +R: Amir Goldstein <amir73il@gmail.com> +L: linux-fsdevel@vger.kernel.org +S: Maintained +F: fs/notify/ +F: include/linux/fsnotify*.h + FUJITSU LAPTOP EXTRAS M: Jonathan Woithe <jwoithe@just42.net> L: platform-driver-x86@vger.kernel.org @@ -5842,7 +5849,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 @@ -5910,6 +5917,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> @@ -6585,15 +6597,25 @@ W: https://i2c.wiki.kernel.org/ Q: https://patchwork.ozlabs.org/project/linux-i2c/list/ T: git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git S: Maintained -F: Documentation/devicetree/bindings/i2c/ +F: Documentation/devicetree/bindings/i2c/i2c.txt F: Documentation/i2c/ -F: drivers/i2c/ -F: drivers/i2c/*/ +F: drivers/i2c/* F: include/linux/i2c.h -F: include/linux/i2c-*.h +F: include/linux/i2c-dev.h +F: include/linux/i2c-smbus.h F: include/uapi/linux/i2c.h F: include/uapi/linux/i2c-*.h +I2C SUBSYSTEM HOST DRIVERS +L: linux-i2c@vger.kernel.org +W: https://i2c.wiki.kernel.org/ +Q: https://patchwork.ozlabs.org/project/linux-i2c/list/ +T: git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git +S: Odd Fixes +F: Documentation/devicetree/bindings/i2c/ +F: drivers/i2c/algos/ +F: drivers/i2c/busses/ + I2C-TAOS-EVM DRIVER M: Jean Delvare <jdelvare@suse.com> L: linux-i2c@vger.kernel.org @@ -7767,7 +7789,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 @@ -9750,6 +9772,7 @@ F: include/uapi/linux/net_namespace.h F: tools/testing/selftests/net/ F: lib/net_utils.c F: lib/random32.c +F: Documentation/networking/ NETWORKING [IPSEC] M: Steffen Klassert <steffen.klassert@secunet.com> @@ -11905,6 +11928,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 @@ -11920,6 +11948,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 @@ -12123,16 +12157,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 @@ -12147,8 +12181,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 @@ -12157,15 +12191,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/ @@ -12175,8 +12209,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 @@ -12192,8 +12226,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 @@ -12338,6 +12372,7 @@ M: Tomasz Figa <tomasz.figa@gmail.com> M: Chanwoo Choi <cw00.choi@samsung.com> S: Supported L: linux-samsung-soc@vger.kernel.org (moderated for non-subscribers) +T: git git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git F: drivers/clk/samsung/ F: include/dt-bindings/clock/exynos*.h F: Documentation/devicetree/bindings/clock/exynos*.txt @@ -12629,7 +12664,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 @@ -13974,6 +14009,13 @@ F: arch/arm/mach-davinci/ F: drivers/i2c/busses/i2c-davinci.c F: arch/arm/boot/dts/da850* +TI DAVINCI SERIES CLOCK DRIVER +M: David Lechner <david@lechnology.com> +R: Sekhar Nori <nsekhar@ti.com> +S: Maintained +F: Documentation/devicetree/bindings/clock/ti/davinci/ +F: drivers/clk/davinci/ + TI DAVINCI SERIES GPIO DRIVER M: Keerthy <j-keerthy@ti.com> L: linux-gpio@vger.kernel.org @@ -14966,7 +15008,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 |