JIRA: https://issues.redhat.com/browse/RHEL-31230
Conflicts:
1) The net/netfilter/Makefile hunk is dropped due to missing
nft_ct_fast.c file first intruduced by commit d9e789147605
("netfilter: nf_tables: avoid retpoline overhead for some ct
expression calls").
2) A merge conflict in the tools/objtool/check.c hunk due to missing
upstream commit 9bb2ec608a20 ("objtool: Update Retpoline validation").
3) First hunk of net/netfilter/nf_tables_core.c is dropped and a merge
conflict in the second hunk due to missing upstream commit
d8d760627855 ("netfilter: nf_tables: add static key to skip retpoline
workarounds").
4) The net/netfilter/nft_ct.c hunks are dropped due to missing upstream
commit d9e789147605 ("netfilter: nf_tables: avoid retpoline overhead
for some ct expression calls").
commit aefb2f2e619b6c334bcb31de830aa00ba0b11129
Author: Breno Leitao <leitao@debian.org>
Date: Tue, 21 Nov 2023 08:07:32 -0800
x86/bugs: Rename CONFIG_RETPOLINE => CONFIG_MITIGATION_RETPOLINE
Step 5/10 of the namespace unification of CPU mitigations related Kconfig options.
[ mingo: Converted a few more uses in comments/messages as well. ]
Suggested-by: Josh Poimboeuf <jpoimboe@kernel.org>
Signed-off-by: Breno Leitao <leitao@debian.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Reviewed-by: Ariel Miculas <amiculas@cisco.com>
Acked-by: Josh Poimboeuf <jpoimboe@kernel.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Link: https://lore.kernel.org/r/20231121160740.1249350-6-leitao@debian.org
Signed-off-by: Waiman Long <longman@redhat.com>
3342973efe