projects / platform / kernel / linux-rpi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6a8b55e 2ce0d7f)
Merge branch 'x86/asm' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into...
authorWill Deacon <will@kernel.org>
Thu, 30 Apr 2020 16:39:42 +0000 (17:39 +0100)
committerWill Deacon <will@kernel.org>
Thu, 30 Apr 2020 16:39:42 +0000 (17:39 +0100)
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

1  2 
arch/x86/Kconfig patch | diff1 | diff2 | blob | history

diff --cc arch/x86/Kconfig
Simple merge
Domain: System / Kernel;