diff mbox

MAINTAINERS: Update Allwinner entry and add new maintainer

Message ID 1444239580-32688-1-git-send-email-maxime.ripard@free-electrons.com
State New
Headers show

Commit Message

Maxime Ripard Oct. 7, 2015, 5:39 p.m. UTC
Add Chen-Yu Tsai as a co-maintainer to the ARM sunxi support.

While we are doing so, also update the entry for new SoCs.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
 MAINTAINERS | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Comments

Chen-Yu Tsai Oct. 8, 2015, 1:32 a.m. UTC | #1
On Thu, Oct 8, 2015 at 1:39 AM, Maxime Ripard
<maxime.ripard@free-electrons.com> wrote:
> Add Chen-Yu Tsai as a co-maintainer to the ARM sunxi support.
>
> While we are doing so, also update the entry for new SoCs.
>
> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> ---
>  MAINTAINERS | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 797236befd27..d6a9a016f3d4 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -894,11 +894,12 @@ M:        Lennert Buytenhek <kernel@wantstofly.org>
>  L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
>  S:     Maintained
>
> -ARM/Allwinner A1X SoC support
> +ARM/Allwinner sunXi SoC support
>  M:     Maxime Ripard <maxime.ripard@free-electrons.com>
> +M:     Chen-Yu Tsai <wens@csie.org>

Acked-by: Chen-Yu Tsai <wens@csie.org>

>  L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
>  S:     Maintained
> -N:     sun[x4567]i
> +N:     sun[x456789]i

I thought we updated this already, in d30dbc6de5732 ("ARM: sunxi: Add sun[89]i
 to MAINTAINERS entry"). It's in your sunxi/core-for-4.4 branch.

>
>  ARM/Allwinner SoC Clock Support
>  M:     Emilio López <emilio@elopez.com.ar>
> --
> 2.5.3
>
> --
> You received this message because you are subscribed to the Google Groups "linux-sunxi" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to linux-sunxi+unsubscribe@googlegroups.com.
> For more options, visit https://groups.google.com/d/optout.
Maxime Ripard Oct. 11, 2015, 4:18 p.m. UTC | #2
Hi,

On Thu, Oct 08, 2015 at 09:32:09AM +0800, Chen-Yu Tsai wrote:
> On Thu, Oct 8, 2015 at 1:39 AM, Maxime Ripard
> <maxime.ripard@free-electrons.com> wrote:
> > Add Chen-Yu Tsai as a co-maintainer to the ARM sunxi support.
> >
> > While we are doing so, also update the entry for new SoCs.
> >
> > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> > ---
> >  MAINTAINERS | 5 +++--
> >  1 file changed, 3 insertions(+), 2 deletions(-)
> >
> > diff --git a/MAINTAINERS b/MAINTAINERS
> > index 797236befd27..d6a9a016f3d4 100644
> > --- a/MAINTAINERS
> > +++ b/MAINTAINERS
> > @@ -894,11 +894,12 @@ M:        Lennert Buytenhek <kernel@wantstofly.org>
> >  L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
> >  S:     Maintained
> >
> > -ARM/Allwinner A1X SoC support
> > +ARM/Allwinner sunXi SoC support
> >  M:     Maxime Ripard <maxime.ripard@free-electrons.com>
> > +M:     Chen-Yu Tsai <wens@csie.org>
> 
> Acked-by: Chen-Yu Tsai <wens@csie.org>
> 
> >  L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
> >  S:     Maintained
> > -N:     sun[x4567]i
> > +N:     sun[x456789]i
> 
> I thought we updated this already, in d30dbc6de5732 ("ARM: sunxi:
>  Add sun[89]i to MAINTAINERS entry"). It's in your
>  sunxi/core-for-4.4 branch.

Ah right. I wanted this to be applied directly for 4.3, so I based it
on 4.3-rc4, that didn't have that commit.

In order to avoid the potential conflicts, I think the ARM-SoC
maintainers should simply merge this one, and I'll drop my branch.

Maxime
Arnd Bergmann Oct. 14, 2015, 3:16 p.m. UTC | #3
On Sunday 11 October 2015 17:18:44 Maxime Ripard wrote:
> Ah right. I wanted this to be applied directly for 4.3, so I based it
> on 4.3-rc4, that didn't have that commit.
> 
> In order to avoid the potential conflicts, I think the ARM-SoC
> maintainers should simply merge this one, and I'll drop my branch.
> 
> 

Applied to fixes, thanks!

	Arnd
diff mbox

Patch

diff --git a/MAINTAINERS b/MAINTAINERS
index 797236befd27..d6a9a016f3d4 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -894,11 +894,12 @@  M:	Lennert Buytenhek <kernel@wantstofly.org>
 L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:	Maintained
 
-ARM/Allwinner A1X SoC support
+ARM/Allwinner sunXi SoC support
 M:	Maxime Ripard <maxime.ripard@free-electrons.com>
+M:	Chen-Yu Tsai <wens@csie.org>
 L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:	Maintained
-N:	sun[x4567]i
+N:	sun[x456789]i
 
 ARM/Allwinner SoC Clock Support
 M:	Emilio López <emilio@elopez.com.ar>