Home Home > GIT Browse > vanilla
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKernel Build Daemon <kbuild@suse.de>2019-01-01 12:02:36 +0100
committerKernel Build Daemon <kbuild@suse.de>2019-01-01 12:02:36 +0100
commitf9f5815cba9e92da25b6294be74cbd4a6738f51e (patch)
tree9fb8914f55bab1c4badfb51693ee1dfc9cf3f80f
parent369e205b8839d74071bfcb2fdd3f731ce2d3dfdf (diff)
Automatically updated to 4.20-10214-ge1ef035d272e
-rw-r--r--config/arm64/vanilla3
-rw-r--r--config/armv7hl/vanilla10
-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, 3 deletions
diff --git a/config/arm64/vanilla b/config/arm64/vanilla
index 3676c4ef01..eee5acff20 100644
--- a/config/arm64/vanilla
+++ b/config/arm64/vanilla
@@ -8137,6 +8137,7 @@ CONFIG_OWL_PM_DOMAINS=y
# Amlogic SoC drivers
#
CONFIG_MESON_CANVAS=m
+CONFIG_MESON_CLK_MEASURE=y
CONFIG_MESON_GX_SOCINFO=y
CONFIG_MESON_GX_PM_DOMAINS=y
# CONFIG_MESON_MX_SOCINFO is not set
@@ -8165,6 +8166,7 @@ CONFIG_FSL_MC_DPIO=m
#
# MediaTek SoC drivers
#
+CONFIG_MTK_CMDQ=m
CONFIG_MTK_INFRACFG=y
CONFIG_MTK_PMIC_WRAP=m
CONFIG_MTK_SCPSYS=y
@@ -9867,6 +9869,7 @@ CONFIG_BLK_DEV_IO_TRACE=y
CONFIG_KPROBE_EVENTS=y
CONFIG_UPROBE_EVENTS=y
CONFIG_BPF_EVENTS=y
+CONFIG_DYNAMIC_EVENTS=y
CONFIG_PROBE_EVENTS=y
CONFIG_DYNAMIC_FTRACE=y
CONFIG_FUNCTION_PROFILER=y
diff --git a/config/armv7hl/vanilla b/config/armv7hl/vanilla
index b227663ce2..99f84ba06b 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
@@ -8271,6 +8273,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
@@ -8365,6 +8368,7 @@ CONFIG_OWL_PM_DOMAINS=y
# Amlogic SoC drivers
#
CONFIG_MESON_CANVAS=m
+CONFIG_MESON_CLK_MEASURE=y
# CONFIG_MESON_GX_SOCINFO is not set
# CONFIG_MESON_GX_PM_DOMAINS is not set
CONFIG_MESON_MX_SOCINFO=y
@@ -8384,11 +8388,12 @@ CONFIG_FSL_GUTS=y
#
# i.MX SoC drivers
#
-CONFIG_IMX7_PM_DOMAINS=y
+CONFIG_IMX_GPCV2_PM_DOMAINS=y
#
# MediaTek SoC drivers
#
+CONFIG_MTK_CMDQ=m
CONFIG_MTK_INFRACFG=y
CONFIG_MTK_PMIC_WRAP=m
CONFIG_MTK_SCPSYS=y
@@ -8489,6 +8494,7 @@ CONFIG_MTK_SMI=y
CONFIG_SAMSUNG_MC=y
CONFIG_EXYNOS_SROM=y
CONFIG_TEGRA_MC=y
+CONFIG_TEGRA20_EMC=y
CONFIG_TEGRA124_EMC=y
CONFIG_IIO=m
CONFIG_IIO_BUFFER=y
@@ -10128,6 +10134,7 @@ CONFIG_BLK_DEV_IO_TRACE=y
CONFIG_KPROBE_EVENTS=y
CONFIG_UPROBE_EVENTS=y
CONFIG_BPF_EVENTS=y
+CONFIG_DYNAMIC_EVENTS=y
CONFIG_PROBE_EVENTS=y
CONFIG_DYNAMIC_FTRACE=y
CONFIG_DYNAMIC_FTRACE_WITH_REGS=y
@@ -10199,7 +10206,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 08abd96da5..71f65e831c 100644
--- a/config/i386/vanilla
+++ b/config/i386/vanilla
@@ -8899,6 +8899,7 @@ CONFIG_KPROBE_EVENTS=y
# CONFIG_KPROBE_EVENTS_ON_NOTRACE is not set
CONFIG_UPROBE_EVENTS=y
CONFIG_BPF_EVENTS=y
+CONFIG_DYNAMIC_EVENTS=y
CONFIG_PROBE_EVENTS=y
CONFIG_DYNAMIC_FTRACE=y
CONFIG_DYNAMIC_FTRACE_WITH_REGS=y
diff --git a/config/ppc64/vanilla b/config/ppc64/vanilla
index f18e091705..a79b6c70b9 100644
--- a/config/ppc64/vanilla
+++ b/config/ppc64/vanilla
@@ -7283,6 +7283,7 @@ CONFIG_BLK_DEV_IO_TRACE=y
CONFIG_KPROBE_EVENTS=y
CONFIG_UPROBE_EVENTS=y
CONFIG_BPF_EVENTS=y
+CONFIG_DYNAMIC_EVENTS=y
CONFIG_PROBE_EVENTS=y
CONFIG_DYNAMIC_FTRACE=y
CONFIG_FUNCTION_PROFILER=y
diff --git a/config/ppc64le/vanilla b/config/ppc64le/vanilla
index 7a8a70ba5c..a59e162551 100644
--- a/config/ppc64le/vanilla
+++ b/config/ppc64le/vanilla
@@ -7137,6 +7137,7 @@ CONFIG_KPROBE_EVENTS=y
# CONFIG_KPROBE_EVENTS_ON_NOTRACE is not set
CONFIG_UPROBE_EVENTS=y
CONFIG_BPF_EVENTS=y
+CONFIG_DYNAMIC_EVENTS=y
CONFIG_PROBE_EVENTS=y
CONFIG_DYNAMIC_FTRACE=y
CONFIG_DYNAMIC_FTRACE_WITH_REGS=y
diff --git a/config/x86_64/vanilla b/config/x86_64/vanilla
index 4afcd8ce69..25ed2a51d4 100644
--- a/config/x86_64/vanilla
+++ b/config/x86_64/vanilla
@@ -8956,6 +8956,7 @@ CONFIG_KPROBE_EVENTS=y
# CONFIG_KPROBE_EVENTS_ON_NOTRACE is not set
CONFIG_UPROBE_EVENTS=y
CONFIG_BPF_EVENTS=y
+CONFIG_DYNAMIC_EVENTS=y
CONFIG_PROBE_EVENTS=y
CONFIG_DYNAMIC_FTRACE=y
CONFIG_DYNAMIC_FTRACE_WITH_REGS=y
diff --git a/rpm/config.sh b/rpm/config.sh
index 48af887648..001fa44ba8 100644
--- a/rpm/config.sh
+++ b/rpm/config.sh
@@ -1,5 +1,5 @@
# The version of the main tarball to use
-SRCVERSION=4.20-9163-g195303136f19
+SRCVERSION=4.20-10214-ge1ef035d272e
# 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