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

Commit a212cf53 authored Oct 31, 2018 by Linux Build Service Account Committed by Gerrit - the friendly Code Review server Oct 31, 2018

Merge changes I1944666e,I30c789e0 into msm-4.9

* changes:
  Merge android-4.9.116 (52be3221) into msm-4.9
  Merge android-4.9.115 (e6f9a8a3) into msm-4.9

parents 90111ad9 e2290bdb

Makefile

+2 −1

Original line number	Original line	Diff line number	Diff line
	VERSION = 4		VERSION = 4
	PATCHLEVEL = 9		PATCHLEVEL = 9
	SUBLEVEL = 114		SUBLEVEL = 116
	EXTRAVERSION =		EXTRAVERSION =
	NAME = Roaring Lionus		NAME = Roaring Lionus

	@@ -654,6 +654,7 @@ KBUILD_CFLAGS += $(call cc-disable-warning,frame-address,)
	KBUILD_CFLAGS += $(call cc-disable-warning, format-truncation)		KBUILD_CFLAGS += $(call cc-disable-warning, format-truncation)
	KBUILD_CFLAGS += $(call cc-disable-warning, format-overflow)		KBUILD_CFLAGS += $(call cc-disable-warning, format-overflow)
	KBUILD_CFLAGS += $(call cc-disable-warning, int-in-bool-context)		KBUILD_CFLAGS += $(call cc-disable-warning, int-in-bool-context)
			KBUILD_CFLAGS += $(call cc-disable-warning, attribute-alias)

	ifdef CONFIG_LD_DEAD_CODE_DATA_ELIMINATION		ifdef CONFIG_LD_DEAD_CODE_DATA_ELIMINATION
	KBUILD_CFLAGS += $(call cc-option,-ffunction-sections,)		KBUILD_CFLAGS += $(call cc-option,-ffunction-sections,)

arch/arc/configs/axs101_defconfig

+0 −1

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

arch/arc/configs/axs103_defconfig

+0 −1

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

arch/arc/configs/axs103_smp_defconfig

+0 −1

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

arch/arc/configs/nsim_700_defconfig

+0 −1

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