Merge tag 'x86_urgent_for_v5.16_rc8' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 2 Jan 2022 17:02:54 +0000 (09:02 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 2 Jan 2022 17:02:54 +0000 (09:02 -0800)
commit1286cc4893cf356ad6c3a042116981e827dd3680
treed7dbb6724a3c4b1cf35eb37e2855be312a09a8d8
parent278218f6778bc7d6f8b67199446c56cec7ebb841
parentd6f12f83989bb356ac6880a954f62c7667e35066
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