Home Home > GIT Browse > vanilla
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKernel Build Daemon <kbuild@suse.de>2019-07-11 12:03:02 +0200
committerKernel Build Daemon <kbuild@suse.de>2019-07-11 12:03:02 +0200
commitfbac8507d7968b7a6951033626ca08a16b3e0ac3 (patch)
tree779620552a7e54a8734cb0fbe2cc92218a7c0ddd
parentcbf86641c844b16e37121afe09413687345cf011 (diff)
Automatically updated to 5.2-3311-g5450e8a316a6
-rw-r--r--config/armv7hl/vanilla2
-rw-r--r--rpm/config.sh2
2 files changed, 3 insertions, 1 deletions
diff --git a/config/armv7hl/vanilla b/config/armv7hl/vanilla
index 23e216e657..2075660a9e 100644
--- a/config/armv7hl/vanilla
+++ b/config/armv7hl/vanilla
@@ -1086,7 +1086,9 @@ CONFIG_BINFMT_ELF_FDPIC=y
CONFIG_ELFCORE=y
CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
CONFIG_BINFMT_SCRIPT=y
+CONFIG_ARCH_HAS_BINFMT_FLAT=y
# CONFIG_BINFMT_FLAT is not set
+CONFIG_BINFMT_FLAT_ARGVP_ENVP_ON_STACK=y
# CONFIG_HAVE_AOUT is not set
CONFIG_BINFMT_MISC=m
CONFIG_COREDUMP=y
diff --git a/rpm/config.sh b/rpm/config.sh
index 5e42a2392b..4f781c7313 100644
--- a/rpm/config.sh
+++ b/rpm/config.sh
@@ -1,5 +1,5 @@
# The version of the main tarball to use
-SRCVERSION=5.2-3135-ge9a83bd23220
+SRCVERSION=5.2-3311-g5450e8a316a6
# 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