Home| summaryrefslogtreecommitdiff |
diff options
| author | Petr Tesarik <ptesarik@suse.cz> | 2018-11-09 14:46:02 +0100 |
|---|---|---|
| committer | Petr Tesarik <ptesarik@suse.cz> | 2018-11-09 14:46:02 +0100 |
| commit | 25640e8095d7be8f04bd429f10fb0c5751a27616 (patch) | |
| tree | 4b9c924bca8e2df3ae96e0690a93fef2ba68c911 | |
| parent | 067873e0095576382d9af2820e466fce78b61a91 (diff) | |
Update config files: update vanilla configsrpm-4.12.14-25.21
Restore multiple options, lost by commit
4a67b3f26668513d204457c78f024ae259a2943d
| -rw-r--r-- | config/arm64/vanilla | 2 | ||||
| -rw-r--r-- | config/ppc64le/vanilla | 2 | ||||
| -rw-r--r-- | config/s390x/vanilla | 2 | ||||
| -rw-r--r-- | config/x86_64/vanilla | 2 |
4 files changed, 8 insertions, 0 deletions
diff --git a/config/arm64/vanilla b/config/arm64/vanilla index f9ec4963eb..af36c21d87 100644 --- a/config/arm64/vanilla +++ b/config/arm64/vanilla @@ -1,11 +1,13 @@ # CONFIG_BCM2835_VCHIQ_SUPPORT_MEMDUMP is not set CONFIG_BLK_CPQ_CISS_DA=m # CONFIG_BLK_DEV_NVME_SCSI is not set +CONFIG_BLK_DEV_RAM_DAX=y CONFIG_CISS_SCSI_TAPE=y # CONFIG_CRYPTO_DEV_FSL_CAAM_IMX is not set # CONFIG_DEVKMEM is not set # CONFIG_HAVE_ARCH_VMAP_STACK is not set CONFIG_HW_RANDOM_TPM=m +# CONFIG_INFINIBAND_CXGB3_DEBUG is not set # CONFIG_INTEL_SOC_PMIC is not set CONFIG_IRQ_BYPASS_MANAGER=m CONFIG_LOCALVERSION="-vanilla" diff --git a/config/ppc64le/vanilla b/config/ppc64le/vanilla index c28fe9a7ec..41ce99c89a 100644 --- a/config/ppc64le/vanilla +++ b/config/ppc64le/vanilla @@ -1,8 +1,10 @@ CONFIG_BLK_CPQ_CISS_DA=m # CONFIG_BLK_DEV_NVME_SCSI is not set +CONFIG_BLK_DEV_RAM_DAX=y CONFIG_CHECK_SIGNATURE=y CONFIG_CISS_SCSI_TAPE=y CONFIG_HW_RANDOM_TPM=m +# CONFIG_INFINIBAND_CXGB3_DEBUG is not set # CONFIG_INTEL_SOC_PMIC is not set CONFIG_LOCALVERSION="-vanilla" # CONFIG_MODULE_SIG is not set diff --git a/config/s390x/vanilla b/config/s390x/vanilla index 1473ed0125..876f43bb9b 100644 --- a/config/s390x/vanilla +++ b/config/s390x/vanilla @@ -1,11 +1,13 @@ CONFIG_BLK_CPQ_CISS_DA=m # CONFIG_BLK_DEV_NVME_SCSI is not set +CONFIG_BLK_DEV_RAM_DAX=y CONFIG_CHECK_SIGNATURE=y CONFIG_CISS_SCSI_TAPE=y # CONFIG_DP83867_PHY is not set CONFIG_HW_RANDOM_TPM=m CONFIG_LOCALVERSION="-vanilla" # CONFIG_MODULE_SIG is not set +CONFIG_SCM_BLOCK_CLUSTER_WRITE=y # CONFIG_SOC_ZTE is not set # CONFIG_SYSTEM_DATA_VERIFICATION is not set CONFIG_TREE_RCU_TRACE=y diff --git a/config/x86_64/vanilla b/config/x86_64/vanilla index a5d0db3904..1f4fefc427 100644 --- a/config/x86_64/vanilla +++ b/config/x86_64/vanilla @@ -2,11 +2,13 @@ CONFIG_ARCH_HAS_MMIO_FLUSH=y CONFIG_ARCH_WANT_FRAME_POINTERS=y CONFIG_BLK_CPQ_CISS_DA=m # CONFIG_BLK_DEV_NVME_SCSI is not set +CONFIG_BLK_DEV_RAM_DAX=y CONFIG_CISS_SCSI_TAPE=y # CONFIG_DP83867_PHY is not set CONFIG_FRAME_POINTER=y CONFIG_HFI1_VERBS_31BIT_PSN=y CONFIG_HW_RANDOM_TPM=m +# CONFIG_INFINIBAND_CXGB3_DEBUG is not set CONFIG_INTEL_PMC_CORE=y CONFIG_INTEL_RDT_A=y # CONFIG_KEXEC_VERIFY_SIG is not set |