Home Home > GIT Browse > linux-next
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKernel Build Daemon <kbuild@suse.de>2019-04-17 12:02:29 +0200
committerKernel Build Daemon <kbuild@suse.de>2019-04-17 12:02:29 +0200
commitb37bf81c2829a9215df6e72a4a1f339cde802e01 (patch)
tree24063c1fc14a1c8b347aa6b1df18ae40ee9b73b0
parent65627b521403adb3ad3835400a404aa07849a2a1 (diff)
Automatically updated to 5.1-rc5-next-20190417
-rw-r--r--config/arm64/vanilla11
-rw-r--r--config/armv7hl/vanilla7
-rw-r--r--config/i386/vanilla2
-rw-r--r--config/ppc64/vanilla2
-rw-r--r--config/ppc64le/vanilla2
-rw-r--r--config/x86_64/vanilla3
-rw-r--r--rpm/config.sh2
7 files changed, 21 insertions, 8 deletions
diff --git a/config/arm64/vanilla b/config/arm64/vanilla
index c1237d7e96..2240707064 100644
--- a/config/arm64/vanilla
+++ b/config/arm64/vanilla
@@ -512,8 +512,6 @@ CONFIG_QORIQ_CPUFREQ=m
#
# Firmware Drivers
#
-CONFIG_ARM_PSCI_FW=y
-# CONFIG_ARM_PSCI_CHECKER is not set
CONFIG_ARM_SCMI_PROTOCOL=y
CONFIG_ARM_SCMI_POWER_DOMAIN=m
CONFIG_ARM_SCPI_PROTOCOL=m
@@ -529,6 +527,8 @@ CONFIG_QCOM_SCM=y
CONFIG_QCOM_SCM_64=y
# CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set
CONFIG_HAVE_ARM_SMCCC=y
+CONFIG_ARM_PSCI_FW=y
+# CONFIG_ARM_PSCI_CHECKER is not set
# CONFIG_GOOGLE_FIRMWARE is not set
#
@@ -731,6 +731,7 @@ CONFIG_STRICT_MODULE_RWX=y
CONFIG_REFCOUNT_FULL=y
CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y
CONFIG_ARCH_USE_MEMREMAP_PROT=y
+CONFIG_LOCK_EVENT_COUNTS=y
#
# GCOV-based kernel profiling
@@ -931,6 +932,11 @@ CONFIG_ZSMALLOC=y
CONFIG_GENERIC_EARLY_IOREMAP=y
CONFIG_DEFERRED_STRUCT_PAGE_INIT=y
# CONFIG_IDLE_PAGE_TRACKING is not set
+CONFIG_ARCH_HAS_HMM=y
+CONFIG_MIGRATE_VMA_HELPER=y
+CONFIG_HMM=y
+CONFIG_HMM_MIRROR=y
+CONFIG_DEVICE_PRIVATE=y
CONFIG_FRAME_VECTOR=y
# CONFIG_PERCPU_STATS is not set
# CONFIG_GUP_BENCHMARK is not set
@@ -6008,6 +6014,7 @@ CONFIG_NOUVEAU_DEBUG=5
CONFIG_NOUVEAU_DEBUG_DEFAULT=3
# CONFIG_NOUVEAU_DEBUG_MMU is not set
CONFIG_DRM_NOUVEAU_BACKLIGHT=y
+CONFIG_DRM_NOUVEAU_SVM=y
# CONFIG_DRM_VGEM is not set
CONFIG_DRM_VKMS=m
# CONFIG_DRM_EXYNOS is not set
diff --git a/config/armv7hl/vanilla b/config/armv7hl/vanilla
index de2d6602a2..26f2edc448 100644
--- a/config/armv7hl/vanilla
+++ b/config/armv7hl/vanilla
@@ -799,8 +799,6 @@ CONFIG_ARCH_HIBERNATION_POSSIBLE=y
#
# Firmware Drivers
#
-CONFIG_ARM_PSCI_FW=y
-# CONFIG_ARM_PSCI_CHECKER is not set
CONFIG_ARM_SCMI_PROTOCOL=y
CONFIG_ARM_SCMI_POWER_DOMAIN=m
CONFIG_ARM_SCPI_PROTOCOL=m
@@ -813,6 +811,8 @@ CONFIG_QCOM_SCM_32=y
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
# CONFIG_BCM47XX_NVRAM is not set
# CONFIG_GOOGLE_FIRMWARE is not set
# CONFIG_IMX_SCU is not set
@@ -910,6 +910,7 @@ CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y
CONFIG_STRICT_MODULE_RWX=y
CONFIG_ARCH_HAS_PHYS_TO_DMA=y
CONFIG_REFCOUNT_FULL=y
+CONFIG_LOCK_EVENT_COUNTS=y
#
# GCOV-based kernel profiling
@@ -6579,8 +6580,8 @@ CONFIG_SND_SOC_FSL_UTILS=m
CONFIG_SND_SOC_IMX_PCM_DMA=m
CONFIG_SND_SOC_IMX_AUDMUX=m
CONFIG_SND_IMX_SOC=m
-CONFIG_SND_SOC_IMX_SSI=m
CONFIG_SND_SOC_IMX_PCM_FIQ=m
+CONFIG_SND_SOC_IMX_SSI=m
#
# SoC Audio support for Freescale i.MX boards:
diff --git a/config/i386/vanilla b/config/i386/vanilla
index 995fa9e408..505eccf92b 100644
--- a/config/i386/vanilla
+++ b/config/i386/vanilla
@@ -298,7 +298,6 @@ CONFIG_PARAVIRT=y
CONFIG_PARAVIRT_XXL=y
# CONFIG_PARAVIRT_DEBUG is not set
CONFIG_PARAVIRT_SPINLOCKS=y
-# CONFIG_QUEUED_LOCK_STAT is not set
CONFIG_XEN=y
CONFIG_XEN_PV=y
CONFIG_XEN_PV_SMP=y
@@ -800,6 +799,7 @@ CONFIG_ARCH_HAS_REFCOUNT=y
# CONFIG_REFCOUNT_FULL is not set
CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y
CONFIG_ARCH_USE_MEMREMAP_PROT=y
+CONFIG_LOCK_EVENT_COUNTS=y
#
# GCOV-based kernel profiling
diff --git a/config/ppc64/vanilla b/config/ppc64/vanilla
index e96eff347e..531538f495 100644
--- a/config/ppc64/vanilla
+++ b/config/ppc64/vanilla
@@ -619,6 +619,7 @@ CONFIG_COMPAT_32BIT_TIME=y
# CONFIG_ARCH_HAS_STRICT_MODULE_RWX is not set
CONFIG_ARCH_HAS_PHYS_TO_DMA=y
# CONFIG_REFCOUNT_FULL is not set
+CONFIG_LOCK_EVENT_COUNTS=y
#
# GCOV-based kernel profiling
@@ -777,6 +778,7 @@ CONFIG_DEFERRED_STRUCT_PAGE_INIT=y
CONFIG_ARCH_HAS_ZONE_DEVICE=y
CONFIG_ZONE_DEVICE=y
CONFIG_ARCH_HAS_HMM=y
+CONFIG_ARCH_HAS_HMM_DEVICE=y
CONFIG_MIGRATE_VMA_HELPER=y
CONFIG_DEV_PAGEMAP_OPS=y
CONFIG_HMM=y
diff --git a/config/ppc64le/vanilla b/config/ppc64le/vanilla
index afa438152b..5205ff2f24 100644
--- a/config/ppc64le/vanilla
+++ b/config/ppc64le/vanilla
@@ -562,6 +562,7 @@ CONFIG_STRICT_KERNEL_RWX=y
# CONFIG_ARCH_HAS_STRICT_MODULE_RWX is not set
CONFIG_ARCH_HAS_PHYS_TO_DMA=y
# CONFIG_REFCOUNT_FULL is not set
+CONFIG_LOCK_EVENT_COUNTS=y
#
# GCOV-based kernel profiling
@@ -719,6 +720,7 @@ CONFIG_DEFERRED_STRUCT_PAGE_INIT=y
CONFIG_ARCH_HAS_ZONE_DEVICE=y
CONFIG_ZONE_DEVICE=y
CONFIG_ARCH_HAS_HMM=y
+CONFIG_ARCH_HAS_HMM_DEVICE=y
CONFIG_MIGRATE_VMA_HELPER=y
CONFIG_DEV_PAGEMAP_OPS=y
CONFIG_HMM=y
diff --git a/config/x86_64/vanilla b/config/x86_64/vanilla
index 2bc306fa91..4f2ca0e462 100644
--- a/config/x86_64/vanilla
+++ b/config/x86_64/vanilla
@@ -306,7 +306,6 @@ CONFIG_PARAVIRT=y
CONFIG_PARAVIRT_XXL=y
# CONFIG_PARAVIRT_DEBUG is not set
CONFIG_PARAVIRT_SPINLOCKS=y
-# CONFIG_QUEUED_LOCK_STAT is not set
CONFIG_XEN=y
CONFIG_XEN_PV=y
CONFIG_XEN_PV_SMP=y
@@ -793,6 +792,7 @@ CONFIG_ARCH_HAS_REFCOUNT=y
# CONFIG_REFCOUNT_FULL is not set
CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y
CONFIG_ARCH_USE_MEMREMAP_PROT=y
+CONFIG_LOCK_EVENT_COUNTS=y
#
# GCOV-based kernel profiling
@@ -953,6 +953,7 @@ CONFIG_DEFERRED_STRUCT_PAGE_INIT=y
CONFIG_ARCH_HAS_ZONE_DEVICE=y
CONFIG_ZONE_DEVICE=y
CONFIG_ARCH_HAS_HMM=y
+CONFIG_ARCH_HAS_HMM_DEVICE=y
CONFIG_MIGRATE_VMA_HELPER=y
CONFIG_DEV_PAGEMAP_OPS=y
CONFIG_HMM=y
diff --git a/rpm/config.sh b/rpm/config.sh
index b3ec239856..46c87aa190 100644
--- a/rpm/config.sh
+++ b/rpm/config.sh
@@ -1,5 +1,5 @@
# The version of the main tarball to use
-SRCVERSION=5.1-rc5-next-20190416
+SRCVERSION=5.1-rc5-next-20190417
# 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