Use my kernel.org address instead of the bootlin one. Signed-off-by: Maxime Ripard <maxime.ripard@xxxxxxxxxxx> --- .mailmap | 2 ++ MAINTAINERS | 10 +++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.mailmap b/.mailmap index 0fef932de3db..509d258a9e77 100644 --- a/.mailmap +++ b/.mailmap @@ -157,6 +157,8 @@ Matt Ranostay <mranostay@xxxxxxxxx> Matthew Ranostay <mranostay@xxxxxxxxxxxxxxxx Matt Ranostay <mranostay@xxxxxxxxx> <matt.ranostay@xxxxxxxxx> Matt Ranostay <matt.ranostay@xxxxxxxxxxxx> <matt@ranostay.consulting> Matt Redfearn <matt.redfearn@xxxxxxxx> <matt.redfearn@xxxxxxxxxx> +Maxime Ripard <mripard@xxxxxxxxxx> <maxime.ripard@xxxxxxxxxxx> +Maxime Ripard <mripard@xxxxxxxxxx> <maxime.ripard@xxxxxxxxxxxxxxxxxx> Mayuresh Janorkar <mayur@xxxxxx> Michael Buesch <m@xxxxxxx> Michel Dänzer <michel@xxxxxxxxxxxxxxxxxxxx> diff --git a/MAINTAINERS b/MAINTAINERS index 6743ce648118..0f9e0c458717 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -683,7 +683,7 @@ S: Maintained F: drivers/crypto/sunxi-ss/ ALLWINNER VPU DRIVER -M: Maxime Ripard <maxime.ripard@xxxxxxxxxxx> +M: Maxime Ripard <mripard@xxxxxxxxxx> M: Paul Kocialkowski <paul.kocialkowski@xxxxxxxxxxx> L: linux-media@xxxxxxxxxxxxxxx S: Maintained @@ -1408,7 +1408,7 @@ S: Maintained F: drivers/clk/sunxi/ ARM/Allwinner sunXi SoC support -M: Maxime Ripard <maxime.ripard@xxxxxxxxxxx> +M: Maxime Ripard <mripard@xxxxxxxxxx> M: Chen-Yu Tsai <wens@xxxxxxxx> L: linux-arm-kernel@xxxxxxxxxxxxxxxxxxx (moderated for non-subscribers) S: Maintained @@ -3573,7 +3573,7 @@ F: Documentation/filesystems/caching/cachefiles.txt F: fs/cachefiles/ CADENCE MIPI-CSI2 BRIDGES -M: Maxime Ripard <maxime.ripard@xxxxxxxxxxx> +M: Maxime Ripard <mripard@xxxxxxxxxx> L: linux-media@xxxxxxxxxxxxxxx S: Maintained F: Documentation/devicetree/bindings/media/cdns,*.txt @@ -5291,7 +5291,7 @@ F: include/linux/vga* DRM DRIVERS AND MISC GPU PATCHES M: Maarten Lankhorst <maarten.lankhorst@xxxxxxxxxxxxxxx> -M: Maxime Ripard <maxime.ripard@xxxxxxxxxxx> +M: Maxime Ripard <mripard@xxxxxxxxxx> M: Sean Paul <sean@xxxxxxxxxx> W: https://01.org/linuxgraphics/gfx-docs/maintainer-tools/drm-misc.html S: Maintained @@ -5304,7 +5304,7 @@ F: include/uapi/drm/drm* F: include/linux/vga* DRM DRIVERS FOR ALLWINNER A10 -M: Maxime Ripard <maxime.ripard@xxxxxxxxxxx> +M: Maxime Ripard <mripard@xxxxxxxxxx> L: dri-devel@xxxxxxxxxxxxxxxxxxxxx S: Supported F: drivers/gpu/drm/sun4i/ -- 2.21.0
