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

diff --cc fs/nfs/delegation.c
Simple merge

diff --cc fs/nfs/pnfs.c
Simple merge

diff --cc fs/nfs/pnfs_nfs.c
Simple merge

diff --cc fs/nfs/super.c
Simple merge

diff --cc net/sunrpc/xprt.c
Simple merge