From: Trond Myklebust Date: Tue, 30 Sep 2014 21:21:41 +0000 (-0400) Subject: Merge branch 'bugfixes' into linux-next X-Git-Tag: v3.18-rc1~125^2 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=72c23f0819977d37924af92a42a9b7fbfd1c95d8;p=~emulex%2Finfiniband.git 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 --- 72c23f0819977d37924af92a42a9b7fbfd1c95d8