Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

This project is archived. Its data is read-only.

Commit 6ed4c5de authored Oct 03, 2019 by Linux Build Service Account

Merge a8e92fae on remote branch

Change-Id: I96a4fbd1df63e22c3b6b2234039b0005f3712d4c

parents 09106cce a8e92fae

Makefile

+1 −1

Original line number	Diff line number	Diff line
		VERSION = 4
		PATCHLEVEL = 4
		SUBLEVEL = 192
		SUBLEVEL = 194
		EXTRAVERSION =
		NAME = Blurry Fish Butt

arch/arc/configs/axs101_defconfig

+0 −1

Original line number	Diff line number	Diff line
		@@ -11,7 +11,6 @@ CONFIG_NAMESPACES=y
		# CONFIG_UTS_NS is not set
		# CONFIG_PID_NS is not set
		CONFIG_BLK_DEV_INITRD=y
		CONFIG_INITRAMFS_SOURCE="../arc_initramfs/"
		CONFIG_EMBEDDED=y
		CONFIG_PERF_EVENTS=y
		# CONFIG_VM_EVENT_COUNTERS is not set

arch/arc/configs/axs103_defconfig

+0 −1

Original line number	Diff line number	Diff line
		@@ -11,7 +11,6 @@ CONFIG_NAMESPACES=y
		# CONFIG_UTS_NS is not set
		# CONFIG_PID_NS is not set
		CONFIG_BLK_DEV_INITRD=y
		CONFIG_INITRAMFS_SOURCE="../../arc_initramfs_hs/"
		CONFIG_EMBEDDED=y
		CONFIG_PERF_EVENTS=y
		# CONFIG_VM_EVENT_COUNTERS is not set

arch/arc/configs/axs103_smp_defconfig

+0 −1

Original line number	Diff line number	Diff line
		@@ -11,7 +11,6 @@ CONFIG_NAMESPACES=y
		# CONFIG_UTS_NS is not set
		# CONFIG_PID_NS is not set
		CONFIG_BLK_DEV_INITRD=y
		CONFIG_INITRAMFS_SOURCE="../../arc_initramfs_hs/"
		CONFIG_EMBEDDED=y
		CONFIG_PERF_EVENTS=y
		# CONFIG_VM_EVENT_COUNTERS is not set

arch/arc/configs/nsim_700_defconfig

+0 −1

Original line number	Diff line number	Diff line
		@@ -11,7 +11,6 @@ CONFIG_NAMESPACES=y
		# CONFIG_UTS_NS is not set
		# CONFIG_PID_NS is not set
		CONFIG_BLK_DEV_INITRD=y
		CONFIG_INITRAMFS_SOURCE="../arc_initramfs/"
		CONFIG_KALLSYMS_ALL=y
		CONFIG_EMBEDDED=y
		# CONFIG_SLUB_DEBUG is not set