From: Trond Myklebust Date: Mon, 22 Jun 2015 13:55:08 +0000 (-0400) Subject: Merge branch 'bugfixes' X-Git-Tag: v4.2~131^2~46 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1372a3130a3e0bfd38d82d476f0a907cc72ba816;p=platform%2Fkernel%2Flinux-amlogic.git Merge branch 'bugfixes' * bugfixes: NFS: Ensure we set NFS_CONTEXT_RESEND_WRITES when requeuing writes pNFS: Fix a memory leak when attempted pnfs fails NFS: Ensure that we update the sequence id under the slot table lock nfs: Initialize cb_sequenceres information before validate_seqid() nfs: Only update callback sequnce id when CB_SEQUENCE success NFSv4: nfs4_handle_delegation_recall_error should ignore EAGAIN --- 1372a3130a3e0bfd38d82d476f0a907cc72ba816