diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-02-24 02:41:07 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-02-24 02:41:07 -0500 |
| commit | 2ae79026818e7d49fead82b79b1a543e3b9c8a23 (patch) | |
| tree | c7ee7bd8b37b0880918d361839fd95988fac2dac /include/uapi/linux/nfsd/debug.h | |
| parent | 1a99367023f6ac664365a37fa508b059e31d0e88 (diff) | |
| parent | c517d838eb7d07bbe9507871fab3931deccff539 (diff) | |
Merge tag 'v4.0-rc1' into locking/core, to refresh the tree before merging new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/uapi/linux/nfsd/debug.h')
| -rw-r--r-- | include/uapi/linux/nfsd/debug.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/linux/nfsd/debug.h b/include/uapi/linux/nfsd/debug.h index 1fdc95bb2375..0bf130a1c58d 100644 --- a/include/uapi/linux/nfsd/debug.h +++ b/include/uapi/linux/nfsd/debug.h | |||
| @@ -32,6 +32,7 @@ | |||
| 32 | #define NFSDDBG_REPCACHE 0x0080 | 32 | #define NFSDDBG_REPCACHE 0x0080 |
| 33 | #define NFSDDBG_XDR 0x0100 | 33 | #define NFSDDBG_XDR 0x0100 |
| 34 | #define NFSDDBG_LOCKD 0x0200 | 34 | #define NFSDDBG_LOCKD 0x0200 |
| 35 | #define NFSDDBG_PNFS 0x0400 | ||
| 35 | #define NFSDDBG_ALL 0x7FFF | 36 | #define NFSDDBG_ALL 0x7FFF |
| 36 | #define NFSDDBG_NOCHANGE 0xFFFF | 37 | #define NFSDDBG_NOCHANGE 0xFFFF |
| 37 | 38 | ||