diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-07-11 21:28:07 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-07-11 21:28:07 +0200 |
| commit | 2fea534163f5b11f062c75a3b94efd973f7137ef (patch) | |
| tree | e4a53e3528bb679b5868999d05ee52da82f33916 /kernel-s390x-fedora.config | |
| parent | 8331bd9c45cea3b4964b0a5fa301b375683fe103 (diff) | |
| parent | f70c5100799fd072342b834082b35e1edb831747 (diff) | |
| download | kernel-2fea534163f5b11f062c75a3b94efd973f7137ef.tar.gz kernel-2fea534163f5b11f062c75a3b94efd973f7137ef.tar.xz kernel-2fea534163f5b11f062c75a3b94efd973f7137ef.zip | |
merge masterkernel-5.14.0-0.rc0.20210709gitf55966571d5e.14.vanilla.1.fc35kernel-5.14.0-0.rc0.20210709gitf55966571d5e.14.vanilla.1.fc34kernel-5.14.0-0.rc0.20210709gitf55966571d5e.14.vanilla.1.fc33
Diffstat (limited to 'kernel-s390x-fedora.config')
| -rw-r--r-- | kernel-s390x-fedora.config | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 2d5c92392..fceaaff1e 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -426,6 +426,7 @@ CONFIG_BATTERY_GOLDFISH=m # CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17042 is not set # CONFIG_BATTERY_MAX1721X is not set +# CONFIG_BATTERY_RT5033 is not set # CONFIG_BATTERY_SBS is not set CONFIG_BATTERY_SURFACE=m CONFIG_BAYCOM_EPP=m @@ -2128,6 +2129,7 @@ CONFIG_HW_RANDOM_TPM=y CONFIG_HW_RANDOM_VIRTIO=y CONFIG_HW_RANDOM_XIPHERA=m CONFIG_HW_RANDOM=y +# CONFIG_HWSPINLOCK_SUN6I is not set CONFIG_HWSPINLOCK=y # CONFIG_HX711 is not set # CONFIG_HYPERV_TESTING is not set @@ -2776,6 +2778,7 @@ CONFIG_KERNEL_HEADER_TEST=y # CONFIG_KERNEL_ZSTD is not set CONFIG_KEXEC_FILE=y CONFIG_KEXEC_IMAGE_VERIFY_SIG=y +# CONFIG_KEXEC_SIG_FORCE is not set CONFIG_KEXEC_SIG=y CONFIG_KEXEC=y # CONFIG_KEYBOARD_ADC is not set @@ -7051,6 +7054,7 @@ CONFIG_W83977F_WDT=m # CONFIG_WARN_DYNAMIC_STACK is not set CONFIG_WATCHDOG_CORE=y CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y +# CONFIG_WATCHDOG_HRTIMER_PRETIMEOUT is not set # CONFIG_WATCHDOG_NOWAYOUT is not set CONFIG_WATCHDOG_OPEN_TIMEOUT=0 # CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set |