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: Wed, 19 Jun 2013 10:20:31 -0400 From: Theodore Ts'o <tytso@....edu> To: Glauber Costa <glommer@...il.com> Cc: Stephen Rothwell <sfr@...b.auug.org.au>, Andrew Morton <akpm@...ux-foundation.org>, linux-next@...r.kernel.org, linux-kernel@...r.kernel.org, Zheng Liu <wenqing.lz@...bao.com>, Dave Chinner <dchinner@...hat.com>, Glauber Costa <glommer@...nvz.org> Subject: Re: linux-next: manual merge of the akpm tree with the ext4 tree Is there some way we can avoid this conflict during the next merge window? Given that this is an API change, it may not be possible. Failing that, what's the best merge strategy; should we try to make sure your change goes first, and then I can defer the ext4 pull request until a little bit later in the merge window? Thanks, - Ted -- 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