From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 25 Mar 2013 16:25:12 +0000 (-0700)
Subject: Merge branch 'for-3.9' of git://linux-nfs.org/~bfields/linux
X-Git-Tag: firefly_0821_release~3680^2~844
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=844fdd9ac1cdd756f5bd233f302ecabb27dd387a;p=firefly-linux-kernel-4.4.55.git

Merge branch 'for-3.9' of git://linux-nfs.org/~bfields/linux

Pull nfsd bugfixes from J Bruce Fields:
 "Fixes for a couple mistakes in the new DRC code.  And thanks to Kent
  Overstreet for noticing we've been sync'ing the wrong range on stable
  writes since 3.8."

* 'for-3.9' of git://linux-nfs.org/~bfields/linux:
  nfsd: fix bad offset use
  nfsd: fix startup order in nfsd_reply_cache_init
  nfsd: only unhash DRC entries that are in the hashtable
---

844fdd9ac1cdd756f5bd233f302ecabb27dd387a