]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
projects / users / jedix / linux-maple.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8a05abd 0c217d5)
Merge tag 'nfsd-5.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 8 Sep 2021 22:55:42 +0000 (15:55 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 8 Sep 2021 22:55:42 +0000 (15:55 -0700)
Pull nfsd fixes from Chuck Lever:

 - Restore performance on memory-starved servers

* tag 'nfsd-5.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux:
  SUNRPC: improve error response to over-size gss credential
  SUNRPC: don't pause on incomplete allocation

1  2 
net/sunrpc/auth_gss/svcauth_gss.c patch | diff1 | diff2 | blob | history
net/sunrpc/svc_xprt.c patch | diff1 | diff2 | blob | history

diff --cc net/sunrpc/auth_gss/svcauth_gss.c
Simple merge
diff --cc net/sunrpc/svc_xprt.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.