From: Linus Torvalds Date: Tue, 19 May 2015 18:20:48 +0000 (-0700) Subject: Merge tag 'nfs-for-4.1-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs X-Git-Tag: Ubuntu-snapdragon-4.4.0-1050.54~8158 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=1113cdfe7d2c1fe08b64caa3affe19260e66dd95;p=mirror_ubuntu-artful-kernel.git Merge tag 'nfs-for-4.1-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs Pull two NFS client bugfixes from Trond Myklebust: "Highlights include: - fix a Linux-4.1 regression affecting stat() - take an extra reference to fl->fl_file when running a setlk" * tag 'nfs-for-4.1-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs: nfs: take extra reference to fl->fl_file when running a setlk nfs: stat(2) fails during cthon04 basic test5 on NFSv4.0 --- 1113cdfe7d2c1fe08b64caa3affe19260e66dd95