From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 26 Nov 2014 03:05:41 +0000 (-0800)
Subject: Merge branch 'for-3.18' of git://linux-nfs.org/~bfields/linux
X-Git-Tag: submit/tizen/20160607.132125~3508
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b914c5b2130239fd378d1a719ab3c53f0c782be9;p=sdk%2Femulator%2Femulator-kernel.git

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

Pull nfsd bugfixes from Bruce Fields:
 "These fix one mishandling of the case when security labels are
  configured out, and two races in the 4.1 backchannel code"

* 'for-3.18' of git://linux-nfs.org/~bfields/linux:
  nfsd: Fix slot wake up race in the nfsv4.1 callback code
  SUNRPC: Fix locking around callback channel reply receive
  nfsd: correctly define v4.2 support attributes
---

b914c5b2130239fd378d1a719ab3c53f0c782be9