diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-06-23 13:29:03 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-06-23 13:29:03 +0200 |
commit | 90b45399b4418a3542fe096b92840b3bf235e78e (patch) | |
tree | a75e3e37503be4fe4c7d718248bd5a844c8705e1 /MAINTAINERS | |
parent | e39956c0d35efc36acbead9fc624a9ffd7d7ab82 (diff) | |
parent | 4b972a01a7da614b4796475f933094751a295a2f (diff) |
Merge 5.2-rc6 into staging-next
We want the fixes and this resolves a merge issue as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 41 |
1 files changed, 24 insertions, 17 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 17ad4093cdf2..aab4f97b5b2f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -364,7 +364,7 @@ F: drivers/acpi/fan.c ACPI FOR ARM64 (ACPI/arm64) M: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> -M: Hanjun Guo <hanjun.guo@linaro.org> +M: Hanjun Guo <guohanjun@huawei.com> M: Sudeep Holla <sudeep.holla@arm.com> L: linux-acpi@vger.kernel.org L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) @@ -1236,7 +1236,7 @@ F: arch/arm/lib/floppydma.S F: arch/arm/include/asm/floppy.h ARM PMU PROFILING AND DEBUGGING -M: Will Deacon <will.deacon@arm.com> +M: Will Deacon <will@kernel.org> M: Mark Rutland <mark.rutland@arm.com> S: Maintained L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) @@ -1308,7 +1308,7 @@ F: Documentation/devicetree/bindings/interrupt-controller/arm,vic.txt F: drivers/irqchip/irq-vic.c ARM SMMU DRIVERS -M: Will Deacon <will.deacon@arm.com> +M: Will Deacon <will@kernel.org> R: Robin Murphy <robin.murphy@arm.com> L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained @@ -2086,7 +2086,7 @@ F: drivers/tty/serial/msm_serial.c F: drivers/usb/dwc3/dwc3-qcom.c F: include/dt-bindings/*/qcom* F: include/linux/*/qcom* -T: git git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux.git +T: git git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git ARM/RADISYS ENP2611 MACHINE SUPPORT M: Lennert Buytenhek <kernel@wantstofly.org> @@ -2551,7 +2551,7 @@ F: drivers/i2c/busses/i2c-xiic.c ARM64 PORT (AARCH64 ARCHITECTURE) M: Catalin Marinas <catalin.marinas@arm.com> -M: Will Deacon <will.deacon@arm.com> +M: Will Deacon <will@kernel.org> L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) T: git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux.git S: Maintained @@ -2735,7 +2735,7 @@ S: Maintained F: drivers/net/wireless/atmel/atmel* ATOMIC INFRASTRUCTURE -M: Will Deacon <will.deacon@arm.com> +M: Will Deacon <will@kernel.org> M: Peter Zijlstra <peterz@infradead.org> R: Boqun Feng <boqun.feng@gmail.com> L: linux-kernel@vger.kernel.org @@ -3122,7 +3122,7 @@ F: arch/arm/mach-bcm/ BROADCOM BCM2835 ARM ARCHITECTURE M: Eric Anholt <eric@anholt.net> -M: Stefan Wahren <stefan.wahren@i2se.com> +M: Stefan Wahren <wahrenst@gmx.net> L: linux-rpi-kernel@lists.infradead.org (moderated for non-subscribers) L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) T: git git://github.com/anholt/linux @@ -6235,7 +6235,6 @@ F: include/linux/ipmi-fru.h K: fmc_d.*register FPGA MANAGER FRAMEWORK -M: Alan Tull <atull@kernel.org> M: Moritz Fischer <mdf@kernel.org> L: linux-fpga@vger.kernel.org S: Maintained @@ -8567,7 +8566,7 @@ S: Odd Fixes KERNEL NFSD, SUNRPC, AND LOCKD SERVERS M: "J. Bruce Fields" <bfields@fieldses.org> -M: Jeff Layton <jlayton@kernel.org> +M: Chuck Lever <chuck.lever@oracle.com> L: linux-nfs@vger.kernel.org W: http://nfs.sourceforge.net/ T: git git://linux-nfs.org/~bfields/linux.git @@ -9122,7 +9121,7 @@ F: drivers/misc/lkdtm/* LINUX KERNEL MEMORY CONSISTENCY MODEL (LKMM) M: Alan Stern <stern@rowland.harvard.edu> M: Andrea Parri <andrea.parri@amarulasolutions.com> -M: Will Deacon <will.deacon@arm.com> +M: Will Deacon <will@kernel.org> M: Peter Zijlstra <peterz@infradead.org> M: Boqun Feng <boqun.feng@gmail.com> M: Nicholas Piggin <npiggin@gmail.com> @@ -9230,7 +9229,7 @@ F: Documentation/admin-guide/LSM/LoadPin.rst LOCKING PRIMITIVES M: Peter Zijlstra <peterz@infradead.org> M: Ingo Molnar <mingo@redhat.com> -M: Will Deacon <will.deacon@arm.com> +M: Will Deacon <will@kernel.org> L: linux-kernel@vger.kernel.org T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git locking/core S: Maintained @@ -10551,7 +10550,7 @@ F: arch/arm/boot/dts/mmp* F: arch/arm/mach-mmp/ MMU GATHER AND TLB INVALIDATION -M: Will Deacon <will.deacon@arm.com> +M: Will Deacon <will@kernel.org> M: "Aneesh Kumar K.V" <aneesh.kumar@linux.ibm.com> M: Andrew Morton <akpm@linux-foundation.org> M: Nick Piggin <npiggin@gmail.com> @@ -12040,7 +12039,7 @@ S: Maintained F: drivers/pci/controller/dwc/*layerscape* PCI DRIVER FOR GENERIC OF HOSTS -M: Will Deacon <will.deacon@arm.com> +M: Will Deacon <will@kernel.org> L: linux-pci@vger.kernel.org L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained @@ -13058,7 +13057,6 @@ F: Documentation/devicetree/bindings/net/qcom,dwmac.txt QUALCOMM GENERIC INTERFACE I2C DRIVER M: Alok Chauhan <alokc@codeaurora.org> -M: Karthikeyan Ramasubramanian <kramasub@codeaurora.org> L: linux-i2c@vger.kernel.org L: linux-arm-msm@vger.kernel.org S: Supported @@ -14337,6 +14335,15 @@ S: Supported K: sifive N: sifive +SIFIVE FU540 SYSTEM-ON-CHIP +M: Paul Walmsley <paul.walmsley@sifive.com> +M: Palmer Dabbelt <palmer@sifive.com> +L: linux-riscv@lists.infradead.org +T: git git://git.kernel.org/pub/scm/linux/kernel/git/pjw/sifive.git +S: Supported +K: fu540 +N: fu540 + SILEAD TOUCHSCREEN DRIVER M: Hans de Goede <hdegoede@redhat.com> L: linux-input@vger.kernel.org @@ -14397,7 +14404,7 @@ F: lib/test_siphash.c F: include/linux/siphash.h SIOX -M: Gavin Schenk <g.schenk@eckelmann.de> +M: Thorsten Scherer <t.scherer@eckelmann.de> M: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> R: Pengutronix Kernel Team <kernel@pengutronix.de> S: Supported @@ -15007,7 +15014,7 @@ S: Odd Fixes F: drivers/net/ethernet/adaptec/starfire* STEC S1220 SKD DRIVER -M: Bart Van Assche <bart.vanassche@wdc.com> +M: Damien Le Moal <Damien.LeMoal@wdc.com> L: linux-block@vger.kernel.org S: Maintained F: drivers/block/skd*[ch] @@ -17324,7 +17331,7 @@ F: Documentation/ABI/stable/sysfs-hypervisor-xen F: Documentation/ABI/testing/sysfs-hypervisor-xen XEN NETWORK BACKEND DRIVER -M: Wei Liu <wei.liu2@citrix.com> +M: Wei Liu <wei.liu@kernel.org> M: Paul Durrant <paul.durrant@citrix.com> L: xen-devel@lists.xenproject.org (moderated for non-subscribers) L: netdev@vger.kernel.org |