Home Home > GIT Browse > vanilla
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKernel Build Daemon <kbuild@suse.de>2018-12-27 12:01:55 +0100
committerKernel Build Daemon <kbuild@suse.de>2018-12-27 12:01:55 +0100
commit2c4b268498554bf52e712a1a97a620b8439184b5 (patch)
tree8212b0d20ae5bae821febb828c731008164c88f4
parent8acb11d7fd20c6967f6f4eef6e3a4f143ab8020c (diff)
Automatically updated to 4.20-3763-gfc2fd5f0f1aa
-rw-r--r--config/arm64/vanilla1
-rw-r--r--config/armv7hl/vanilla1
-rw-r--r--config/i386/vanilla5
-rw-r--r--config/ppc64/vanilla1
-rw-r--r--config/ppc64le/vanilla1
-rw-r--r--config/x86_64/vanilla5
-rw-r--r--rpm/config.sh2
7 files changed, 13 insertions, 3 deletions
diff --git a/config/arm64/vanilla b/config/arm64/vanilla
index 86e9577970..3fb85a7891 100644
--- a/config/arm64/vanilla
+++ b/config/arm64/vanilla
@@ -535,6 +535,7 @@ CONFIG_PM_GENERIC_DOMAINS=y
CONFIG_PM_GENERIC_DOMAINS_SLEEP=y
CONFIG_PM_GENERIC_DOMAINS_OF=y
CONFIG_CPU_PM=y
+CONFIG_ENERGY_MODEL=y
CONFIG_ARCH_HIBERNATION_POSSIBLE=y
CONFIG_ARCH_HIBERNATION_HEADER=y
CONFIG_ARCH_SUSPEND_POSSIBLE=y
diff --git a/config/armv7hl/vanilla b/config/armv7hl/vanilla
index 674d40d127..5f938b0a0d 100644
--- a/config/armv7hl/vanilla
+++ b/config/armv7hl/vanilla
@@ -886,6 +886,7 @@ CONFIG_PM_GENERIC_DOMAINS=y
CONFIG_PM_GENERIC_DOMAINS_SLEEP=y
CONFIG_PM_GENERIC_DOMAINS_OF=y
CONFIG_CPU_PM=y
+CONFIG_ENERGY_MODEL=y
CONFIG_ARCH_SUSPEND_POSSIBLE=y
CONFIG_ARM_CPU_SUSPEND=y
CONFIG_ARCH_HIBERNATION_POSSIBLE=y
diff --git a/config/i386/vanilla b/config/i386/vanilla
index 5dbd619284..75e60373c8 100644
--- a/config/i386/vanilla
+++ b/config/i386/vanilla
@@ -275,7 +275,7 @@ CONFIG_X86_FEATURE_NAMES=y
CONFIG_X86_MPPARSE=y
# CONFIG_GOLDFISH is not set
CONFIG_RETPOLINE=y
-CONFIG_INTEL_RDT=y
+CONFIG_RESCTRL=y
CONFIG_X86_BIGSMP=y
CONFIG_X86_EXTENDED_PLATFORM=y
# CONFIG_X86_GOLDFISH is not set
@@ -307,6 +307,7 @@ CONFIG_XEN_SAVE_RESTORE=y
CONFIG_XEN_DEBUG_FS=y
CONFIG_XEN_PVH=y
CONFIG_KVM_GUEST=y
+CONFIG_PVH=y
# CONFIG_KVM_DEBUG_FS is not set
# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
CONFIG_PARAVIRT_CLOCK=y
@@ -487,6 +488,7 @@ CONFIG_PM_CLK=y
CONFIG_PM_GENERIC_DOMAINS=y
# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
CONFIG_PM_GENERIC_DOMAINS_SLEEP=y
+CONFIG_ENERGY_MODEL=y
CONFIG_ARCH_SUPPORTS_ACPI=y
CONFIG_ACPI=y
CONFIG_ACPI_LEGACY_TABLES_LOOKUP=y
@@ -7082,6 +7084,7 @@ CONFIG_XEN_AUTO_XLATE=y
CONFIG_XEN_ACPI=y
CONFIG_XEN_SYMS=y
CONFIG_XEN_HAVE_VPMU=y
+CONFIG_XEN_FRONT_PGDIR_SHBUF=m
CONFIG_STAGING=y
CONFIG_PRISM2_USB=m
# CONFIG_COMEDI is not set
diff --git a/config/ppc64/vanilla b/config/ppc64/vanilla
index 61991bdde4..8263451ca3 100644
--- a/config/ppc64/vanilla
+++ b/config/ppc64/vanilla
@@ -496,6 +496,7 @@ CONFIG_PM_GENERIC_DOMAINS=y
# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
CONFIG_PM_GENERIC_DOMAINS_SLEEP=y
CONFIG_PM_GENERIC_DOMAINS_OF=y
+CONFIG_ENERGY_MODEL=y
CONFIG_SECCOMP=y
CONFIG_PPC_MEM_KEYS=y
CONFIG_ISA_DMA_API=y
diff --git a/config/ppc64le/vanilla b/config/ppc64le/vanilla
index d4b21816ff..f72275ffc6 100644
--- a/config/ppc64le/vanilla
+++ b/config/ppc64le/vanilla
@@ -435,6 +435,7 @@ CONFIG_PM_GENERIC_DOMAINS=y
# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
CONFIG_PM_GENERIC_DOMAINS_SLEEP=y
CONFIG_PM_GENERIC_DOMAINS_OF=y
+CONFIG_ENERGY_MODEL=y
CONFIG_SECCOMP=y
CONFIG_PPC_MEM_KEYS=y
CONFIG_ISA_DMA_API=y
diff --git a/config/x86_64/vanilla b/config/x86_64/vanilla
index f6963cb009..d73dee47ea 100644
--- a/config/x86_64/vanilla
+++ b/config/x86_64/vanilla
@@ -286,7 +286,7 @@ CONFIG_X86_X2APIC=y
CONFIG_X86_MPPARSE=y
# CONFIG_GOLDFISH is not set
CONFIG_RETPOLINE=y
-CONFIG_INTEL_RDT=y
+CONFIG_RESCTRL=y
CONFIG_X86_EXTENDED_PLATFORM=y
# CONFIG_X86_NUMACHIP is not set
# CONFIG_X86_VSMP is not set
@@ -316,6 +316,7 @@ CONFIG_XEN_SAVE_RESTORE=y
CONFIG_XEN_DEBUG_FS=y
CONFIG_XEN_PVH=y
CONFIG_KVM_GUEST=y
+CONFIG_PVH=y
# CONFIG_KVM_DEBUG_FS is not set
# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
CONFIG_PARAVIRT_CLOCK=y
@@ -486,6 +487,7 @@ CONFIG_PM_CLK=y
CONFIG_PM_GENERIC_DOMAINS=y
# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
CONFIG_PM_GENERIC_DOMAINS_SLEEP=y
+CONFIG_ENERGY_MODEL=y
CONFIG_ARCH_SUPPORTS_ACPI=y
CONFIG_ACPI=y
CONFIG_ACPI_LEGACY_TABLES_LOOKUP=y
@@ -7089,6 +7091,7 @@ CONFIG_XEN_AUTO_XLATE=y
CONFIG_XEN_ACPI=y
CONFIG_XEN_SYMS=y
CONFIG_XEN_HAVE_VPMU=y
+CONFIG_XEN_FRONT_PGDIR_SHBUF=m
CONFIG_STAGING=y
CONFIG_PRISM2_USB=m
# CONFIG_COMEDI is not set
diff --git a/rpm/config.sh b/rpm/config.sh
index 2299c333d6..6ca45b64ef 100644
--- a/rpm/config.sh
+++ b/rpm/config.sh
@@ -1,5 +1,5 @@
# The version of the main tarball to use
-SRCVERSION=4.20-2953-g5694cecdb092
+SRCVERSION=4.20-3763-gfc2fd5f0f1aa
# variant of the kernel-source package, either empty or "-rt"
VARIANT=
# Set to 1 if the tree does not contain any non-vanilla patches at all