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

Date:	Mon, 14 Feb 2011 13:19:48 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Theodore Tso <tytso@....EDU>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Eric Sandeen <sandeen@...hat.com>
Subject: linux-next: manual merge of the ext4 tree with Linus'  tree

Hi Ted,

Today's linux-next merge of the ext4 tree got a conflict in
fs/ext4/mballoc.c between commit 2892c15ddda6a76dc10b7499e56c0f3b892e5a69
("ext4: make grpinfo slab cache names static") from Linus' tree and
commit 63a1555068c51e47fcdd3c097e9891ac88e86184 ("ext4: make grpinfo slab
cache names static") from the ext4 tree.

I used the version from Linus' tree (since that one was updated).
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped