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

Commit 43e9f8f6 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge android-4.9.217(d2adefff) into msm-4.9"

parents 1e43388f e48fe8a1

Documentation/filesystems/porting

+7 −0
Original line number Diff line number Diff line
@@ -596,3 +596,10 @@ in your dentry operations instead. 
[mandatory]

	->rename() has an added flags argument.  Any flags not handled by the

        filesystem should result in EINVAL being returned.

--

[mandatory]



	[should've been added in 2016] stale comment in finish_open()

	nonwithstanding, failure exits in ->atomic_open() instances should

	*NOT* fput() the file, no matter what.  Everything is handled by the

	caller.

Documentation/kernel-parameters.txt

+4 −0
Original line number Diff line number Diff line
@@ -336,6 +336,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
			dynamic table installation which will install SSDT

			tables to /sys/firmware/acpi/tables/dynamic.



	acpi_no_watchdog	[HW,ACPI,WDT]

			Ignore the ACPI-based watchdog interface (WDAT) and let

			a native driver control the watchdog device instead.



	acpi_rsdp=	[ACPI,EFI,KEXEC]

			Pass the RSDP address to the kernel, mostly used

			on machines running EFI runtime service to boot the

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 9

SUBLEVEL = 216

SUBLEVEL = 217

EXTRAVERSION =

NAME = Roaring Lionus

arch/arc/include/asm/linkage.h

+2 −0
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ 
#ifdef __ASSEMBLY__



#define ASM_NL		 `	/* use '`' to mark new line in macro */

#define __ALIGN		.align 4

#define __ALIGN_STR	__stringify(__ALIGN)



/* annotation for data we want in DCCM - if enabled in .config */

.macro ARCFP_DATA nm

arch/arm/kernel/vdso.c

+2 −0
Original line number Diff line number Diff line
@@ -85,6 +85,8 @@ static bool __init cntvct_functional(void) 
	 * this.

	 */

	np = of_find_compatible_node(NULL, NULL, "arm,armv7-timer");

	if (!np)

		np = of_find_compatible_node(NULL, NULL, "arm,armv8-timer");

	if (!np)

		goto out_put;