diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-05 22:44:39 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-05 22:44:39 +0300 |
| commit | 9d9cc4aa004edc996ce560e57b1154f658681c05 (patch) | |
| tree | 30b71e1aa3363083855edc22447c52585d04d224 /tools/arch/x86/include/asm/disabled-features.h | |
| parent | c84e6d01eed16afa41a1c4ad9a6bd6a8bfe67af0 (diff) | |
| parent | fb7df12d645cfba6a76a45fdcc7e3f7fbbcda661 (diff) | |
| download | linux-9d9cc4aa004edc996ce560e57b1154f658681c05.tar.xz | |
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf fixes from Ingo Molnar:
"Various fixes:
- synchronize kernel and tooling headers
- cgroup support fix
- two tooling fixes"
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
tools/headers: Synchronize kernel ABI headers
perf/cgroup: Fix perf cgroup hierarchy support
perf tools: Unwind properly location after REJECT
perf symbols: Fix memory corruption because of zero length symbols
Diffstat (limited to 'tools/arch/x86/include/asm/disabled-features.h')
| -rw-r--r-- | tools/arch/x86/include/asm/disabled-features.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tools/arch/x86/include/asm/disabled-features.h b/tools/arch/x86/include/asm/disabled-features.h index c1a6d5d0da0d..c10c9128f54e 100644 --- a/tools/arch/x86/include/asm/disabled-features.h +++ b/tools/arch/x86/include/asm/disabled-features.h @@ -1,4 +1,3 @@ -/* SPDX-License-Identifier: GPL-2.0 */ #ifndef _ASM_X86_DISABLED_FEATURES_H #define _ASM_X86_DISABLED_FEATURES_H |