diff options
| author | Daniel Vetter <[email protected]> | 2017-11-27 10:54:33 +0100 |
|---|---|---|
| committer | Daniel Vetter <[email protected]> | 2017-11-27 10:54:33 +0100 |
| commit | 1420edf7a3fbc9b8b0bbe24c3724d582dd4def28 (patch) | |
| tree | 919f3adb874b11cb5e4ed2df37a9370847300ea4 /kernel/sysctl_binary.c | |
| parent | 517f56839f581618d24f2e67a35738a5c6cbaecb (diff) | |
| parent | 4fbd8d194f06c8a3fd2af1ce560ddb31f7ec8323 (diff) | |
Merge tag 'v4.15-rc1' into drm-misc-fixes
Linux 4.15-rc1
Pull in the merge window to resync. Dave didn't get his -fixes pull
landed in time, and now there's another rockchip fix pending, so
fast-forwarding isn't possible, hence backmerge.
Signed-off-by: Daniel Vetter <[email protected]>
Diffstat (limited to 'kernel/sysctl_binary.c')
| -rw-r--r-- | kernel/sysctl_binary.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/sysctl_binary.c b/kernel/sysctl_binary.c index 58ea8c03662e..e8c0dab4fd65 100644 --- a/kernel/sysctl_binary.c +++ b/kernel/sysctl_binary.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 #include <linux/stat.h> #include <linux/sysctl.h> #include "../fs/xfs/xfs_sysctl.h" |