Merge branch 'bugfixes' into linux-next
authorTrond Myklebust <trond.myklebust@primarydata.com>
Tue, 30 Sep 2014 21:21:41 +0000 (17:21 -0400)
committerTrond Myklebust <trond.myklebust@primarydata.com>
Tue, 30 Sep 2014 21:21:41 +0000 (17:21 -0400)
commit72c23f0819977d37924af92a42a9b7fbfd1c95d8
treea0c10114d96c40f8e38887c346ec593a51321781
parent3fc3edf141fd78f624194eb89d7b37ff86138422
parentd1f456b0b9545f1606a54cd17c20775f159bd2ce
Merge branch 'bugfixes' into linux-next

* bugfixes:
  NFSv4.1: Fix an NFSv4.1 state renewal regression
  NFSv4: fix open/lock state recovery error handling
  NFSv4: Fix lock recovery when CREATE_SESSION/SETCLIENTID_CONFIRM fails
  NFS: Fabricate fscache server index key correctly
  SUNRPC: Add missing support for RPC_CLNT_CREATE_NO_RETRANS_TIMEOUT
  nfs: fix duplicate proc entries
fs/nfs/client.c
fs/nfs/nfs4proc.c
fs/nfs/nfs4state.c
net/sunrpc/clnt.c