summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert+renesas@glider.be>2019-10-10 08:30:46 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2019-10-10 11:12:51 -0400
commit5e48e55fb57a9026e6b3b6961def6d2aeb210659 (patch)
tree1dc0a4ad6de0e78e7d55b8a823990e1575bdd8c1
parent8a8c600de5dc1d9a7f4b83269fddc80ebd3dd045 (diff)
MAINTAINERS: Remove Simon as Renesas SoC Co-Maintainer
At the end of the v5.3 upstream kernel development cycle, Simon stepped down from his role as Renesas SoC maintainer. Remove his maintainership, git repository, and branch from the MAINTAINERS file, and add an entry to the CREDITS file to honor his work. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--CREDITS4
-rw-r--r--MAINTAINERS4
2 files changed, 4 insertions, 4 deletions
diff --git a/CREDITS b/CREDITS
index 8b67a85844b5..031605d46b4d 100644
--- a/CREDITS
+++ b/CREDITS
@@ -1637,6 +1637,10 @@ S: Panoramastrasse 18
1637S: D-69126 Heidelberg 1637S: D-69126 Heidelberg
1638S: Germany 1638S: Germany
1639 1639
1640N: Simon Horman
1641M: horms@verge.net.au
1642D: Renesas ARM/ARM64 SoC maintainer
1643
1640N: Christopher Horn 1644N: Christopher Horn
1641E: chorn@warwick.net 1645E: chorn@warwick.net
1642D: Miscellaneous sysctl hacks 1646D: Miscellaneous sysctl hacks
diff --git a/MAINTAINERS b/MAINTAINERS
index 94ce075907a0..d44d6732510d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2165,12 +2165,10 @@ F: arch/arm64/boot/dts/realtek/
2165F: Documentation/devicetree/bindings/arm/realtek.yaml 2165F: Documentation/devicetree/bindings/arm/realtek.yaml
2166 2166
2167ARM/RENESAS ARM64 ARCHITECTURE 2167ARM/RENESAS ARM64 ARCHITECTURE
2168M: Simon Horman <horms@verge.net.au>
2169M: Geert Uytterhoeven <geert+renesas@glider.be> 2168M: Geert Uytterhoeven <geert+renesas@glider.be>
2170M: Magnus Damm <magnus.damm@gmail.com> 2169M: Magnus Damm <magnus.damm@gmail.com>
2171L: linux-renesas-soc@vger.kernel.org 2170L: linux-renesas-soc@vger.kernel.org
2172Q: http://patchwork.kernel.org/project/linux-renesas-soc/list/ 2171Q: http://patchwork.kernel.org/project/linux-renesas-soc/list/
2173T: git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git next
2174T: git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git next 2172T: git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git next
2175S: Supported 2173S: Supported
2176F: arch/arm64/boot/dts/renesas/ 2174F: arch/arm64/boot/dts/renesas/
@@ -2282,12 +2280,10 @@ S: Maintained
2282F: drivers/media/platform/s5p-mfc/ 2280F: drivers/media/platform/s5p-mfc/
2283 2281
2284ARM/SHMOBILE ARM ARCHITECTURE 2282ARM/SHMOBILE ARM ARCHITECTURE
2285M: Simon Horman <horms@verge.net.au>
2286M: Geert Uytterhoeven <geert+renesas@glider.be> 2283M: Geert Uytterhoeven <geert+renesas@glider.be>
2287M: Magnus Damm <magnus.damm@gmail.com> 2284M: Magnus Damm <magnus.damm@gmail.com>
2288L: linux-renesas-soc@vger.kernel.org 2285L: linux-renesas-soc@vger.kernel.org
2289Q: http://patchwork.kernel.org/project/linux-renesas-soc/list/ 2286Q: http://patchwork.kernel.org/project/linux-renesas-soc/list/
2290T: git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git next
2291T: git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git next 2287T: git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git next
2292S: Supported 2288S: Supported
2293F: arch/arm/boot/dts/emev2* 2289F: arch/arm/boot/dts/emev2*