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: Sun, 10 Jan 2016 21:59:18 -0500 From: "J. Bruce Fields" <bfields@...ldses.org> 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, NeilBrown <neilb@...e.de> Subject: Re: linux-next: manual merge of the vfs tree with the nsfd tree On Mon, Jan 11, 2016 at 12:16:32PM +1100, Stephen Rothwell wrote: > Today's linux-next merge of the vfs tree got a conflict in: > > fs/namei.c > > between commit: > > 1932ac9d7cef ("nfsd: don't hold i_mutex over userspace upcalls") > > from the nfsd tree and commit: > > bbddca8e8fac ("nfsd: don't hold i_mutex over userspace upcalls") > > from the vfs tree. > > Similar patch, but slightly different. :-( > > I fixed it up (I used the vfs tree version) and can carry the fix as > necessary (no action is required). Thanks, I've dropped my version. --b.
Powered by blists - more mailing lists