linux-kernel - Re: linux-next: manual merge of the l2-mtd tree with the at91 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] [thread-next>] [day] [month] [year] [list]

Date:	Fri, 09 Sep 2011 11:53:35 +0200
From:	Nicolas Ferre <nicolas.ferre@...el.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
CC:	dedekind1@...il.com, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org,
	Dmitry Eremin-Solenikov <dbaryshkov@...il.com>,
	Nico Erfurth <ne@...urth.eu>,
	Jean-Christophe PLAGNIOL-VILLARD <plagnioj@...osoft.com>,
	Russell King - ARM Linux <linux@....linux.org.uk>
Subject: Re: linux-next: manual merge of the l2-mtd tree with the at91 tree

Le 09/09/2011 08:45, Stephen Rothwell :
> Hi Artem,
> 
> On Fri, 09 Sep 2011 09:45:28 +0300 Artem Bityutskiy
> <dedekind1@...il.com> wrote:
>> 
>> OK, thanks, I guess you'll carry this modification so far, we'll
>> need to take care of the conflict when merging.
> 
> Yep, no worries.

Stephen,

I have seen the two manual merges that you made concerning our
at91-next tree. This is when we realize how linux-next is a great tool ;-)

So, as I am not so used to this kind of situation, I wonder if I need
to included those two patches from Russell's and Artem's git trees in
our at91-next one or if I only carry on with current patch series
until Linus merges all this himself?

Best regards,
-- 
Nicolas Ferre

--
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/