diff options
| author |   Will Deacon <will@kernel.org> | 2020-04-30 17:39:42 +0100 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2020-04-30 17:39:42 +0100 |
| commit | bf60333977d57b1edaac75ab942a8d0e5f923b33 (patch) | |
| tree | ebbcc95cfba75d72034e23c33c4a62a23c9d1e2f /tools/perf/scripts/python | |
| parent | Linux 5.7-rc3 (diff) | |
| parent | x86/asm: Provide a Kconfig symbol for disabling old assembly annotations (diff) | |
| download | linux-dev-bf60333977d57b1edaac75ab942a8d0e5f923b33.tar.xz linux-dev-bf60333977d57b1edaac75ab942a8d0e5f923b33.zip | |
Merge branch 'x86/asm' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into for-next/asm
As agreed with Boris, merge in the 'x86/asm' branch from -tip so that we
can select the new 'ARCH_USE_SYM_ANNOTATIONS' Kconfig symbol, which is
required by the BTI kernel patches.
* 'x86/asm' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/asm: Provide a Kconfig symbol for disabling old assembly annotations
x86/32: Remove CONFIG_DOUBLEFAULT
Diffstat (limited to 'tools/perf/scripts/python')
0 files changed, 0 insertions, 0 deletions