Home Home > GIT Browse > linux-next
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKernel Build Daemon <kbuild@suse.de>2019-03-21 12:03:09 +0100
committerKernel Build Daemon <kbuild@suse.de>2019-03-21 12:03:09 +0100
commit85f2fe18a8e1067c9e31cc29956982c67ce3deab (patch)
tree962c8775895c72bfc06024edf28df355e258d12e
parent6621d430f083dffb83ec636531760ca920487e21 (diff)
Automatically updated to 5.1-rc1-next-20190321
-rw-r--r--config/arm64/vanilla5
-rw-r--r--config/armv7hl/vanilla4
-rw-r--r--config/i386/vanilla7
-rw-r--r--config/ppc64/vanilla7
-rw-r--r--config/ppc64le/vanilla7
-rw-r--r--config/x86_64/vanilla7
-rw-r--r--rpm/config.sh2
7 files changed, 30 insertions, 9 deletions
diff --git a/config/arm64/vanilla b/config/arm64/vanilla
index 21d55ca1ff..c7e9b38310 100644
--- a/config/arm64/vanilla
+++ b/config/arm64/vanilla
@@ -5703,6 +5703,10 @@ CONFIG_VIDEO_OV7670=m
CONFIG_VIDEO_MT9V011=m
#
+# Lens drivers
+#
+
+#
# Flash devices
#
@@ -8915,6 +8919,7 @@ CONFIG_DEV_DAX=m
CONFIG_DEV_DAX_KMEM=m
CONFIG_NVMEM=y
CONFIG_NVMEM_IMX_IIM=m
+CONFIG_NVMEM_IMX_OCOTP=m
CONFIG_MTK_EFUSE=m
CONFIG_QCOM_QFPROM=m
CONFIG_ROCKCHIP_EFUSE=m
diff --git a/config/armv7hl/vanilla b/config/armv7hl/vanilla
index 0ae6727b27..da1e2b210b 100644
--- a/config/armv7hl/vanilla
+++ b/config/armv7hl/vanilla
@@ -5797,6 +5797,10 @@ CONFIG_VIDEO_OV2640=m
CONFIG_VIDEO_MT9V011=m
#
+# Lens drivers
+#
+
+#
# Flash devices
#
diff --git a/config/i386/vanilla b/config/i386/vanilla
index fd335c8d30..fc768d19e1 100644
--- a/config/i386/vanilla
+++ b/config/i386/vanilla
@@ -231,8 +231,6 @@ CONFIG_SHUFFLE_PAGE_ALLOCATOR=y
CONFIG_SYSTEM_DATA_VERIFICATION=y
CONFIG_PROFILING=y
CONFIG_TRACEPOINTS=y
-CONFIG_GENERIC_CMDLINE=y
-# CONFIG_CMDLINE_BOOL is not set
# CONFIG_64BIT is not set
CONFIG_X86_32=y
CONFIG_X86=y
@@ -458,6 +456,7 @@ CONFIG_HOTPLUG_CPU=y
# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set
# CONFIG_DEBUG_HOTPLUG_CPU0 is not set
# CONFIG_COMPAT_VDSO is not set
+# CONFIG_CMDLINE_BOOL is not set
CONFIG_MODIFY_LDT_SYSCALL=y
CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
CONFIG_USE_PERCPU_NUMA_NODE_ID=y
@@ -5376,6 +5375,10 @@ CONFIG_VIDEO_OV7670=m
CONFIG_VIDEO_MT9V011=m
#
+# Lens drivers
+#
+
+#
# Flash devices
#
diff --git a/config/ppc64/vanilla b/config/ppc64/vanilla
index 933df52941..5273def95b 100644
--- a/config/ppc64/vanilla
+++ b/config/ppc64/vanilla
@@ -216,8 +216,6 @@ CONFIG_SHUFFLE_PAGE_ALLOCATOR=y
CONFIG_SYSTEM_DATA_VERIFICATION=y
CONFIG_PROFILING=y
CONFIG_TRACEPOINTS=y
-CONFIG_GENERIC_CMDLINE=y
-# CONFIG_CMDLINE_BOOL is not set
CONFIG_PPC64=y
#
@@ -482,6 +480,7 @@ CONFIG_PPC_SUBPAGE_PROT=y
CONFIG_PPC_COPRO_BASE=y
CONFIG_SCHED_SMT=y
CONFIG_PPC_DENORMALISATION=y
+# CONFIG_CMDLINE_BOOL is not set
CONFIG_EXTRA_TARGETS=""
CONFIG_ARCH_WANTS_FREEZER_CONTROL=y
CONFIG_SUSPEND=y
@@ -4773,6 +4772,10 @@ CONFIG_VIDEO_OV7670=m
CONFIG_VIDEO_MT9V011=m
#
+# Lens drivers
+#
+
+#
# Flash devices
#
diff --git a/config/ppc64le/vanilla b/config/ppc64le/vanilla
index b5d7557df6..568f4bcdb4 100644
--- a/config/ppc64le/vanilla
+++ b/config/ppc64le/vanilla
@@ -215,8 +215,6 @@ CONFIG_SHUFFLE_PAGE_ALLOCATOR=y
CONFIG_SYSTEM_DATA_VERIFICATION=y
CONFIG_PROFILING=y
CONFIG_TRACEPOINTS=y
-CONFIG_GENERIC_CMDLINE=y
-# CONFIG_CMDLINE_BOOL is not set
CONFIG_PPC64=y
#
@@ -422,6 +420,7 @@ CONFIG_PPC_SUBPAGE_PROT=y
CONFIG_PPC_COPRO_BASE=y
CONFIG_SCHED_SMT=y
CONFIG_PPC_DENORMALISATION=y
+# CONFIG_CMDLINE_BOOL is not set
CONFIG_EXTRA_TARGETS=""
CONFIG_SUSPEND=y
CONFIG_SUSPEND_FREEZER=y
@@ -4644,6 +4643,10 @@ CONFIG_VIDEO_OV7670=m
CONFIG_VIDEO_MT9V011=m
#
+# Lens drivers
+#
+
+#
# Flash devices
#
diff --git a/config/x86_64/vanilla b/config/x86_64/vanilla
index 3df5846857..c7bb57db8b 100644
--- a/config/x86_64/vanilla
+++ b/config/x86_64/vanilla
@@ -237,8 +237,6 @@ CONFIG_SHUFFLE_PAGE_ALLOCATOR=y
CONFIG_SYSTEM_DATA_VERIFICATION=y
CONFIG_PROFILING=y
CONFIG_TRACEPOINTS=y
-CONFIG_GENERIC_CMDLINE=y
-# CONFIG_CMDLINE_BOOL is not set
CONFIG_64BIT=y
CONFIG_X86_64=y
CONFIG_X86=y
@@ -450,6 +448,7 @@ CONFIG_HOTPLUG_CPU=y
# CONFIG_COMPAT_VDSO is not set
CONFIG_LEGACY_VSYSCALL_EMULATE=y
# CONFIG_LEGACY_VSYSCALL_NONE is not set
+# CONFIG_CMDLINE_BOOL is not set
CONFIG_MODIFY_LDT_SYSCALL=y
CONFIG_HAVE_LIVEPATCH=y
CONFIG_LIVEPATCH=y
@@ -5376,6 +5375,10 @@ CONFIG_VIDEO_OV7670=m
CONFIG_VIDEO_MT9V011=m
#
+# Lens drivers
+#
+
+#
# Flash devices
#
diff --git a/rpm/config.sh b/rpm/config.sh
index 068afe7297..c7c8c9428a 100644
--- a/rpm/config.sh
+++ b/rpm/config.sh
@@ -1,5 +1,5 @@
# The version of the main tarball to use
-SRCVERSION=5.1-rc1-next-20190320
+SRCVERSION=5.1-rc1-next-20190321
# 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