diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-08-26 03:01:36 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-08-26 03:01:36 +0200 |
| commit | 2ac69819ba9e3d8d550bb5d2d2df74848e556812 (patch) | |
| tree | bf65c47f964a7c0ac74fe2fa05f42ea2219e6228 /net | |
| parent | Merge tag 'm68knommu-for-v5.9-rc3' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
| parent | SUNRPC: remove duplicate include (diff) | |
| download | linux-2ac69819ba9e3d8d550bb5d2d2df74848e556812.tar.xz linux-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.c | 1 |
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> |