linux-kernel - linux-next: manual merge of the l2-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]

Date:	Wed, 11 Jan 2012 13:38:03 +1100
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,
	Linus <torvalds@...ux-foundation.org>,
	David Woodhouse <David.Woodhouse@...el.com>
Subject: linux-next: manual merge of the l2-mtd tree with Linus' tree

Hi Artem,

Today's linux-next merge of the l2-mtd tree got a conflict in
fs/jffs2/erase.c between commit 10934478e44d ("mtd: do use mtd->point
directly") from Linus' tree and commit aa64d929dfae ("jffs2: do not
initialize variable unnecessarily") from the l2-mtd tree.

The commit from Linus' tree above is also in the l2-mtd tree.  This is
because the l2-mtd tree commits were (at least partially) rebased before
being merged into Linus' tree.

I just used the l2-mtd tree version.  But this tree needs cleaning up to
represent what was actually merged upstream.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped