]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
projects / mirror_ubuntu-kernels.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: abb3438 ad112aa)
Merge tag 'nfsd-5.9-1' of git://git.linux-nfs.org/projects/cel/cel-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 26 Aug 2020 01:01:36 +0000 (18:01 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 26 Aug 2020 01:01:36 +0000 (18:01 -0700)
commit2ac69819ba9e3d8d550bb5d2d2df74848e556812
treebf65c47f964a7c0ac74fe2fa05f42ea2219e6228tree
parentabb3438d69fb6dd5baa4ae23eafbf5b87945eff1commit | diff
parentad112aa8b1ac4bf5e8da67734fcb535fd3cd564ecommit | diff
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
fs/nfsd/nfs4state.c diff1 | diff2 | blob | history
Ubuntu combined Linux kernel mirror