From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Thu, 9 Aug 2007 15:38:14 +0000 (-0700)
Subject: Merge git://git.linux-nfs.org/pub/linux/nfs-2.6
X-Git-Tag: v2.6.23-rc3~68
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=8b80fc02b829a59602b0f53eb9393ffb2db2659d;p=~emulex%2Finfiniband.git

Merge git://git.linux-nfs.org/pub/linux/nfs-2.6

* git://git.linux-nfs.org/pub/linux/nfs-2.6:
  SUNRPC: Replace flush_workqueue() with cancel_work_sync() and friends
  NFS: Replace flush_scheduled_work with cancel_work_sync() and friends
  SUNRPC: Don't call gss_delete_sec_context() from an rcu context
  NFSv4: Don't call put_rpccred() from an rcu callback
  NFS: Fix NFSv4 open stateid regressions
  NFSv4: Fix a locking regression in nfs4_set_mode_locked()
  NFS: Fix put_nfs_open_context
  SUNRPC: Fix a race in rpciod_down()
---

8b80fc02b829a59602b0f53eb9393ffb2db2659d