Home Home > GIT Browse > linux-next
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKernel Build Daemon <kbuild@suse.de>2019-07-08 12:03:15 +0200
committerKernel Build Daemon <kbuild@suse.de>2019-07-08 12:03:15 +0200
commitfa1936776c064ce2b1ba69150229871648d1ee39 (patch)
tree4e5c82df8fbfda638f5e5a6e3bba8fccade4572d
parentb072e6b509f8c8d4583fa35f223886c886f8d5d3 (diff)
parent0672f8e3e673e67c4194b456611c08939dc4b654 (diff)
Merge branch 'master-vanilla-configs' into linux-next
-rw-r--r--config/arm64/vanilla2
-rw-r--r--config/armv7hl/vanilla2
-rw-r--r--config/i386/vanilla2
-rw-r--r--config/ppc64/vanilla2
-rw-r--r--config/ppc64le/vanilla2
-rw-r--r--config/x86_64/vanilla6
6 files changed, 8 insertions, 8 deletions
diff --git a/config/arm64/vanilla b/config/arm64/vanilla
index c92e7934d1..e001645530 100644
--- a/config/arm64/vanilla
+++ b/config/arm64/vanilla
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.2.0-rc7 Kernel Configuration
+# Linux/arm64 5.2.0 Kernel Configuration
#
#
diff --git a/config/armv7hl/vanilla b/config/armv7hl/vanilla
index 0947be6cea..ad4a471f12 100644
--- a/config/armv7hl/vanilla
+++ b/config/armv7hl/vanilla
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 5.2.0-rc7 Kernel Configuration
+# Linux/arm 5.2.0 Kernel Configuration
#
#
diff --git a/config/i386/vanilla b/config/i386/vanilla
index 94fb365f59..f729640e6b 100644
--- a/config/i386/vanilla
+++ b/config/i386/vanilla
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/i386 5.2.0-rc7 Kernel Configuration
+# Linux/i386 5.2.0 Kernel Configuration
#
#
diff --git a/config/ppc64/vanilla b/config/ppc64/vanilla
index d3c831bc6d..9c0cb3f8fa 100644
--- a/config/ppc64/vanilla
+++ b/config/ppc64/vanilla
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.2.0-rc7 Kernel Configuration
+# Linux/powerpc 5.2.0 Kernel Configuration
#
#
diff --git a/config/ppc64le/vanilla b/config/ppc64le/vanilla
index 03c09bd4a1..3b9fd7ba59 100644
--- a/config/ppc64le/vanilla
+++ b/config/ppc64le/vanilla
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.2.0-rc7 Kernel Configuration
+# Linux/powerpc 5.2.0 Kernel Configuration
#
#
diff --git a/config/x86_64/vanilla b/config/x86_64/vanilla
index e2eb93a083..8aed316e6c 100644
--- a/config/x86_64/vanilla
+++ b/config/x86_64/vanilla
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 5.2.0-rc7 Kernel Configuration
+# Linux/x86_64 5.2.0 Kernel Configuration
#
#
@@ -450,11 +450,11 @@ CONFIG_ARCH_HAS_KEXEC_PURGATORY=y
# CONFIG_KEXEC_VERIFY_SIG is not set
CONFIG_CRASH_DUMP=y
# CONFIG_KEXEC_JUMP is not set
-CONFIG_PHYSICAL_START=0x200000
+CONFIG_PHYSICAL_START=0x1000000
CONFIG_RELOCATABLE=y
CONFIG_RANDOMIZE_BASE=y
CONFIG_X86_NEED_RELOCS=y
-CONFIG_PHYSICAL_ALIGN=0x1000000
+CONFIG_PHYSICAL_ALIGN=0x200000
CONFIG_DYNAMIC_MEMORY_LAYOUT=y
CONFIG_RANDOMIZE_MEMORY=y
CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa