Merge tag 'spi-v5.0' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi

[linux] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 1668e49..40f5ec0 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3006,6 +3006,14 @@ S:       Supported
 F:     drivers/gpio/gpio-brcmstb.c
 F:     Documentation/devicetree/bindings/gpio/brcm,brcmstb-gpio.txt
 
+BROADCOM BRCMSTB I2C DRIVER
+M:     Kamal Dasu <kdasu.kdev@gmail.com>
+L:     linux-i2c@vger.kernel.org
+L:     bcm-kernel-feedback-list@broadcom.com
+S:     Supported
+F:     drivers/i2c/busses/i2c-brcmstb.c
+F:     Documentation/devicetree/bindings/i2c/i2c-brcmstb.txt
+
 BROADCOM BRCMSTB USB2 and USB3 PHY DRIVER
 M:     Al Cooper <alcooperx@gmail.com>
 L:     linux-kernel@vger.kernel.org
@@ -3682,6 +3690,12 @@ S:       Maintained
 F:     Documentation/devicetree/bindings/media/coda.txt
 F:     drivers/media/platform/coda/
 
+CODE OF CONDUCT
+M:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+S:     Supported
+F:     Documentation/process/code-of-conduct.rst
+F:     Documentation/process/code-of-conduct-interpretation.rst
+
 COMMON CLK FRAMEWORK
 M:     Michael Turquette <mturquette@baylibre.com>
 M:     Stephen Boyd <sboyd@kernel.org>
@@ -6463,6 +6477,7 @@ F:        Documentation/devicetree/bindings/hwmon/
 F:     Documentation/hwmon/
 F:     drivers/hwmon/
 F:     include/linux/hwmon*.h
+F:     include/trace/events/hwmon*.h
 
 HARDWARE RANDOM NUMBER GENERATOR CORE
 M:     Matt Mackall <mpm@selenic.com>
@@ -8855,13 +8870,6 @@ S:       Maintained
 F:     Documentation/hwmon/max16065
 F:     drivers/hwmon/max16065.c
 
-MAX20751 HARDWARE MONITOR DRIVER
-M:     Guenter Roeck <linux@roeck-us.net>
-L:     linux-hwmon@vger.kernel.org
-S:     Maintained
-F:     Documentation/hwmon/max20751
-F:     drivers/hwmon/max20751.c
-
 MAX2175 SDR TUNER DRIVER
 M:     Ramesh Shanmugasundaram <ramesh.shanmugasundaram@bp.renesas.com>
 L:     linux-media@vger.kernel.org
@@ -9707,6 +9715,19 @@ S:       Maintained
 F:     arch/arm/boot/dts/mmp*
 F:     arch/arm/mach-mmp/
 
+MMU GATHER AND TLB INVALIDATION
+M:     Will Deacon <will.deacon@arm.com>
+M:     "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
+M:     Andrew Morton <akpm@linux-foundation.org>
+M:     Nick Piggin <npiggin@gmail.com>
+M:     Peter Zijlstra <peterz@infradead.org>
+L:     linux-arch@vger.kernel.org
+L:     linux-mm@kvack.org
+S:     Maintained
+F:     arch/*/include/asm/tlb.h
+F:     include/asm-generic/tlb.h
+F:     mm/mmu_gather.c
+
 MN88472 MEDIA DRIVER
 M:     Antti Palosaari <crope@iki.fi>
 L:     linux-media@vger.kernel.org
@@ -10131,7 +10152,6 @@ L:      netdev@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git
 S:     Maintained
-F:     net/core/flow.c
 F:     net/xfrm/
 F:     net/key/
 F:     net/ipv4/xfrm*
@@ -11584,7 +11604,26 @@ W:     http://hwmon.wiki.kernel.org/
 W:     http://www.roeck-us.net/linux/drivers/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git
 S:     Maintained
+F:     Documentation/devicetree/bindings/hwmon/ibm,cffps1.txt
+F:     Documentation/devicetree/bindings/hwmon/max31785.txt
+F:     Documentation/devicetree/bindings/hwmon/ltc2978.txt
+F:     Documentation/hwmon/adm1275
+F:     Documentation/hwmon/ibm-cffps
+F:     Documentation/hwmon/ir35221
+F:     Documentation/hwmon/lm25066
+F:     Documentation/hwmon/ltc2978
+F:     Documentation/hwmon/ltc3815
+F:     Documentation/hwmon/max16064
+F:     Documentation/hwmon/max20751
+F:     Documentation/hwmon/max31785
+F:     Documentation/hwmon/max34440
+F:     Documentation/hwmon/max8688
 F:     Documentation/hwmon/pmbus
+F:     Documentation/hwmon/pmbus-core
+F:     Documentation/hwmon/tps40422
+F:     Documentation/hwmon/ucd9000
+F:     Documentation/hwmon/ucd9200
+F:     Documentation/hwmon/zl6100
 F:     drivers/hwmon/pmbus/
 F:     include/linux/pmbus.h
 
@@ -13071,7 +13110,7 @@ SELINUX SECURITY MODULE
 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)
+L:     selinux@vger.kernel.org
 W:     https://selinuxproject.org
 W:     https://github.com/SELinuxProject
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git
@@ -13498,8 +13537,8 @@ L:      linux-arm-kernel@lists.infradead.org
 S:     Maintained
 F:     Documentation/devicetree/bindings/arm/firmware/sdei.txt
 F:     drivers/firmware/arm_sdei.c
-F:     include/linux/sdei.h
-F:     include/uapi/linux/sdei.h
+F:     include/linux/arm_sdei.h
+F:     include/uapi/linux/arm_sdei.h
 
 SOFTWARE RAID (Multiple Disks) SUPPORT
 M:     Shaohua Li <shli@kernel.org>