diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-12-11 02:50:05 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-12-11 02:50:05 -0500 |
| commit | 73cf7e111ed69d8e1b59a3ae41b14bc77215e9ee (patch) | |
| tree | 02cd3308d328bce9cf97bf2c1c9d5e932103ebfe /tools/include/uapi/linux/kcmp.h | |
| parent | 328257099077e8affd438c179d8a938948de2e7f (diff) | |
| parent | 50c4c4e268a2d7a3e58ebb698ac74da0de40ae36 (diff) | |
Merge 4.15-rc3 into driver-core-next
We want the fixes and changes in here for testing.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'tools/include/uapi/linux/kcmp.h')
| -rw-r--r-- | tools/include/uapi/linux/kcmp.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/include/uapi/linux/kcmp.h b/tools/include/uapi/linux/kcmp.h index 481e103da78e..ef1305010925 100644 --- a/tools/include/uapi/linux/kcmp.h +++ b/tools/include/uapi/linux/kcmp.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ | ||
| 1 | #ifndef _UAPI_LINUX_KCMP_H | 2 | #ifndef _UAPI_LINUX_KCMP_H |
| 2 | #define _UAPI_LINUX_KCMP_H | 3 | #define _UAPI_LINUX_KCMP_H |
| 3 | 4 | ||