From: Linus Torvalds Date: Thu, 12 Dec 2013 23:24:32 +0000 (-0800) Subject: Merge branch 'for-3.13' of git://linux-nfs.org/~bfields/linux X-Git-Tag: firefly_0821_release~176^2~4790 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c9111b4df407e6b73f2a92c36f7fc93a7b27fd99;p=firefly-linux-kernel-4.4.55.git Merge branch 'for-3.13' of git://linux-nfs.org/~bfields/linux Pull nfsd reply cache bugfix from Bruce Fields: "One bugfix for nfsd crashes" * 'for-3.13' of git://linux-nfs.org/~bfields/linux: nfsd: when reusing an existing repcache entry, unhash it first --- c9111b4df407e6b73f2a92c36f7fc93a7b27fd99