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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:	Thu, 30 Jul 2009 20:41:37 -0400
From:	"H Hartley Sweeten" <hartleys@...ionengravers.com>
To:	"Stephen Rothwell" <sfr@...b.auug.org.au>,
	"Russell King" <rmk@....linux.org.uk>
Cc:	<linux-next@...r.kernel.org>, <linux-kernel@...r.kernel.org>,
	"Ryan Mallon" <ryan@...ewatersys.com>,
	"Joe Perches" <joe@...ches.com>,
	"Andrew Morton" <akpm@...ux-foundation.org>
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                    sfr@...b.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 <kernel@...tstofly.org>
>  -P:	Hartley Sweeten
>  -M:	hsweeten@...ionengravers.com
>  -P:	Ryan Mallon
>  -M:	ryan@...ewatersys.com
> ++M:	Hartley Sweeten <hsweeten@...ionengravers.com>
> ++M:	Ryan Mallon <ryan@...ewatersys.com>
>   L:	linux-arm-kernel@...ts.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@...tstofly.org
>  +M:	Lennert Buytenhek <kernel@...tstofly.org>
>   L:	linux-arm-kernel@...ts.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@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/