diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-07 13:11:44 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-07 13:11:49 +0000 |
| commit | f25552c1068a054f2d99afd67a671d5991bf19c1 (patch) | |
| tree | d70de5c7262ad572f8323fc4184b8a10522e81ec /debian/config/kernelarch-x86 | |
| parent | Merging upstream version 6.9.7. (diff) | |
| download | linux-f25552c1068a054f2d99afd67a671d5991bf19c1.tar.xz linux-f25552c1068a054f2d99afd67a671d5991bf19c1.zip | |
Merging debian version 6.9.7-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/config/kernelarch-x86')
| -rw-r--r-- | debian/config/kernelarch-x86/config | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config index 3431fc11e7..d77140dbd7 100644 --- a/debian/config/kernelarch-x86/config +++ b/debian/config/kernelarch-x86/config @@ -57,7 +57,7 @@ CONFIG_RANDOMIZE_BASE=y # CONFIG_COMPAT_VDSO is not set # CONFIG_CMDLINE_BOOL is not set CONFIG_MODIFY_LDT_SYSCALL=y -CONFIG_RETPOLINE=y +CONFIG_MITIGATION_RETPOLINE=y # CONFIG_PCI_CNB20LE_QUIRK is not set # CONFIG_ISA_BUS is not set CONFIG_IA32_EMULATION=y @@ -172,7 +172,6 @@ CONFIG_ACPI_CONTAINER=y CONFIG_ACPI_HOTPLUG_MEMORY=y CONFIG_ACPI_SBS=m CONFIG_ACPI_HED=m -# CONFIG_ACPI_CUSTOM_METHOD is not set CONFIG_ACPI_EXTLOG=y CONFIG_X86_PM_TIMER=y @@ -1403,6 +1402,8 @@ CONFIG_PINCTRL_ICELAKE=y CONFIG_PINCTRL_JASPERLAKE=m CONFIG_PINCTRL_LAKEFIELD=m CONFIG_PINCTRL_LEWISBURG=y +CONFIG_PINCTRL_METEORLAKE=m +CONFIG_PINCTRL_METEORPOINT=m CONFIG_PINCTRL_SUNRISEPOINT=y CONFIG_PINCTRL_TIGERLAKE=y |