Merge branch 'bugfixes'
authorTrond Myklebust <trond.myklebust@primarydata.com>
Thu, 23 Apr 2015 19:16:27 +0000 (15:16 -0400)
committerTrond Myklebust <trond.myklebust@primarydata.com>
Thu, 23 Apr 2015 19:16:27 +0000 (15:16 -0400)
commit21330b667070fd64b2340d8d31c1b0800df78ec8
tree9f13170097e7041603881d18b4a6000535a8c6fc
parentc7757074839f2cd440521482d76ea180d0d4bdac
parent5fcdfacc01f3a3415b75acb172cd75c9fe1cbda5
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
fs/nfs/delegation.c
fs/nfs/pnfs.c
fs/nfs/pnfs_nfs.c
fs/nfs/super.c
net/sunrpc/xprt.c