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

Date:	Fri, 29 Jul 2011 13:49:29 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Artem Bityutskiy <dedekind1@...il.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	John Crispin <blogic@...nwrt.org>,
	Ralf Baechle <ralf@...ux-mips.org>,
	"Dmitry Eremin-Solenikov" <dbaryshkov@...il.com>
Subject: linux-next: manual merge of the l2-mtd tree with the mips tree

Hi Artem,

Today's linux-next merge of the l2-mtd tree got a conflict in
drivers/mtd/maps/lantiq-flash.c between commit c84c24dc7ed7 ("MIPS:
Lantiq: Fix MTD registration of NOR device") from the mips tree and
commit 31963c9999a3 ("mtd: lantiq-flash.c: use
mtd_device_parse_register") from the l2-mtd tree.

I fixed it up (by using the latter change which supercedes the former).
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped