diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-02-03 20:29:11 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-02-03 20:29:11 +0100 |
| commit | a6a283fe67e156cb31445f1f7099eb678e169739 (patch) | |
| tree | c020a68e083f7d78d41b01c5c8dd0983a012c1a3 /kernel-s390x-zfcpdump-rhel.config | |
| parent | efa6baec3ce44de13420dda4fb45e492ff939ab5 (diff) | |
| parent | 4f1ee1b6a4ea731fa4ff082fa13a449ec0ee9a0e (diff) | |
| download | kernel-a6a283fe67e156cb31445f1f7099eb678e169739.tar.gz kernel-a6a283fe67e156cb31445f1f7099eb678e169739.tar.xz kernel-a6a283fe67e156cb31445f1f7099eb678e169739.zip | |
Merge remote-tracking branch 'origin/main' into rawhide-user-thl-vanilla-fedorakernel-5.11.0-0.rc6.20210203git3aaf0a27ffc2.143.vanilla.1.fc33
Diffstat (limited to 'kernel-s390x-zfcpdump-rhel.config')
| -rw-r--r-- | kernel-s390x-zfcpdump-rhel.config | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index 17c90712e..ed00e3c73 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -4184,7 +4184,6 @@ CONFIG_RETPOLINE=y # CONFIG_RFKILL_GPIO is not set CONFIG_RFKILL_INPUT=y # CONFIG_RFKILL is not set -CONFIG_RH_DISABLE_DEPRECATED=y CONFIG_RHEL_DIFFERENCES=y CONFIG_RING_BUFFER_BENCHMARK=m # CONFIG_RING_BUFFER_STARTUP_TEST is not set |