From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 2 Jan 2022 17:02:54 +0000 (-0800)
Subject: Merge tag 'x86_urgent_for_v5.16_rc8' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=1286cc4893cf356ad6c3a042116981e827dd3680;p=linux.git

Merge tag 'x86_urgent_for_v5.16_rc8' of git://git./linux/kernel/git/tip/tip

Pull x86 fix from Borislav Petkov:

 - Use the proper CONFIG symbol in a preprocessor check.

* tag 'x86_urgent_for_v5.16_rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/build: Use the proper name CONFIG_FW_LOADER
---

1286cc4893cf356ad6c3a042116981e827dd3680