diff options
| author | Ben Hutchings <benh@debian.org> | 2022-07-24 17:18:34 +0200 |
|---|---|---|
| committer | Ben Hutchings <benh@debian.org> | 2022-07-25 10:26:15 +0200 |
| commit | 3d902650fb0629da7f388ac1c6cd8aa021657fbf (patch) | |
| tree | a7533a83ee1e99b7e338421368ff09de05f76cfe | |
| parent | 19c9e5b5a5e9bc616ec3170a2508e54153567d87 (diff) | |
| download | linux-debian-3d902650fb0629da7f388ac1c6cd8aa021657fbf.tar.gz | |
d/patches: Fix conflicts in patch merged from sid
| -rw-r--r-- | debian/patches/bugfix/x86/x86-speculation-make-all-retbleed-mitigations-depend.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/debian/patches/bugfix/x86/x86-speculation-make-all-retbleed-mitigations-depend.patch b/debian/patches/bugfix/x86/x86-speculation-make-all-retbleed-mitigations-depend.patch index a6d04fca8..1fd1a380b 100644 --- a/debian/patches/bugfix/x86/x86-speculation-make-all-retbleed-mitigations-depend.patch +++ b/debian/patches/bugfix/x86/x86-speculation-make-all-retbleed-mitigations-depend.patch @@ -20,16 +20,16 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk> --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig -@@ -2469,7 +2469,7 @@ config RETPOLINE - config RETHUNK +@@ -2473,7 +2473,7 @@ config RETHUNK bool "Enable return-thunks" depends on RETPOLINE && CC_HAS_RETURN_THUNK + select OBJTOOL if HAVE_OBJTOOL - default y + default y if X86_64 help Compile the kernel with the return-thunks compiler option to guard against kernel-to-user data leaks by avoiding return speculation. -@@ -2478,21 +2478,21 @@ config RETHUNK +@@ -2482,21 +2482,21 @@ config RETHUNK config CPU_UNRET_ENTRY bool "Enable UNRET on kernel entry" |