linux-kernel - linux-next: manual merge of the vfs tree with Linus' and te ext4 trees

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:	Tue, 22 Apr 2014 11:04:59 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Al Viro <viro@...IV.linux.org.uk>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	"Theodore Ts'o" <tytso@....edu>
Subject: linux-next: manual merge of the vfs tree with Linus' and te ext4
 trees

Hi Al,

Today's linux-next merge of the vfs tree got a conflict in
fs/ext4/extents.c between rebased versions of commits from Linus' and the
ext4 trees and the same commits from the vfs tree.

I fixed it up (I just used the version from Linus' and the ext4 trees)
and can carry the fix as necessary (no action is required).

Al, this is why I asked you about checking with Ted about his tree being
rebased after you merged it into yours ...
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped