linux-kernel - Re: linux-next: manual merge of the block 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] [day] [month] [year] [list]

Date:	Wed, 28 Apr 2010 09:22:22 +0200
From:	Jens Axboe <jens.axboe@...cle.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Ben Hutchings <bhutchings@...arflare.com>,
	Artem Bityutskiy <Artem.Bityutskiy@...ia.com>,
	David Woodhouse <dwmw2@...radead.org>,
	"Jörn Engel" <joern@...fs.org>
Subject: Re: linux-next: manual merge of the block tree with the mtd tree

On Wed, Apr 28 2010, Stephen Rothwell wrote:
> Hi Jens,
> 
> Today's linux-next merge of the block tree got a conflict in
> drivers/mtd/mtdcore.c between commit
> b520e412faaaad35641aeedd6059179f9f1b393c ("mtd: Replace static array of
> devices with an idr structure") from the mtd tree and commit
> a33eb6b91034c95b9b08576f68be170f995b2c7d ("Move mtd_bdi_*mappable to
> mtdcore.c") from the block tree.
> 
> Just overlapping additions.  I fixed it up (see below) and can carry the
> fix as necessary.

Thanks, looks good. It should go away soon, as the below bits are for
2.6.34.

-- 
Jens Axboe

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