diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-06-09 18:13:26 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-06-09 18:13:26 +0200 |
| commit | d7a39fddf00166e25233a9899c9b12a32d01d710 (patch) | |
| tree | 208b33026fa4eefd2cabb7bb10cf6ffdad0e637a /kernel-x86_64-rhel.config | |
| parent | fea02dbd16c04b9501a97a2e2ed2eb72fb086c76 (diff) | |
| parent | 3429b90aea0dd898f9dbfa030ce6830c43a4cbce (diff) | |
| download | kernel-d7a39fddf00166e25233a9899c9b12a32d01d710.tar.gz kernel-d7a39fddf00166e25233a9899c9b12a32d01d710.tar.xz kernel-d7a39fddf00166e25233a9899c9b12a32d01d710.zip | |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.13.0-0.rc5.20210608git368094df48e6.39.vanilla.1.fc34
Diffstat (limited to 'kernel-x86_64-rhel.config')
| -rw-r--r-- | kernel-x86_64-rhel.config | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index e7d69edf6..fc711b83a 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -720,7 +720,7 @@ CONFIG_CMA_SIZE_MBYTES=0 CONFIG_CMA_SIZE_SEL_MBYTES=y # CONFIG_CMA_SIZE_SEL_MIN is not set # CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set -# CONFIG_CMA_SYSFS is not set +CONFIG_CMA_SYSFS=y CONFIG_CMA=y # CONFIG_CMDLINE_BOOL is not set # CONFIG_CMDLINE_EXTEND is not set @@ -2270,6 +2270,8 @@ CONFIG_INFINIBAND_VMWARE_PVRDMA=m # CONFIG_INITRAMFS_COMPRESSION_NONE is not set # CONFIG_INITRAMFS_COMPRESSION_XZ is not set CONFIG_INITRAMFS_SOURCE="" +# CONFIG_INIT_STACK_ALL_PATTERN is not set +# CONFIG_INIT_STACK_ALL_ZERO is not set CONFIG_INIT_STACK_NONE=y CONFIG_INOTIFY_USER=y # CONFIG_INPUT_AD714X is not set |