Home Home > GIT Browse > vanilla
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKernel Build Daemon <kbuild@suse.de>2019-05-17 12:03:10 +0200
committerKernel Build Daemon <kbuild@suse.de>2019-05-17 12:03:10 +0200
commit0c5a5639d568fb0c6c8a40376a6d7efcbad0fecd (patch)
tree3e90f86071f1043c9cefd37e9f5bcb117cc6e50d
parentd41b1de566106248f0e2dc6caf1ca770e31ab028 (diff)
Automatically updated to 5.1-12317-ga6a4b66bd8f4
-rw-r--r--config/arm64/vanilla16
-rw-r--r--config/armv7hl/vanilla23
-rw-r--r--config/i386/vanilla14
-rw-r--r--config/ppc64/vanilla14
-rw-r--r--config/ppc64le/vanilla14
-rw-r--r--config/x86_64/vanilla14
-rw-r--r--rpm/config.sh2
7 files changed, 80 insertions, 17 deletions
diff --git a/config/arm64/vanilla b/config/arm64/vanilla
index 6e0f90e58a..041fd2b23f 100644
--- a/config/arm64/vanilla
+++ b/config/arm64/vanilla
@@ -251,6 +251,7 @@ CONFIG_ARCH_PROC_KCORE_TEXT=y
# Platform selection
#
CONFIG_ARCH_ACTIONS=y
+CONFIG_ARCH_AGILEX=y
CONFIG_ARCH_SUNXI=y
CONFIG_ARCH_ALPINE=y
CONFIG_ARCH_BCM2835=y
@@ -718,7 +719,7 @@ CONFIG_ARCH_MMAP_RND_COMPAT_BITS=11
CONFIG_CLONE_BACKWARDS=y
CONFIG_OLD_SIGSUSPEND3=y
CONFIG_COMPAT_OLD_SIGACTION=y
-# CONFIG_64BIT_TIME is not set
+CONFIG_64BIT_TIME=y
CONFIG_COMPAT_32BIT_TIME=y
# CONFIG_CPU_NO_EFFICIENT_FFS is not set
CONFIG_HAVE_ARCH_VMAP_STACK=y
@@ -2717,6 +2718,7 @@ CONFIG_DM_MULTIPATH=m
CONFIG_DM_MULTIPATH_QL=m
CONFIG_DM_MULTIPATH_ST=m
CONFIG_DM_DELAY=m
+CONFIG_DM_DUST=m
CONFIG_DM_UEVENT=y
CONFIG_DM_FLAKEY=m
CONFIG_DM_VERITY=m
@@ -5030,6 +5032,7 @@ CONFIG_CPU_THERMAL=y
CONFIG_CLOCK_THERMAL=y
CONFIG_DEVFREQ_THERMAL=y
# CONFIG_THERMAL_EMULATION is not set
+CONFIG_THERMAL_MMIO=m
CONFIG_HISI_THERMAL=m
CONFIG_IMX_THERMAL=m
CONFIG_MAX77620_THERMAL=m
@@ -8395,6 +8398,10 @@ CONFIG_MESON_GX_PM_DOMAINS=y
# CONFIG_MESON_MX_SOCINFO is not set
#
+# Aspeed SoC drivers
+#
+
+#
# Broadcom SoC drivers
#
CONFIG_BCM2835_POWER=y
@@ -8418,6 +8425,12 @@ CONFIG_FSL_MC_DPIO=m
CONFIG_IMX_GPCV2_PM_DOMAINS=y
#
+# IXP4xx SoC drivers
+#
+CONFIG_IXP4XX_QMGR=m
+CONFIG_IXP4XX_NPE=m
+
+#
# MediaTek SoC drivers
#
CONFIG_MTK_CMDQ=m
@@ -9196,6 +9209,7 @@ CONFIG_FPGA_DFL_FME_BRIDGE=m
CONFIG_FPGA_DFL_FME_REGION=m
CONFIG_FPGA_DFL_AFU=m
CONFIG_FPGA_DFL_PCI=m
+CONFIG_FPGA_MGR_ZYNQMP_FPGA=m
# CONFIG_FSI is not set
CONFIG_TEE=m
diff --git a/config/armv7hl/vanilla b/config/armv7hl/vanilla
index 1748192aaf..99f90fecbc 100644
--- a/config/armv7hl/vanilla
+++ b/config/armv7hl/vanilla
@@ -335,7 +335,6 @@ CONFIG_SOC_EXYNOS5260=y
CONFIG_SOC_EXYNOS5410=y
CONFIG_SOC_EXYNOS5420=y
CONFIG_SOC_EXYNOS5800=y
-# CONFIG_EXYNOS5420_MCPM is not set
CONFIG_EXYNOS_CPU_SUSPEND=y
CONFIG_PLAT_SAMSUNG=y
@@ -524,13 +523,6 @@ CONFIG_ARCH_WM8850=y
CONFIG_ARCH_ZYNQ=y
CONFIG_PLAT_ORION=y
CONFIG_PLAT_VERSATILE=y
-CONFIG_ARCH_SUPPORTS_FIRMWARE=y
-CONFIG_ARCH_SUPPORTS_TRUSTED_FOUNDATIONS=y
-
-#
-# Firmware options
-#
-# CONFIG_TRUSTED_FOUNDATIONS is not set
#
# Processor Type
@@ -817,6 +809,7 @@ CONFIG_QCOM_SCM=y
CONFIG_QCOM_SCM_32=y
# CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set
CONFIG_TI_SCI_PROTOCOL=m
+# CONFIG_TRUSTED_FOUNDATIONS is not set
CONFIG_HAVE_ARM_SMCCC=y
CONFIG_ARM_PSCI_FW=y
# CONFIG_ARM_PSCI_CHECKER is not set
@@ -905,7 +898,7 @@ CONFIG_ARCH_MMAP_RND_BITS=8
CONFIG_CLONE_BACKWARDS=y
CONFIG_OLD_SIGSUSPEND3=y
CONFIG_OLD_SIGACTION=y
-# CONFIG_64BIT_TIME is not set
+CONFIG_64BIT_TIME=y
CONFIG_COMPAT_32BIT_TIME=y
# CONFIG_CPU_NO_EFFICIENT_FFS is not set
# CONFIG_HAVE_ARCH_VMAP_STACK is not set
@@ -2771,6 +2764,7 @@ CONFIG_DM_MULTIPATH=m
CONFIG_DM_MULTIPATH_QL=m
CONFIG_DM_MULTIPATH_ST=m
CONFIG_DM_DELAY=m
+CONFIG_DM_DUST=m
CONFIG_DM_UEVENT=y
CONFIG_DM_FLAKEY=m
CONFIG_DM_VERITY=m
@@ -4973,6 +4967,7 @@ CONFIG_CPU_THERMAL=y
CONFIG_CLOCK_THERMAL=y
CONFIG_DEVFREQ_THERMAL=y
# CONFIG_THERMAL_EMULATION is not set
+CONFIG_THERMAL_MMIO=m
# CONFIG_HISI_THERMAL is not set
CONFIG_IMX_THERMAL=m
CONFIG_QORIQ_THERMAL=m
@@ -8520,6 +8515,10 @@ CONFIG_MESON_CLK_MEASURE=y
CONFIG_MESON_MX_SOCINFO=y
#
+# Aspeed SoC drivers
+#
+
+#
# Broadcom SoC drivers
#
CONFIG_BCM2835_POWER=y
@@ -8538,6 +8537,12 @@ CONFIG_FSL_GUTS=y
CONFIG_IMX_GPCV2_PM_DOMAINS=y
#
+# IXP4xx SoC drivers
+#
+CONFIG_IXP4XX_QMGR=m
+CONFIG_IXP4XX_NPE=m
+
+#
# MediaTek SoC drivers
#
CONFIG_MTK_CMDQ=m
diff --git a/config/i386/vanilla b/config/i386/vanilla
index 051b435b82..d736a45259 100644
--- a/config/i386/vanilla
+++ b/config/i386/vanilla
@@ -247,7 +247,6 @@ CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=8
CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=16
CONFIG_GENERIC_ISA_DMA=y
CONFIG_GENERIC_BUG=y
-CONFIG_GENERIC_HWEIGHT=y
CONFIG_ARCH_MAY_HAVE_PC_FDC=y
CONFIG_GENERIC_CALIBRATE_DELAY=y
CONFIG_ARCH_HAS_CPU_RELAX=y
@@ -784,7 +783,7 @@ CONFIG_ISA_BUS_API=y
CONFIG_CLONE_BACKWARDS=y
CONFIG_OLD_SIGSUSPEND3=y
CONFIG_OLD_SIGACTION=y
-# CONFIG_64BIT_TIME is not set
+CONFIG_64BIT_TIME=y
CONFIG_COMPAT_32BIT_TIME=y
# CONFIG_CPU_NO_EFFICIENT_FFS is not set
# CONFIG_HAVE_ARCH_VMAP_STACK is not set
@@ -2702,6 +2701,7 @@ CONFIG_DM_MULTIPATH=m
CONFIG_DM_MULTIPATH_QL=m
CONFIG_DM_MULTIPATH_ST=m
CONFIG_DM_DELAY=m
+CONFIG_DM_DUST=m
CONFIG_DM_UEVENT=y
CONFIG_DM_FLAKEY=m
CONFIG_DM_VERITY=m
@@ -7542,6 +7542,10 @@ CONFIG_SOUNDWIRE_INTEL=m
#
#
+# Aspeed SoC drivers
+#
+
+#
# Broadcom SoC drivers
#
@@ -7554,6 +7558,12 @@ CONFIG_SOUNDWIRE_INTEL=m
#
#
+# IXP4xx SoC drivers
+#
+CONFIG_IXP4XX_QMGR=m
+CONFIG_IXP4XX_NPE=m
+
+#
# Qualcomm SoC drivers
#
# CONFIG_SUNXI_SRAM is not set
diff --git a/config/ppc64/vanilla b/config/ppc64/vanilla
index 191a66ee87..44e1d0e0db 100644
--- a/config/ppc64/vanilla
+++ b/config/ppc64/vanilla
@@ -617,7 +617,7 @@ CONFIG_HAVE_ARCH_NVRAM_OPS=y
CONFIG_CLONE_BACKWARDS=y
CONFIG_OLD_SIGSUSPEND=y
CONFIG_COMPAT_OLD_SIGACTION=y
-# CONFIG_64BIT_TIME is not set
+CONFIG_64BIT_TIME=y
CONFIG_COMPAT_32BIT_TIME=y
# CONFIG_CPU_NO_EFFICIENT_FFS is not set
# CONFIG_HAVE_ARCH_VMAP_STACK is not set
@@ -2374,6 +2374,7 @@ CONFIG_DM_MULTIPATH=m
CONFIG_DM_MULTIPATH_QL=m
CONFIG_DM_MULTIPATH_ST=m
CONFIG_DM_DELAY=m
+CONFIG_DM_DUST=m
CONFIG_DM_UEVENT=y
CONFIG_DM_FLAKEY=m
CONFIG_DM_VERITY=m
@@ -4203,6 +4204,7 @@ CONFIG_THERMAL_GOV_USER_SPACE=y
CONFIG_CPU_THERMAL=y
CONFIG_DEVFREQ_THERMAL=y
# CONFIG_THERMAL_EMULATION is not set
+CONFIG_THERMAL_MMIO=m
# CONFIG_QORIQ_THERMAL is not set
# CONFIG_DA9062_THERMAL is not set
CONFIG_WATCHDOG=y
@@ -6344,6 +6346,10 @@ CONFIG_SOUNDWIRE=y
#
#
+# Aspeed SoC drivers
+#
+
+#
# Broadcom SoC drivers
#
@@ -6356,6 +6362,12 @@ CONFIG_SOUNDWIRE=y
#
#
+# IXP4xx SoC drivers
+#
+CONFIG_IXP4XX_QMGR=m
+CONFIG_IXP4XX_NPE=m
+
+#
# Qualcomm SoC drivers
#
# CONFIG_SUNXI_SRAM is not set
diff --git a/config/ppc64le/vanilla b/config/ppc64le/vanilla
index c3736aa0ee..6b7678e4de 100644
--- a/config/ppc64le/vanilla
+++ b/config/ppc64le/vanilla
@@ -559,7 +559,7 @@ CONFIG_HAVE_ARCH_NVRAM_OPS=y
CONFIG_CLONE_BACKWARDS=y
CONFIG_OLD_SIGSUSPEND=y
CONFIG_COMPAT_OLD_SIGACTION=y
-# CONFIG_64BIT_TIME is not set
+CONFIG_64BIT_TIME=y
CONFIG_COMPAT_32BIT_TIME=y
# CONFIG_CPU_NO_EFFICIENT_FFS is not set
# CONFIG_HAVE_ARCH_VMAP_STACK is not set
@@ -2276,6 +2276,7 @@ CONFIG_DM_MULTIPATH=m
CONFIG_DM_MULTIPATH_QL=m
CONFIG_DM_MULTIPATH_ST=m
CONFIG_DM_DELAY=m
+CONFIG_DM_DUST=m
CONFIG_DM_UEVENT=y
CONFIG_DM_FLAKEY=m
CONFIG_DM_VERITY=m
@@ -4074,6 +4075,7 @@ CONFIG_THERMAL_GOV_USER_SPACE=y
CONFIG_CPU_THERMAL=y
CONFIG_DEVFREQ_THERMAL=y
# CONFIG_THERMAL_EMULATION is not set
+CONFIG_THERMAL_MMIO=m
# CONFIG_QORIQ_THERMAL is not set
# CONFIG_DA9062_THERMAL is not set
CONFIG_WATCHDOG=y
@@ -6198,6 +6200,10 @@ CONFIG_SOUNDWIRE=y
#
#
+# Aspeed SoC drivers
+#
+
+#
# Broadcom SoC drivers
#
@@ -6210,6 +6216,12 @@ CONFIG_SOUNDWIRE=y
#
#
+# IXP4xx SoC drivers
+#
+CONFIG_IXP4XX_QMGR=m
+CONFIG_IXP4XX_NPE=m
+
+#
# Qualcomm SoC drivers
#
# CONFIG_SUNXI_SRAM is not set
diff --git a/config/x86_64/vanilla b/config/x86_64/vanilla
index 52422e6f0d..180cb35987 100644
--- a/config/x86_64/vanilla
+++ b/config/x86_64/vanilla
@@ -253,7 +253,6 @@ CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=16
CONFIG_GENERIC_ISA_DMA=y
CONFIG_GENERIC_BUG=y
CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
-CONFIG_GENERIC_HWEIGHT=y
CONFIG_ARCH_MAY_HAVE_PC_FDC=y
CONFIG_GENERIC_CALIBRATE_DELAY=y
CONFIG_ARCH_HAS_CPU_RELAX=y
@@ -777,7 +776,7 @@ CONFIG_HAVE_RELIABLE_STACKTRACE=y
CONFIG_ISA_BUS_API=y
CONFIG_OLD_SIGSUSPEND3=y
CONFIG_COMPAT_OLD_SIGACTION=y
-# CONFIG_64BIT_TIME is not set
+CONFIG_64BIT_TIME=y
CONFIG_COMPAT_32BIT_TIME=y
# CONFIG_CPU_NO_EFFICIENT_FFS is not set
CONFIG_HAVE_ARCH_VMAP_STACK=y
@@ -2716,6 +2715,7 @@ CONFIG_DM_MULTIPATH=m
CONFIG_DM_MULTIPATH_QL=m
CONFIG_DM_MULTIPATH_ST=m
CONFIG_DM_DELAY=m
+CONFIG_DM_DUST=m
CONFIG_DM_UEVENT=y
CONFIG_DM_FLAKEY=m
CONFIG_DM_VERITY=m
@@ -7560,6 +7560,10 @@ CONFIG_SOUNDWIRE_INTEL=m
#
#
+# Aspeed SoC drivers
+#
+
+#
# Broadcom SoC drivers
#
@@ -7572,6 +7576,12 @@ CONFIG_SOUNDWIRE_INTEL=m
#
#
+# IXP4xx SoC drivers
+#
+CONFIG_IXP4XX_QMGR=m
+CONFIG_IXP4XX_NPE=m
+
+#
# Qualcomm SoC drivers
#
# CONFIG_SUNXI_SRAM is not set
diff --git a/rpm/config.sh b/rpm/config.sh
index b24006ed5e..dc0f52a5e2 100644
--- a/rpm/config.sh
+++ b/rpm/config.sh
@@ -1,5 +1,5 @@
# The version of the main tarball to use
-SRCVERSION=5.1-11058-g83f3ef3de625
+SRCVERSION=5.1-12317-ga6a4b66bd8f4
# 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