From: Will Deacon <will@kernel.org>
Date: Thu, 30 Apr 2020 16:39:42 +0000 (+0100)
Subject: Merge branch 'x86/asm' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=bf60333977d57b1edaac75ab942a8d0e5f923b33;p=linux.git

Merge branch 'x86/asm' of git://git./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
---

bf60333977d57b1edaac75ab942a8d0e5f923b33