linux-kernel - linux-next: manual merge of the trivial tree with the 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:	Tue, 14 Jun 2011 14:25:42 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Jiri Kosina <jkosina@...e.cz>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Dmitry Eremin-Solenikov <dbaryshkov@...il.com>,
	Artem Bityutskiy <dedekind1@...il.com>,
	Joe Perches <joe@...ches.com>
Subject: linux-next: manual merge of the trivial tree with the  tree

Hi Jiri,

Today's linux-next merge of the trivial tree got a conflict in
drivers/mtd/maps/pxa2xx-flash.c between commit 51fb8326bc12 ("mtd:
pxa2xx-flash.c: use mtd_device_parse_register") from the l2-mtd tree and
commit 28f65c11f2ff ("treewide: Convert uses of struct resource to
resource_size(ptr)") from the trivial tree.

Just context changes.  I did the obvious fixup and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped