Home Home > GIT Browse > linux-next
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKernel Build Daemon <kbuild@suse.de>2018-12-07 12:02:12 +0100
committerKernel Build Daemon <kbuild@suse.de>2018-12-07 12:02:12 +0100
commit2ff37cc61cdb07b6159054ee1496f6ffd7599533 (patch)
treead630f6f91ac32633ae5767267ca669bb40fde10
parente0e284ede363ba23e6cff16c4b84194528317c4d (diff)
Automatically updated to 4.20-rc5-next-20181207
-rw-r--r--config/arm64/vanilla7
-rw-r--r--config/armv7hl/vanilla10
-rw-r--r--config/i386/vanilla2
-rw-r--r--config/ppc64/vanilla2
-rw-r--r--config/ppc64le/vanilla2
-rw-r--r--config/x86_64/vanilla2
-rw-r--r--rpm/config.sh2
7 files changed, 14 insertions, 13 deletions
diff --git a/config/arm64/vanilla b/config/arm64/vanilla
index ec5c6176e2..47fe215c5a 100644
--- a/config/arm64/vanilla
+++ b/config/arm64/vanilla
@@ -285,6 +285,7 @@ CONFIG_ARCH_ZYNQMP=y
#
# ARM errata workarounds via the alternatives framework
#
+CONFIG_ARM64_WORKAROUND_CLEAN_CACHE=y
CONFIG_ARM64_ERRATUM_826319=y
CONFIG_ARM64_ERRATUM_827319=y
CONFIG_ARM64_ERRATUM_824069=y
@@ -8719,6 +8720,7 @@ CONFIG_ARM_DSU_PMU=m
CONFIG_HISI_PMU=y
CONFIG_QCOM_L2_PMU=y
CONFIG_QCOM_L3_PMU=y
+CONFIG_THUNDERX2_PMU=m
CONFIG_XGENE_PMU=y
CONFIG_ARM_SPE_PMU=m
CONFIG_RAS=y
@@ -8801,8 +8803,7 @@ CONFIG_SLIM_QCOM_CTRL=m
CONFIG_SLIM_QCOM_NGD_CTRL=m
CONFIG_INTERCONNECT=m
CONFIG_INTERCONNECT_QCOM=y
-CONFIG_INTERCONNECT_QCOM_SMD_RPM=m
-CONFIG_INTERCONNECT_QCOM_MSM8916=m
+CONFIG_INTERCONNECT_QCOM_SDM845=m
#
# File systems
@@ -9569,7 +9570,7 @@ CONFIG_FONT_8x8=y
CONFIG_FONT_8x16=y
CONFIG_SG_SPLIT=y
CONFIG_SG_POOL=y
-CONFIG_ARCH_HAS_SG_CHAIN=y
+# CONFIG_ARCH_NO_SG_CHAIN is not set
CONFIG_ARCH_HAS_PMEM_API=y
CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE=y
CONFIG_SBITMAP=y
diff --git a/config/armv7hl/vanilla b/config/armv7hl/vanilla
index 7de330cefc..3b247620c7 100644
--- a/config/armv7hl/vanilla
+++ b/config/armv7hl/vanilla
@@ -388,6 +388,7 @@ CONFIG_SOC_LS1021A=y
#
CONFIG_SOC_IMX7D_CA7=y
CONFIG_SOC_IMX7D=y
+CONFIG_SOC_IMX7ULP=y
CONFIG_SOC_VF610=y
CONFIG_VF_USE_ARM_GLOBAL_TIMER=y
# CONFIG_VF_USE_PIT_TIMER is not set
@@ -4410,6 +4411,7 @@ CONFIG_PINCTRL_IMX6SLL=y
CONFIG_PINCTRL_IMX6SX=y
CONFIG_PINCTRL_IMX6UL=y
CONFIG_PINCTRL_IMX7D=y
+CONFIG_PINCTRL_IMX7ULP=y
CONFIG_PINCTRL_VF610=y
CONFIG_PINCTRL_MVEBU=y
CONFIG_PINCTRL_DOVE=y
@@ -8254,6 +8256,7 @@ CONFIG_MTK_TIMER=y
CONFIG_CLKSRC_QCOM=y
CONFIG_CLKSRC_VERSATILE=y
CONFIG_CLKSRC_IMX_GPT=y
+CONFIG_CLKSRC_IMX_TPM=y
CONFIG_CLKSRC_ST_LPC=y
CONFIG_MAILBOX=y
CONFIG_ARM_MHU=m
@@ -8368,7 +8371,7 @@ CONFIG_FSL_GUTS=y
#
# i.MX SoC drivers
#
-CONFIG_IMX7_PM_DOMAINS=y
+CONFIG_IMX_GPCV2_PM_DOMAINS=y
#
# MediaTek SoC drivers
@@ -9183,8 +9186,6 @@ CONFIG_SLIM_QCOM_CTRL=m
CONFIG_SLIM_QCOM_NGD_CTRL=m
CONFIG_INTERCONNECT=m
CONFIG_INTERCONNECT_QCOM=y
-CONFIG_INTERCONNECT_QCOM_SMD_RPM=m
-CONFIG_INTERCONNECT_QCOM_MSM8916=m
#
# File systems
@@ -9933,7 +9934,7 @@ CONFIG_FONT_8x16=y
# CONFIG_FONT_SUN12x22 is not set
CONFIG_SG_SPLIT=y
CONFIG_SG_POOL=y
-CONFIG_ARCH_HAS_SG_CHAIN=y
+# CONFIG_ARCH_NO_SG_CHAIN is not set
CONFIG_SBITMAP=y
CONFIG_PARMAN=m
# CONFIG_STRING_SELFTEST is not set
@@ -10189,7 +10190,6 @@ CONFIG_UNWINDER_ARM=y
CONFIG_ARM_UNWIND=y
CONFIG_DEBUG_USER=y
# CONFIG_DEBUG_LL is not set
-CONFIG_DEBUG_IMX_UART_PORT=1
CONFIG_DEBUG_VF_UART_PORT=1
CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S"
# CONFIG_DEBUG_UART_8250 is not set
diff --git a/config/i386/vanilla b/config/i386/vanilla
index d5cc0fe0b5..d595e1998f 100644
--- a/config/i386/vanilla
+++ b/config/i386/vanilla
@@ -8676,7 +8676,7 @@ CONFIG_FONT_8x8=y
CONFIG_FONT_8x16=y
# CONFIG_SG_SPLIT is not set
CONFIG_SG_POOL=y
-CONFIG_ARCH_HAS_SG_CHAIN=y
+# CONFIG_ARCH_NO_SG_CHAIN is not set
CONFIG_SBITMAP=y
CONFIG_PARMAN=m
# CONFIG_STRING_SELFTEST is not set
diff --git a/config/ppc64/vanilla b/config/ppc64/vanilla
index d610edc764..daa3c15de6 100644
--- a/config/ppc64/vanilla
+++ b/config/ppc64/vanilla
@@ -7115,7 +7115,7 @@ CONFIG_FONT_8x8=y
CONFIG_FONT_8x16=y
# CONFIG_SG_SPLIT is not set
CONFIG_SG_POOL=y
-CONFIG_ARCH_HAS_SG_CHAIN=y
+# CONFIG_ARCH_NO_SG_CHAIN is not set
CONFIG_ARCH_HAS_PMEM_API=y
CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE=y
CONFIG_SBITMAP=y
diff --git a/config/ppc64le/vanilla b/config/ppc64le/vanilla
index d6ffe46da7..232a1c4091 100644
--- a/config/ppc64le/vanilla
+++ b/config/ppc64le/vanilla
@@ -6966,7 +6966,7 @@ CONFIG_FONT_8x8=y
CONFIG_FONT_8x16=y
# CONFIG_SG_SPLIT is not set
CONFIG_SG_POOL=y
-CONFIG_ARCH_HAS_SG_CHAIN=y
+# CONFIG_ARCH_NO_SG_CHAIN is not set
CONFIG_ARCH_HAS_PMEM_API=y
CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE=y
CONFIG_SBITMAP=y
diff --git a/config/x86_64/vanilla b/config/x86_64/vanilla
index c5aa4011b4..2c1bc475bf 100644
--- a/config/x86_64/vanilla
+++ b/config/x86_64/vanilla
@@ -8724,7 +8724,7 @@ CONFIG_FONT_8x8=y
CONFIG_FONT_8x16=y
# CONFIG_SG_SPLIT is not set
CONFIG_SG_POOL=y
-CONFIG_ARCH_HAS_SG_CHAIN=y
+# CONFIG_ARCH_NO_SG_CHAIN is not set
CONFIG_ARCH_HAS_PMEM_API=y
CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE=y
CONFIG_ARCH_HAS_UACCESS_MCSAFE=y
diff --git a/rpm/config.sh b/rpm/config.sh
index b86f3aea61..07fec94a2c 100644
--- a/rpm/config.sh
+++ b/rpm/config.sh
@@ -1,5 +1,5 @@
# The version of the main tarball to use
-SRCVERSION=4.20-rc5-next-20181206
+SRCVERSION=4.20-rc5-next-20181207
# 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