2009-07-31 00:34:00

by Stephen Rothwell

Subject: linux-next: manual merge of the arm tree with Linus' tree

Hi Russell,

Today's linux-next merge of the arm tree got a conflict in MAINTAINERS
between commit 8b58be884a9fd650abb7f7adf3f885fb9cecd79d ("MAINTAINERS:
coalesce name and email address lines") from Linus' tree and commit
d19d36672ee379f26b79df985a9a2e5afb3f1df1 ("[ARM] 5599/1: MAINTAINERS:
update for EP93XX ARM") from the arm tree.

I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell [email protected]

diff --cc MAINTAINERS
index 79471ba,1be6a0c..0000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -535,12 -604,18 +535,15 @@@ W: http://maxim.org.za/at91_26.htm
S: Maintained

ARM/CIRRUS LOGIC EP93XX ARM ARCHITECTURE
- M: Lennert Buytenhek <[email protected]>
-P: Hartley Sweeten
-M: [email protected]
-P: Ryan Mallon
-M: [email protected]
++M: Hartley Sweeten <[email protected]>
++M: Ryan Mallon <[email protected]>
L: [email protected] (subscribers-only)
S: Maintained
+ F: arch/arm/mach-ep93xx/
+ F: arch/arm/mach-ep93xx/include/mach/

ARM/CIRRUS LOGIC EDB9315A MACHINE SUPPORT
-P: Lennert Buytenhek
-M: [email protected]
+M: Lennert Buytenhek <[email protected]>
L: [email protected] (subscribers-only)
S: Maintained

2009-07-31 00:41:45

by Hartley Sweeten

Subject: RE: linux-next: manual merge of the arm tree with Linus' tree

On Thursday, July 30, 2009 5:34 PM, Stephen Rothwell wrote:
> Hi Russell,
>
> Today's linux-next merge of the arm tree got a conflict in MAINTAINERS
> between commit 8b58be884a9fd650abb7f7adf3f885fb9cecd79d ("MAINTAINERS:
> coalesce name and email address lines") from Linus' tree and commit
> d19d36672ee379f26b79df985a9a2e5afb3f1df1 ("[ARM] 5599/1: MAINTAINERS:
> update for EP93XX ARM") from the arm tree.
>
> I fixed it up (see below) and can carry the fix as necessary.

Russell,

Stephen's fix below is fine with me. If needed I will resubmit this patch.

Regards,
Hartley

> --
> Cheers,
> Stephen Rothwell [email protected]
>
> diff --cc MAINTAINERS
> index 79471ba,1be6a0c..0000000
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@@ -535,12 -604,18 +535,15 @@@ W: http://maxim.org.za/at91_26.htm
> S: Maintained
>
> ARM/CIRRUS LOGIC EP93XX ARM ARCHITECTURE
> - M: Lennert Buytenhek <[email protected]>
> -P: Hartley Sweeten
> -M: [email protected]
> -P: Ryan Mallon
> -M: [email protected]
> ++M: Hartley Sweeten <[email protected]>
> ++M: Ryan Mallon <[email protected]>
> L: [email protected] (subscribers-only)
> S: Maintained
> + F: arch/arm/mach-ep93xx/
> + F: arch/arm/mach-ep93xx/include/mach/
>
> ARM/CIRRUS LOGIC EDB9315A MACHINE SUPPORT
> -P: Lennert Buytenhek
> -M: [email protected]
> +M: Lennert Buytenhek <[email protected]>
> L: [email protected] (subscribers-only)
> S: Maintained