linux-kernel - Re: linux-next: manual merge of the pxa 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: Windows password security audit tool. GUI, reports in PDF.

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

Date:	Mon, 03 Aug 2009 21:53:23 +0800
From:	Eric Miao <eric.y.miao@...il.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
CC:	Eric Miao <eric.y.miao@...il.com>, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org, Marek Vasut <marek.vasut@...il.com>,
	Joe Perches <joe@...ches.com>,
	Andrew Morton <akpm@...ux-foundation.org>
Subject: Re: linux-next: manual merge of the pxa tree with Linus' tree

Stephen Rothwell wrote:
> Hi Eric,
> 
> Today's linux-next merge of the pxa tree got a conflict in MAINTAINERS
> between commit 8b58be884a9fd650abb7f7adf3f885fb9cecd79d ("MAINTAINERS:
> coalesce name and email address lines") from Linus' tree and commit
> 4ad9febe53347962225169c5bde2ec030e46ab1d ("Palm Tungsten|C initial
> support") from the pxa tree.
> 
> Just context changes.  I fixed it up (see below) and can carry the fix as
> necessary.

Stephen,

Thanks for the fix.
--
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/