Home Home > GIT Browse > linux-next
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKernel Build Daemon <kbuild@suse.de>2018-12-13 12:01:52 +0100
committerKernel Build Daemon <kbuild@suse.de>2018-12-13 12:01:52 +0100
commitecafc9baf8adbd8cfa080a008593c505352d59d2 (patch)
treeb24c181a7d7349dccc20e877bb851d274f45910f
parent796c22afc04310861d21ded461965a7ac2d8c75d (diff)
Automatically updated to 4.20-rc6-next-20181213
-rw-r--r--config/arm64/vanilla9
-rw-r--r--config/armv7hl/vanilla2
-rw-r--r--config/i386/vanilla1
-rw-r--r--config/ppc64/vanilla1
-rw-r--r--config/ppc64le/vanilla1
-rw-r--r--config/x86_64/vanilla1
-rw-r--r--rpm/config.sh2
7 files changed, 16 insertions, 1 deletions
diff --git a/config/arm64/vanilla b/config/arm64/vanilla
index c2af98c472..d90ac51052 100644
--- a/config/arm64/vanilla
+++ b/config/arm64/vanilla
@@ -235,6 +235,7 @@ CONFIG_GENERIC_CSUM=y
CONFIG_GENERIC_CALIBRATE_DELAY=y
CONFIG_ZONE_DMA32=y
CONFIG_HAVE_GENERIC_GUP=y
+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
CONFIG_SMP=y
CONFIG_KERNEL_MODE_NEON=y
CONFIG_FIX_EARLYCON_MEM=y
@@ -388,6 +389,7 @@ CONFIG_ARM64_MODULE_PLTS=y
CONFIG_RELOCATABLE=y
CONFIG_RANDOMIZE_BASE=y
CONFIG_RANDOMIZE_MODULE_REGION_FULL=y
+# CONFIG_CC_HAVE_STACKPROTECTOR_SYSREG is not set
#
# Boot options
@@ -570,6 +572,7 @@ CONFIG_ACPI_TABLE_UPGRADE=y
# CONFIG_ACPI_DEBUG is not set
CONFIG_ACPI_PCI_SLOT=y
CONFIG_ACPI_CONTAINER=y
+CONFIG_ACPI_HOTPLUG_MEMORY=y
CONFIG_ACPI_HED=y
CONFIG_ACPI_CUSTOM_METHOD=m
CONFIG_ACPI_BGRT=y
@@ -868,6 +871,9 @@ CONFIG_SPARSEMEM_VMEMMAP=y
CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
CONFIG_MEMORY_ISOLATION=y
# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set
+CONFIG_MEMORY_HOTPLUG=y
+CONFIG_MEMORY_HOTPLUG_SPARSE=y
+CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y
CONFIG_SPLIT_PTLOCK_CPUS=4
CONFIG_MEMORY_BALLOON=y
CONFIG_BALLOON_COMPACTION=y
@@ -3105,6 +3111,7 @@ CONFIG_STMMAC_PLATFORM=m
CONFIG_DWMAC_DWC_QOS_ETH=m
CONFIG_DWMAC_GENERIC=m
CONFIG_DWMAC_IPQ806X=m
+CONFIG_DWMAC_MEDIATEK=m
CONFIG_DWMAC_MESON=m
CONFIG_DWMAC_ROCKCHIP=m
CONFIG_DWMAC_SOCFPGA=m
@@ -5499,6 +5506,7 @@ CONFIG_DVB_NETUP_UNIDVB=m
CONFIG_V4L_PLATFORM_DRIVERS=y
CONFIG_VIDEO_CAFE_CCIC=m
CONFIG_VIDEO_CADENCE=y
+CONFIG_VIDEO_ASPEED=m
CONFIG_SOC_CAMERA=m
CONFIG_SOC_CAMERA_PLATFORM=m
CONFIG_V4L_MEM2MEM_DRIVERS=y
@@ -9700,6 +9708,7 @@ CONFIG_HAVE_DEBUG_KMEMLEAK=y
CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
# CONFIG_DEBUG_VIRTUAL is not set
CONFIG_DEBUG_MEMORY_INIT=y
+CONFIG_MEMORY_NOTIFIER_ERROR_INJECT=m
# CONFIG_DEBUG_PER_CPU_MAPS is not set
CONFIG_HAVE_ARCH_KASAN=y
CONFIG_HAVE_ARCH_KASAN_SW_TAGS=y
diff --git a/config/armv7hl/vanilla b/config/armv7hl/vanilla
index 594a5eba2a..39590f03fc 100644
--- a/config/armv7hl/vanilla
+++ b/config/armv7hl/vanilla
@@ -3122,6 +3122,7 @@ CONFIG_STMMAC_PLATFORM=m
CONFIG_DWMAC_DWC_QOS_ETH=m
CONFIG_DWMAC_GENERIC=m
CONFIG_DWMAC_IPQ806X=m
+CONFIG_DWMAC_MEDIATEK=m
CONFIG_DWMAC_MESON=m
CONFIG_DWMAC_ROCKCHIP=m
CONFIG_DWMAC_SOCFPGA=m
@@ -5614,6 +5615,7 @@ CONFIG_V4L_PLATFORM_DRIVERS=y
CONFIG_VIDEO_CADENCE=y
CONFIG_VIDEO_CADENCE_CSI2RX=m
CONFIG_VIDEO_CADENCE_CSI2TX=m
+CONFIG_VIDEO_ASPEED=m
CONFIG_VIDEO_MUX=m
CONFIG_VIDEO_OMAP3=m
# CONFIG_VIDEO_OMAP3_DEBUG is not set
diff --git a/config/i386/vanilla b/config/i386/vanilla
index 87c82c7f50..639d9e5fb6 100644
--- a/config/i386/vanilla
+++ b/config/i386/vanilla
@@ -5208,6 +5208,7 @@ CONFIG_DVB_NETUP_UNIDVB=m
CONFIG_V4L_PLATFORM_DRIVERS=y
CONFIG_VIDEO_CAFE_CCIC=m
CONFIG_VIDEO_CADENCE=y
+CONFIG_VIDEO_ASPEED=m
CONFIG_SOC_CAMERA=m
CONFIG_SOC_CAMERA_PLATFORM=m
CONFIG_V4L_MEM2MEM_DRIVERS=y
diff --git a/config/ppc64/vanilla b/config/ppc64/vanilla
index 2176c8849f..5afcf6e4f6 100644
--- a/config/ppc64/vanilla
+++ b/config/ppc64/vanilla
@@ -4621,6 +4621,7 @@ CONFIG_DVB_NETUP_UNIDVB=m
CONFIG_V4L_PLATFORM_DRIVERS=y
CONFIG_VIDEO_CAFE_CCIC=m
CONFIG_VIDEO_CADENCE=y
+CONFIG_VIDEO_ASPEED=m
CONFIG_SOC_CAMERA=m
CONFIG_SOC_CAMERA_PLATFORM=m
CONFIG_V4L_MEM2MEM_DRIVERS=y
diff --git a/config/ppc64le/vanilla b/config/ppc64le/vanilla
index 28a68e4406..e3616d589d 100644
--- a/config/ppc64le/vanilla
+++ b/config/ppc64le/vanilla
@@ -4491,6 +4491,7 @@ CONFIG_DVB_NETUP_UNIDVB=m
CONFIG_V4L_PLATFORM_DRIVERS=y
CONFIG_VIDEO_CAFE_CCIC=m
CONFIG_VIDEO_CADENCE=y
+CONFIG_VIDEO_ASPEED=m
CONFIG_SOC_CAMERA=m
CONFIG_SOC_CAMERA_PLATFORM=m
CONFIG_V4L_MEM2MEM_DRIVERS=y
diff --git a/config/x86_64/vanilla b/config/x86_64/vanilla
index c54abc2f28..08cf87e79e 100644
--- a/config/x86_64/vanilla
+++ b/config/x86_64/vanilla
@@ -5209,6 +5209,7 @@ CONFIG_DVB_NETUP_UNIDVB=m
CONFIG_V4L_PLATFORM_DRIVERS=y
CONFIG_VIDEO_CAFE_CCIC=m
CONFIG_VIDEO_CADENCE=y
+CONFIG_VIDEO_ASPEED=m
CONFIG_SOC_CAMERA=m
CONFIG_SOC_CAMERA_PLATFORM=m
CONFIG_V4L_MEM2MEM_DRIVERS=y
diff --git a/rpm/config.sh b/rpm/config.sh
index ab579d14cd..2fcb8d7f20 100644
--- a/rpm/config.sh
+++ b/rpm/config.sh
@@ -1,5 +1,5 @@
# The version of the main tarball to use
-SRCVERSION=4.20-rc6-next-20181212
+SRCVERSION=4.20-rc6-next-20181213
# 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