From: Trond Myklebust <trond.myklebust@primarydata.com>
Date: Thu, 23 Apr 2015 19:16:27 +0000 (-0400)
Subject: Merge branch 'bugfixes'
X-Git-Tag: firefly_0821_release~176^2~1852^2~1
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=21330b667070fd64b2340d8d31c1b0800df78ec8;p=firefly-linux-kernel-4.4.55.git

Merge branch 'bugfixes'

* bugfixes:
  NFSv4: Return delegations synchronously in evict_inode
  SUNRPC: Fix a regression when reconnecting
  NFS: remount with security change should return EINVAL
  nfs: do not export discarded symbols
  NFSv4.1: don't export static symbol
---

21330b667070fd64b2340d8d31c1b0800df78ec8