From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 16 Nov 2013 21:14:56 +0000 (-0800)
Subject: Merge tag 'nfs-for-3.13-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
X-Git-Tag: v3.13-rc1~53
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=673fdfe3f0630b03f3854d0361b1232f2e5ef7fb;p=profile%2Fivi%2Fkernel-x86-ivi.git

Merge tag 'nfs-for-3.13-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

Pull NFS client bugfixes:
 - Stable fix for data corruption when retransmitting O_DIRECT writes
 - Stable fix for a deep recursion/stack overflow bug in rpc_release_client
 - Stable fix for infinite looping when mounting a NFSv4.x volume
 - Fix a typo in the nfs mount option parser
 - Allow pNFS layouts to be compiled into the kernel when NFSv4.1 is

* tag 'nfs-for-3.13-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
  nfs: fix pnfs Kconfig defaults
  NFS: correctly report misuse of "migration" mount option.
  nfs: don't retry detect_trunking with RPC_AUTH_UNIX more than once
  SUNRPC: Avoid deep recursion in rpc_release_client
  SUNRPC: Fix a data corruption issue when retransmitting RPC calls
---

673fdfe3f0630b03f3854d0361b1232f2e5ef7fb