summaryrefslogtreecommitdiffstats
path: root/net/atm/raw.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2017-11-04 08:53:04 +0100
committerIngo Molnar <mingo@kernel.org>2017-11-04 08:53:04 +0100
commit649e441f49d4bfb717e9467950891dc452f4e063 (patch)
tree2bdfdca65519db2f350c236cbbd65f24d5746cad /net/atm/raw.c
parentwatchdog/hardlockup/perf: Use atomics to track in-use cpu counter (diff)
parentKbuild: don't pass "-C" to preprocessor when processing linker scripts (diff)
downloadlinux-649e441f49d4bfb717e9467950891dc452f4e063.tar.xz
linux-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 'net/atm/raw.c')
-rw-r--r--net/atm/raw.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/atm/raw.c b/net/atm/raw.c
index 821c0797553d..ee10e8d46185 100644
--- a/net/atm/raw.c
+++ b/net/atm/raw.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
/* net/atm/raw.c - Raw AAL0 and AAL5 transports */
/* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */