Merge branch 'x86/bugs' into x86/core, to pick up pending changes before dependent patches
Merge in pending alternatives patching infrastructure changes, before applying more patches. Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
@@ -4,7 +4,7 @@
|
||||
|
||||
#include <net/pkt_cls.h>
|
||||
|
||||
#if IS_ENABLED(CONFIG_RETPOLINE)
|
||||
#if IS_ENABLED(CONFIG_MITIGATION_RETPOLINE)
|
||||
|
||||
#include <linux/cpufeature.h>
|
||||
#include <linux/static_key.h>
|
||||
|
||||
Reference in New Issue
Block a user