diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2017-11-04 08:53:04 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-11-04 08:53:04 +0100 |
| commit | 649e441f49d4bfb717e9467950891dc452f4e063 (patch) | |
| tree | 2bdfdca65519db2f350c236cbbd65f24d5746cad /kernel/sysctl_binary.c | |
| parent | watchdog/hardlockup/perf: Use atomics to track in-use cpu counter (diff) | |
| parent | Kbuild: don't pass "-C" to preprocessor when processing linker scripts (diff) | |
| download | linux-rng-649e441f49d4bfb717e9467950891dc452f4e063.tar.xz linux-rng-649e441f49d4bfb717e9467950891dc452f4e063.zip | |
Merge branch 'linus' into core/urgent, to pick up dependent commits
We want to fix an objtool build warning that got introduced in the latest upstream kernel.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
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" |