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
| ||
|
Date: Tue, 7 Apr 2015 09:02:14 +0200 From: Christoph Hellwig <hch@....de> To: Stephen Rothwell <sfr@...b.auug.org.au> Cc: Al Viro <viro@...IV.linux.org.uk>, linux-next@...r.kernel.org, linux-kernel@...r.kernel.org, Sheng Yong <shengyong1@...wei.com>, Christoph Hellwig <hch@....de>, Theodore Ts'o <tytso@....edu> Subject: Re: linux-next: manual merge of the vfs tree with the ext4 tree On Tue, Apr 07, 2015 at 02:00:35PM +1000, Stephen Rothwell wrote: > Hi Al, > > Today's linux-next merge of the vfs tree got a conflict in fs/ext4/inode.c between commit 72b8e0f9fa8a ("ext4: remove unused header files") from the ext4 tree and commit e2e40f2c1ed4 ("fs: move struct kiocb to fs.h") from the vfs tree. FYI, the ext4 tree seems to have the crypto support, which I don't think is ready for 4.1 with all the implications of it.. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists