diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-02-11 13:51:25 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-02-11 13:51:25 +0100 |
| commit | b0ebdcd763479064f968d7c9c75fb98eb42f9c69 (patch) | |
| tree | 42b232e3d0b70d871fabbb26430a7e55140c5d9f /configs/fedora | |
| parent | c770d83fd262798bbed608a855df6388ccd93e4d (diff) | |
| parent | 90f94e196fa383fb2c105567231d414fb39e6d70 (diff) | |
| download | kernel-b0ebdcd763479064f968d7c9c75fb98eb42f9c69.tar.gz kernel-b0ebdcd763479064f968d7c9c75fb98eb42f9c69.tar.xz kernel-b0ebdcd763479064f968d7c9c75fb98eb42f9c69.zip | |
Merge remote-tracking branch 'origin/stabilization' into stabilization-user-thl-vanilla-fedora
Diffstat (limited to 'configs/fedora')
| -rw-r--r-- | configs/fedora/generic/CONFIG_ALLOW_LOCKDOWN_LIFT_BY_SYSRQ | 1 | ||||
| -rw-r--r-- | configs/fedora/generic/arm/armv7/CONFIG_DEBUG_INFO_BTF | 1 | ||||
| -rw-r--r-- | configs/fedora/generic/x86/CONFIG_SFI | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/configs/fedora/generic/CONFIG_ALLOW_LOCKDOWN_LIFT_BY_SYSRQ b/configs/fedora/generic/CONFIG_ALLOW_LOCKDOWN_LIFT_BY_SYSRQ deleted file mode 100644 index 40a287f0f..000000000 --- a/configs/fedora/generic/CONFIG_ALLOW_LOCKDOWN_LIFT_BY_SYSRQ +++ /dev/null @@ -1 +0,0 @@ -CONFIG_ALLOW_LOCKDOWN_LIFT_BY_SYSRQ=y diff --git a/configs/fedora/generic/arm/armv7/CONFIG_DEBUG_INFO_BTF b/configs/fedora/generic/arm/armv7/CONFIG_DEBUG_INFO_BTF new file mode 100644 index 000000000..3b5ac748f --- /dev/null +++ b/configs/fedora/generic/arm/armv7/CONFIG_DEBUG_INFO_BTF @@ -0,0 +1 @@ +# CONFIG_DEBUG_INFO_BTF is not set diff --git a/configs/fedora/generic/x86/CONFIG_SFI b/configs/fedora/generic/x86/CONFIG_SFI index 4754983e1..6857591ec 100644 --- a/configs/fedora/generic/x86/CONFIG_SFI +++ b/configs/fedora/generic/x86/CONFIG_SFI @@ -1 +1 @@ -CONFIG_SFI=y +# CONFIG_SFI is not set |