From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 15 Sep 2011 19:36:01 +0000 (-0700)
Subject: Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
X-Git-Tag: firefly_0821_release~3680^2~4459
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=17d8428e4c911f7877d8470bca7a09a4b2aa2d57;p=firefly-linux-kernel-4.4.55.git

Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

* 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
  nfs: Do not allow multiple mounts on same mountpoint when using -o noac
  NFS: Fix a typo in nfs_flush_multi
  NFSv4: renewd needs to be able to handle the NFS4ERR_CB_PATH_DOWN error
  NFSv4: The NFSv4.0 client must send RENEW calls if it holds a delegation
  NFSv4: nfs4_proc_renew should be declared static
  NFSv4: nfs4_proc_async_renew should use a GFP_NOFS allocation
---

17d8428e4c911f7877d8470bca7a09a4b2aa2d57