diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-06-03 16:18:26 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-06-03 16:18:26 +0200 |
commit | 41fe7c1f669baa161c694c269de2aae2dd405ef3 (patch) | |
tree | 95ece5077031ebf01787af5d34f490d652c8785c /kernel-s390x-rhel.config | |
parent | 908863c154a71764e6510f3d0759b4c063f621f3 (diff) | |
parent | 99c74c4465fa54346e57ec9c76130f55a5268b45 (diff) | |
download | kernel-41fe7c1f669baa161c694c269de2aae2dd405ef3.tar.gz kernel-41fe7c1f669baa161c694c269de2aae2dd405ef3.tar.xz kernel-41fe7c1f669baa161c694c269de2aae2dd405ef3.zip |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.19.0-0.rc0.20220603git50fd82b3a9a9.11.vanilla.1.fc37kernel-5.19.0-0.rc0.20220603git50fd82b3a9a9.11.vanilla.1.fc36kernel-5.19.0-0.rc0.20220603git50fd82b3a9a9.11.vanilla.1.fc35
Diffstat (limited to 'kernel-s390x-rhel.config')
-rw-r--r-- | kernel-s390x-rhel.config | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 57dffb08b..21ee6e586 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -2147,7 +2147,7 @@ CONFIG_INFINIBAND_USNIC=m # CONFIG_INFTL is not set # CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set -CONFIG_INITRAMFS_PRESERVE_MTIME=y +# CONFIG_INITRAMFS_PRESERVE_MTIME is not set CONFIG_INITRAMFS_SOURCE="" # CONFIG_INIT_STACK_ALL_PATTERN is not set # CONFIG_INIT_STACK_ALL_ZERO is not set @@ -3911,7 +3911,6 @@ CONFIG_PCPU_DEV_REFCNT=y # CONFIG_PECI is not set # CONFIG_PERCPU_STATS is not set # CONFIG_PERCPU_TEST is not set -# CONFIG_PERF_EVENTS_AMD_BRS is not set CONFIG_PERF_EVENTS_AMD_UNCORE=y CONFIG_PERF_EVENTS=y CONFIG_PERSISTENT_KEYRINGS=y |