diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-04-01 08:07:07 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-04-01 08:07:07 +0200 |
| commit | 614fca69c08c4277db85b6587755960f40e18d87 (patch) | |
| tree | 8dc08a04842e09b56bd80e17efe664ffbd7cc7e8 /kernel-x86_64-fedora.config | |
| parent | 628c658417424cda09ce38695b24ad186dc44fcb (diff) | |
| parent | dd59893b60ab9fe8e12e16a2941908408a9781ed (diff) | |
| download | kernel-614fca69c08c4277db85b6587755960f40e18d87.tar.gz kernel-614fca69c08c4277db85b6587755960f40e18d87.tar.xz kernel-614fca69c08c4277db85b6587755960f40e18d87.zip | |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.12.0-0.rc5.20210331git2bb25b3a748a.181.vanilla.1.fc34
Diffstat (limited to 'kernel-x86_64-fedora.config')
| -rw-r--r-- | kernel-x86_64-fedora.config | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index d9dd0de42..e68a7ba67 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -5745,7 +5745,7 @@ CONFIG_SKY2=m CONFIG_SLAB_FREELIST_HARDENED=y CONFIG_SLAB_FREELIST_RANDOM=y # CONFIG_SLAB is not set -CONFIG_SLAB_MERGE_DEFAULT=y +# CONFIG_SLAB_MERGE_DEFAULT is not set # CONFIG_SLIMBUS is not set CONFIG_SLIP_COMPRESSED=y CONFIG_SLIP=m |