From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 1 Oct 2013 00:10:26 +0000 (-0700)
Subject: Merge tag 'nfs-for-3.12-4' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
X-Git-Tag: accepted/tizen/common/20141203.182822~1364
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f927318840745095cc7003f1564ca4b87655745d;p=platform%2Fkernel%2Flinux-arm64.git

Merge tag 'nfs-for-3.12-4' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

Pull NFS client bugfixes from Trond Myklebust:
 - Stable fix for Oopses in the pNFS files layout driver
 - Fix a regression when doing a non-exclusive file create on NFSv4.x
 - NFSv4.1 security negotiation fixes when looking up the root
   filesystem
 - Fix a memory ordering issue in the pNFS files layout driver

* tag 'nfs-for-3.12-4' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
  NFS: Give "flavor" an initial value to fix a compile warning
  NFSv4.1: try SECINFO_NO_NAME flavs until one works
  NFSv4.1: Ensure memory ordering between nfs4_ds_connect and nfs4_fl_prepare_ds
  NFSv4.1: nfs4_fl_prepare_ds - fix bugs when the connect attempt fails
  NFSv4: Honour the 'opened' parameter in the atomic_open() filesystem method
---

f927318840745095cc7003f1564ca4b87655745d