diff options
| -rw-r--r-- | ci/apex.conf | 4 | ||||
| -rw-r--r-- | kernel/arch/x86/configs/opnfv.config | 10 |
2 files changed, 8 insertions, 6 deletions
diff --git a/ci/apex.conf b/ci/apex.conf index b4d9b181e..46d99308f 100644 --- a/ci/apex.conf +++ b/ci/apex.conf @@ -1,2 +1,2 @@ -branch=stable/danube -commit_id=3933989f5caacc99da3ad0faa96b42a2861ead6b +branch=master +commit_id=8e1bfc88c439db6816d6ab11575caecc56d51ca4 diff --git a/kernel/arch/x86/configs/opnfv.config b/kernel/arch/x86/configs/opnfv.config index b8ec4a103..a3233ee59 100644 --- a/kernel/arch/x86/configs/opnfv.config +++ b/kernel/arch/x86/configs/opnfv.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.4.6 Kernel Configuration +# Linux/x86 4.4.50 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -370,10 +370,12 @@ CONFIG_FREEZER=y CONFIG_ZONE_DMA=y CONFIG_SMP=y CONFIG_X86_FEATURE_NAMES=y -# CONFIG_X86_X2APIC is not set +CONFIG_X86_X2APIC=y CONFIG_X86_MPPARSE=y CONFIG_X86_EXTENDED_PLATFORM=y +# CONFIG_X86_NUMACHIP is not set # CONFIG_X86_VSMP is not set +# CONFIG_X86_UV is not set # CONFIG_X86_GOLDFISH is not set CONFIG_X86_INTEL_LPSS=y CONFIG_X86_AMD_PLATFORM_DEVICE=y @@ -1948,7 +1950,7 @@ CONFIG_HMC6352=m CONFIG_DS1682=m CONFIG_TI_DAC7512=m CONFIG_VMWARE_BALLOON=m -CONFIG_BMP085=y +CONFIG_BMP085=m CONFIG_BMP085_I2C=m CONFIG_BMP085_SPI=m CONFIG_USB_SWITCH_FSA9480=m @@ -6933,7 +6935,7 @@ CONFIG_AMD_IOMMU_V2=m CONFIG_DMAR_TABLE=y CONFIG_INTEL_IOMMU=y CONFIG_INTEL_IOMMU_SVM=y -CONFIG_INTEL_IOMMU_DEFAULT_ON=y +# CONFIG_INTEL_IOMMU_DEFAULT_ON is not set CONFIG_INTEL_IOMMU_FLOPPY_WA=y CONFIG_IRQ_REMAP=y |