Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752201AbZGaAlp (ORCPT ); Thu, 30 Jul 2009 20:41:45 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751315AbZGaAln (ORCPT ); Thu, 30 Jul 2009 20:41:43 -0400 Received: from exprod6og108.obsmtp.com ([64.18.1.21]:44520 "HELO exprod6og108.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1751240AbZGaAll convert rfc822-to-8bit (ORCPT ); Thu, 30 Jul 2009 20:41:41 -0400 X-MimeOLE: Produced By Microsoft Exchange V6.5 Content-class: urn:content-classes:message MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7BIT Subject: RE: linux-next: manual merge of the arm tree with Linus' tree Date: Thu, 30 Jul 2009 20:41:37 -0400 Message-ID: In-Reply-To: <20090731103354.5e7fdd42.sfr@canb.auug.org.au> X-MS-Has-Attach: X-MS-TNEF-Correlator: Thread-Topic: linux-next: manual merge of the arm tree with Linus' tree Thread-Index: AcoRdpmaaQ+OcvRhS6iCVg6IScF1zQAAM5uA References: <20090731103354.5e7fdd42.sfr@canb.auug.org.au> From: "H Hartley Sweeten" To: "Stephen Rothwell" , "Russell King" Cc: , , "Ryan Mallon" , "Joe Perches" , "Andrew Morton" X-OriginalArrivalTime: 31 Jul 2009 00:41:39.0184 (UTC) FILETIME=[AA71B700:01CA1177] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1789 Lines: 54 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 sfr@canb.auug.org.au > > 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 > -P: Hartley Sweeten > -M: hsweeten@visionengravers.com > -P: Ryan Mallon > -M: ryan@bluewatersys.com > ++M: Hartley Sweeten > ++M: Ryan Mallon > L: linux-arm-kernel@lists.arm.linux.org.uk (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: kernel@wantstofly.org > +M: Lennert Buytenhek > L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) > S: Maintained -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/