linux-kernel - linux-next: manual merge of the vfs tree with the nsfd 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>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20160111121632.26fd5873@canb.auug.org.au>
Date:	Mon, 11 Jan 2016 12:16:32 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Al Viro <viro@...IV.linux.org.uk>,
	"J. Bruce Fields" <bfields@...ldses.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	NeilBrown <neilb@...e.de>
Subject: linux-next: manual merge of the vfs tree with the nsfd tree

Hi Al,

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).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au