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

Message-ID: <20160111121628.1e2597fc@canb.auug.org.au>
Date:	Mon, 11 Jan 2016 12:16:28 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Al Viro <viro@...IV.linux.org.uk>,
	Trond Myklebust <trond.myklebust@....uio.no>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Christoph Hellwig <hch@....de>
Subject: linux-next: manual merge of the vfs tree with the nfs tree

Hi Al,

Today's linux-next merge of the vfs tree got a conflict in:

  fs/nfs/nfs4file.c

between commit:

  926ea40a7ee2 ("NFSv4: Fix a compile warning about no prototype for nfs4_ioctl()")

from the nfs tree and commit:

  04b38d601239 ("vfs: pull btrfs clone API to vfs layer")

from the vfs tree.

I fixed it up (the latter removed the code fixed in the former) and can
carry the fix as necessary (no action is required).

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