From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 20 Dec 2011 19:31:56 +0000 (-0800)
Subject: Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=822a5d313197c059924d394e6851be3cb312caa7;p=~shefty%2Frdma-dev.git

Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

* 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
  NFS: Fix a regression in nfs_file_llseek()
  NFSv4: Do not accept delegated opens when a delegation recall is in effect
  NFSv4: Ensure correct locking when accessing the 'lock_states' list
  NFSv4.1: Ensure that we handle _all_ SEQUENCE status bits.
  NFSv4: Don't error if we handled it in nfs4_recovery_handle_error
  SUNRPC: Ensure we always bump the backlog queue in xprt_free_slot
  SUNRPC: Fix the execution time statistics in the face of RPC restarts
---

822a5d313197c059924d394e6851be3cb312caa7