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

Message-Id: <20110527140018.993fe260.sfr@canb.auug.org.au>
Date:	Fri, 27 May 2011 14:00:18 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	David Woodhouse <dwmw2@...radead.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Jamie Iles <jamie@...ieiles.com>,
	Artem Bityutskiy <Artem.Bityutskiy@...ia.com>,
	Marc Zyngier <marc.zyngier@....com>,
	Russell King <rmk@....linux.org.uk>
Subject: linux-next: manual merge of the mtd tree with Linus' tree

Hi David,

Today's linux-next merge of the mtd tree got a conflict in
drivers/mtd/maps/integrator-flash.c between commit adf0040096e4 ("ARM:
6906/1: MTD: Remove integrator-flash") from Linus' tree and commit
ee0e87b174bb ("mtd: convert remaining users to mtd_device_register()")
from the mtd tree.

The former removes the file updated by the latter, so I just removed it.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped