From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 26 Oct 2012 02:26:16 +0000 (-0700)
Subject: Merge tag 'nfs-for-3.7-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
X-Git-Tag: v3.7-rc3~23
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fec4fba6e44407cfbdeed7d48f6f37e6ddfe19d7;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

Merge tag 'nfs-for-3.7-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

Pull NFS bugfixes from Trond Myklebust:

 - Fix the NFSv2/v3 kernel statd protocol, which broke due to net
   namespace related changes.

 - Fix a number of races in the SUNRPC TCP disconnect/reconnect code.

* tag 'nfs-for-3.7-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
  LOCKD: Clear ln->nsm_clnt only when ln->nsm_users is zero
  LOCKD: fix races in nsm_client_get
  SUNRPC: Get rid of the xs_error_report socket callback
  SUNRPC: Prevent races in xs_abort_connection()
  Revert "SUNRPC: Ensure we close the socket on EPIPE errors too..."
  SUNRPC: Clear the connect flag when socket state is TCP_CLOSE_WAIT
---

fec4fba6e44407cfbdeed7d48f6f37e6ddfe19d7