From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 26 Aug 2020 01:01:36 +0000 (-0700)
Subject: Merge tag 'nfsd-5.9-1' of git://git.linux-nfs.org/projects/cel/cel-2.6
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=2ac69819ba9e3d8d550bb5d2d2df74848e556812;p=linux.git

Merge tag 'nfsd-5.9-1' of git://git.linux-nfs.org/projects/cel/cel-2.6

Pull nfs server fixes from Chuck Lever:

 - Eliminate an oops introduced in v5.8

 - Remove a duplicate #include added by nfsd-5.9

* tag 'nfsd-5.9-1' of git://git.linux-nfs.org/projects/cel/cel-2.6:
  SUNRPC: remove duplicate include
  nfsd: fix oops on mixed NFSv4/NFSv3 client access
---

2ac69819ba9e3d8d550bb5d2d2df74848e556812