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

Commit 2764c9b8 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.213(cff739f8) into msm-4.9"

parents ce713399 45ddef21

Documentation/ABI/testing/sysfs-bus-mei

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ KernelVersion: 3.10 
Contact:	Samuel Ortiz <sameo@linux.intel.com>

		linux-mei@linux.intel.com

Description:	Stores the same MODALIAS value emitted by uevent

		Format: mei:<mei device name>:<device uuid>:

		Format: mei:<mei device name>:<device uuid>:<protocol version>



What:		/sys/bus/mei/devices/.../name

Date:		May 2015

Documentation/kernel-parameters.txt

+6 −0
Original line number Diff line number Diff line
@@ -1987,6 +1987,12 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
			kmemcheck=2 (one-shot mode)

			Default: 2 (one-shot mode)



	kpti=		[ARM64] Control page table isolation of user

			and kernel address spaces.

			Default: enabled on cores which need mitigation.

			0: force disabled

			1: force enabled



	kstack=N	[X86] Print N words from the kernel stack

			in oops dumps.

Makefile

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

PATCHLEVEL = 9

SUBLEVEL = 208

SUBLEVEL = 213

EXTRAVERSION =

NAME = Roaring Lionus

arch/arc/plat-eznps/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ menuconfig ARC_PLAT_EZNPS 
	bool "\"EZchip\" ARC dev platform"

	select ARC_HAS_COH_CACHES if SMP

	select CPU_BIG_ENDIAN

	select CLKSRC_NPS

	select CLKSRC_NPS if !PHYS_ADDR_T_64BIT

	select EZNPS_GIC

	select EZCHIP_NPS_MANAGEMENT_ENET if ETHERNET

	help

arch/arm/boot/dts/am437x-gp-evm.dts

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ 
		};



	lcd0: display {

		compatible = "osddisplays,osd057T0559-34ts", "panel-dpi";

		compatible = "osddisplays,osd070t1718-19ts", "panel-dpi";

		label = "lcd";



		panel-timing {