summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2020-08-25 18:01:36 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2020-08-25 18:01:36 -0700
commit2ac69819ba9e3d8d550bb5d2d2df74848e556812 (patch)
treebf65c47f964a7c0ac74fe2fa05f42ea2219e6228 /net
parentabb3438d69fb6dd5baa4ae23eafbf5b87945eff1 (diff)
parentad112aa8b1ac4bf5e8da67734fcb535fd3cd564e (diff)
downloadlinux-stable-2ac69819ba9e3d8d550bb5d2d2df74848e556812.tar.gz
linux-stable-2ac69819ba9e3d8d550bb5d2d2df74848e556812.tar.bz2
linux-stable-2ac69819ba9e3d8d550bb5d2d2df74848e556812.zip
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
Diffstat (limited to 'net')
-rw-r--r--net/sunrpc/auth_gss/trace.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/net/sunrpc/auth_gss/trace.c b/net/sunrpc/auth_gss/trace.c
index d26036a57443..76685abba60f 100644
--- a/net/sunrpc/auth_gss/trace.c
+++ b/net/sunrpc/auth_gss/trace.c
@@ -9,7 +9,6 @@
#include <linux/sunrpc/svc_xprt.h>
#include <linux/sunrpc/auth_gss.h>
#include <linux/sunrpc/gss_err.h>
-#include <linux/sunrpc/auth_gss.h>
#define CREATE_TRACE_POINTS
#include <trace/events/rpcgss.h>