Merge tag 'nfsd-5.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 19 Jan 2021 21:01:50 +0000 (13:01 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 19 Jan 2021 21:01:50 +0000 (13:01 -0800)
commitf419f031de1498765b64ddf71590f40689a9b55c
treee0289c46686011d6fb575b309f4ad8eda62904dc
parent28df858033484b830c2ea146c03da67d2d659405
parent5f39d2713bd80e8a3e6d9299930aec8844872c0e
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