Merge "Merge android-4.19.36 (10f41ccfc) into msm-4.19" (f18dbda7) · Commits · e / devices / android_kernel_xiaomi_nabu

MAINTAINERS

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -7328,6 +7328,12 @@ L: alsa-devel@alsa-project.org (moderated for non-subscribers)
	S: Supported		S: Supported
	F: sound/soc/intel/		F: sound/soc/intel/

			INTEL ATOMISP2 DUMMY / POWER-MANAGEMENT DRIVER
			M: Hans de Goede <hdegoede@redhat.com>
			L: platform-driver-x86@vger.kernel.org
			S: Maintained
			F: drivers/platform/x86/intel_atomisp2_pm.c

	INTEL C600 SERIES SAS CONTROLLER DRIVER		INTEL C600 SERIES SAS CONTROLLER DRIVER
	M: Intel SCU Linux support <intel-linux-scu@intel.com>		M: Intel SCU Linux support <intel-linux-scu@intel.com>
	M: Artur Paszkiewicz <artur.paszkiewicz@intel.com>		M: Artur Paszkiewicz <artur.paszkiewicz@intel.com>

+2 −2

Original line number	Original line	Diff line number	Diff line
	# SPDX-License-Identifier: GPL-2.0		# SPDX-License-Identifier: GPL-2.0
	VERSION = 4		VERSION = 4
	PATCHLEVEL = 19		PATCHLEVEL = 19
	SUBLEVEL = 34		SUBLEVEL = 36
	EXTRAVERSION =		EXTRAVERSION =
	NAME = "People's Front"		NAME = "People's Front"

	@@ -491,7 +491,7 @@ CLANG_FLAGS := --target=$(notdir $(CLANG_TRIPLE:%-=%))
	ifeq ($(shell $(srctree)/scripts/clang-android.sh $(CC) $(CLANG_FLAGS)), y)		ifeq ($(shell $(srctree)/scripts/clang-android.sh $(CC) $(CLANG_FLAGS)), y)
	$(error "Clang with Android --target detected. Did you specify CLANG_TRIPLE?")		$(error "Clang with Android --target detected. Did you specify CLANG_TRIPLE?")
	endif		endif
	GCC_TOOLCHAIN_DIR := $(dir $(shell which $(LD)))		GCC_TOOLCHAIN_DIR := $(dir $(shell which $(CROSS_COMPILE)elfedit))
	CLANG_FLAGS += --prefix=$(GCC_TOOLCHAIN_DIR)		CLANG_FLAGS += --prefix=$(GCC_TOOLCHAIN_DIR)
	GCC_TOOLCHAIN := $(realpath $(GCC_TOOLCHAIN_DIR)/..)		GCC_TOOLCHAIN := $(realpath $(GCC_TOOLCHAIN_DIR)/..)
	endif		endif

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -8,6 +8,7 @@ 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_BLK_DEV_RAM=y
	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

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -107,6 +107,7 @@ ENTRY(stext)
	; r2 = pointer to uboot provided cmdline or external DTB in mem		; r2 = pointer to uboot provided cmdline or external DTB in mem
	; These are handled later in handle_uboot_args()		; These are handled later in handle_uboot_args()
	st r0, [@uboot_tag]		st r0, [@uboot_tag]
			st r1, [@uboot_magic]
	st r2, [@uboot_arg]		st r2, [@uboot_arg]
	#endif		#endif

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -35,6 +35,7 @@ unsigned int intr_to_DE_cnt;

	/* Part of U-boot ABI: see head.S */		/* Part of U-boot ABI: see head.S */
	int __initdata uboot_tag;		int __initdata uboot_tag;
			int __initdata uboot_magic;
	char __initdata *uboot_arg;		char __initdata *uboot_arg;

	const struct machine_desc *machine_desc;		const struct machine_desc *machine_desc;
	@@ -484,6 +485,8 @@ static inline bool uboot_arg_invalid(unsigned long addr)
	#define UBOOT_TAG_NONE 0		#define UBOOT_TAG_NONE 0
	#define UBOOT_TAG_CMDLINE 1		#define UBOOT_TAG_CMDLINE 1
	#define UBOOT_TAG_DTB 2		#define UBOOT_TAG_DTB 2
			/* We always pass 0 as magic from U-boot */
			#define UBOOT_MAGIC_VALUE 0

	void __init handle_uboot_args(void)		void __init handle_uboot_args(void)
	{		{
	@@ -499,6 +502,11 @@ void __init handle_uboot_args(void)
	goto ignore_uboot_args;		goto ignore_uboot_args;
	}		}

			if (uboot_magic != UBOOT_MAGIC_VALUE) {
			pr_warn(IGNORE_ARGS "non zero uboot magic\n");
			goto ignore_uboot_args;
			}

	if (uboot_tag != UBOOT_TAG_NONE &&		if (uboot_tag != UBOOT_TAG_NONE &&
	uboot_arg_invalid((unsigned long)uboot_arg)) {		uboot_arg_invalid((unsigned long)uboot_arg)) {
	pr_warn(IGNORE_ARGS "invalid uboot arg: '%px'\n", uboot_arg);		pr_warn(IGNORE_ARGS "invalid uboot arg: '%px'\n", uboot_arg);