]> www.infradead.org Git - users/willy/linux.git/commitdiff
projects / users / willy / linux.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3fc3edf d1f456b)
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)
* 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

1  2 
fs/nfs/client.c patch | diff1 | diff2 | blob | history
fs/nfs/nfs4proc.c patch | diff1 | diff2 | blob | history
fs/nfs/nfs4state.c patch | diff1 | diff2 | blob | history
net/sunrpc/clnt.c patch | diff1 | diff2 | blob | history

diff --cc fs/nfs/client.c
Simple merge
diff --cc fs/nfs/nfs4proc.c
Simple merge
diff --cc fs/nfs/nfs4state.c
Simple merge
diff --cc net/sunrpc/clnt.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.