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 /arch/xtensa/include/asm/flat.h | |
| 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-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 'arch/xtensa/include/asm/flat.h')
| -rw-r--r-- | arch/xtensa/include/asm/flat.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/xtensa/include/asm/flat.h b/arch/xtensa/include/asm/flat.h index 60e0d6a45795..b8532d7877b3 100644 --- a/arch/xtensa/include/asm/flat.h +++ b/arch/xtensa/include/asm/flat.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #ifndef __ASM_XTENSA_FLAT_H #define __ASM_XTENSA_FLAT_H |