From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 19 Jan 2021 21:01:50 +0000 (-0800)
Subject: Merge tag 'nfsd-5.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=f419f031de1498765b64ddf71590f40689a9b55c;p=linux.git

Merge tag 'nfsd-5.11-2' of git://git./linux/kernel/git/cel/linux

Pull nfsd fixes from Chuck Lever:

 - Avoid exposing parent of root directory in NFSv3 READDIRPLUS results

 - Fix a tracepoint change that went in the initial 5.11 merge

* tag 'nfsd-5.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux:
  SUNRPC: Move the svc_xdr_recvfrom tracepoint again
  nfsd4: readdirplus shouldn't return parent of export
---

f419f031de1498765b64ddf71590f40689a9b55c