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

Message-ID: <1343230004.14051.67.camel@shinybook.infradead.org>
Date:	Wed, 25 Jul 2012 16:26:44 +0100
From:	David Woodhouse <dwmw2@...radead.org>
To:	Gerlando Falauto <gerlando.falauto@...mile.com>
Cc:	Stephen Rothwell <sfr@...b.auug.org.au>,
	Artem Bityutskiy <dedekind1@...il.com>,
	"linux-next@...r.kernel.org" <linux-next@...r.kernel.org>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>
Subject: Re: linux-next: manual merge of the l2-mtd tree with the mtd tree

On Wed, 2012-07-25 at 17:21 +0200, Gerlando Falauto wrote:
> 
> So could someone please spend a few words on what happened in the meantime?
> To me it looks like the l2-mtd tree got rebased at some point, but I'm 
> quite at loss about this whole back-and-forth between trees.
> I'm sure a few words could make my life much easier... :-) 

There's no need to worry. The l2-mtd tree is rebased on top of the mtd
tree, and contains patches that Artem thinks I'm likely to accept.

I apply them, sometimes with a few minor changes, or I occasionally
reject them. Sometimes if Artem doesn't *immediately* update his tree
after I push changes to mine, a 'conflict' appears between the two. You
can ignore it.

-- 
dwmw2

Download attachment "smime.p7s" of type "application/x-pkcs7-signature" (6171 bytes)