diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-06-06 19:04:09 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-06-06 19:04:09 +0200 |
| commit | 2b789e85adad5d48d8ff2de60b925cd20c52b08a (patch) | |
| tree | 8b86ab9abf89451b448be6fcd73e47b264d25c9e /kernel-s390x.config | |
| parent | 31b649130cf547a67225eef670909b9857e942cf (diff) | |
| parent | ead55fdbc7606e96fb1436249e4d121c5119218b (diff) | |
| download | kernel-2b789e85adad5d48d8ff2de60b925cd20c52b08a.tar.gz kernel-2b789e85adad5d48d8ff2de60b925cd20c52b08a.tar.xz kernel-2b789e85adad5d48d8ff2de60b925cd20c52b08a.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.2.0-0.rc3.git2.1.vanilla.knurd.1.fc31kernel-5.2.0-0.rc3.git2.1.vanilla.knurd.1.fc30kernel-5.2.0-0.rc3.git2.1.vanilla.knurd.1.fc29
Diffstat (limited to 'kernel-s390x.config')
| -rw-r--r-- | kernel-s390x.config | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel-s390x.config b/kernel-s390x.config index 37ddf0387..eea7944ee 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -1088,7 +1088,7 @@ CONFIG_DM_UEVENT=y CONFIG_DM_UNSTRIPED=m CONFIG_DM_VERITY_FEC=y CONFIG_DM_VERITY=m -# CONFIG_DM_WRITECACHE is not set +CONFIG_DM_WRITECACHE=m CONFIG_DM_ZERO=y CONFIG_DM_ZONED=m # CONFIG_DNET is not set @@ -5218,7 +5218,7 @@ CONFIG_TCG_NSC=m # CONFIG_TCG_TIS_ST33ZP24_SPI is not set CONFIG_TCG_TIS=y CONFIG_TCG_TPM=y -# CONFIG_TCG_VTPM_PROXY is not set +CONFIG_TCG_VTPM_PROXY=m # CONFIG_TCG_XEN is not set CONFIG_TCM_FC=m CONFIG_TCM_FILEIO=m |