Home Home > GIT Browse > vanilla
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKernel Build Daemon <kbuild@suse.de>2019-01-12 12:01:53 +0100
committerKernel Build Daemon <kbuild@suse.de>2019-01-12 12:01:53 +0100
commit5dc457800d0331b32c7aa4f85bdcad5c3838060c (patch)
tree072f60cb3906df0b9c48278c7482dde7361923c3
parent5dfb2e072454c46004812d785bdbefc6e8154047 (diff)
Automatically updated to 5.0-rc1-164-g4b3c31c8d4dd
-rw-r--r--config/i386/vanilla2
-rw-r--r--config/x86_64/vanilla2
-rw-r--r--rpm/config.sh2
3 files changed, 3 insertions, 3 deletions
diff --git a/config/i386/vanilla b/config/i386/vanilla
index acfdd7aa86..5c456cad86 100644
--- a/config/i386/vanilla
+++ b/config/i386/vanilla
@@ -274,7 +274,7 @@ CONFIG_X86_FEATURE_NAMES=y
CONFIG_X86_MPPARSE=y
# CONFIG_GOLDFISH is not set
CONFIG_RETPOLINE=y
-CONFIG_RESCTRL=y
+CONFIG_X86_RESCTRL=y
CONFIG_X86_BIGSMP=y
CONFIG_X86_EXTENDED_PLATFORM=y
# CONFIG_X86_GOLDFISH is not set
diff --git a/config/x86_64/vanilla b/config/x86_64/vanilla
index 73d823f6ca..c2de488e08 100644
--- a/config/x86_64/vanilla
+++ b/config/x86_64/vanilla
@@ -285,7 +285,7 @@ CONFIG_X86_X2APIC=y
CONFIG_X86_MPPARSE=y
# CONFIG_GOLDFISH is not set
CONFIG_RETPOLINE=y
-CONFIG_RESCTRL=y
+CONFIG_X86_RESCTRL=y
CONFIG_X86_EXTENDED_PLATFORM=y
# CONFIG_X86_NUMACHIP is not set
# CONFIG_X86_VSMP is not set
diff --git a/rpm/config.sh b/rpm/config.sh
index c0e76a5d22..287a8dba48 100644
--- a/rpm/config.sh
+++ b/rpm/config.sh
@@ -1,5 +1,5 @@
# The version of the main tarball to use
-SRCVERSION=5.0-rc1-43-g1bdbe2274920
+SRCVERSION=5.0-rc1-164-g4b3c31c8d4dd
# 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