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  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:	Tue, 03 Jan 2012 09:45:45 +0200
From:	Artem Bityutskiy <dedekind1@...il.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Prasad Joshi <prasadjoshi.linux@...il.com>,
	"Jörn "Engel\"" <joern@...fs.org>
Subject: Re: linux-next: manual merge of the l2-mtd tree with the logfs tree

On Tue, 2012-01-03 at 14:00 +1100, Stephen Rothwell wrote:
> Hi Artem,
> 
> Today's linux-next merge of the l2-mtd tree got a conflict in
> fs/logfs/dev_mtd.c between commit d1cc3ad397f2 ("Logfs: Allow NULL
> block_isbad() methods") from the logfs tree and commit 957afd905eda
> ("logfs: do not use 'mtd->block_isbad' directly") from the l2-mtd tree.
> 
> I fixed it up (see below) and can carry the fix as necessary.

Thanks Stephen, this fix up is good.

-- 
Best Regards,
Artem Bityutskiy

Download attachment "signature.asc" of type "application/pgp-signature" (837 bytes)

Powered by blists - more mailing lists