linux-kernel - Re: linux-next: manual merge of the input tree with the davinci 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]

Message-Id: <20100921170307.27dfae3c.sfr@canb.auug.org.au>
Date:	Tue, 21 Sep 2010 17:03:07 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Dmitry Torokhov <dmitry.torokhov@...il.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Cyril Chemparathy <cyril@...com>,
	Kevin Hilman <khilman@...prootsystems.com>,
	Abraham Arce <x0066660@...com>,
	Syed Rafiuddin <rafiuddin.syed@...com>
Subject: Re: linux-next: manual merge of the input tree with the davinci
 tree

Hi Dmitry,

On Mon, 20 Sep 2010 22:24:38 -0700 Dmitry Torokhov <dmitry.torokhov@...il.com> wrote:
>
> I am afraid you'll have to carry this one till the next merge window -
> it seemed that Davinci drivers better be merged through davinci tree so
> we'll have this conflict.
> 
> Sorry about this.

Its not really a problem.

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped