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

Commit 15675b06 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge android-4.14.170 (312ed39a) into msm-4.14"

parents 10571ffc aec6635d

Documentation/ABI/testing/sysfs-class-devfreq

+7 −0
Original line number Diff line number Diff line
@@ -7,6 +7,13 @@ Description: 
		The name of devfreq object denoted as ... is same as the

		name of device using devfreq.



What:		/sys/class/devfreq/.../name

Date:		November 2019

Contact:	Chanwoo Choi <cw00.choi@samsung.com>

Description:

		The /sys/class/devfreq/.../name shows the name of device

		of the corresponding devfreq object.



What:		/sys/class/devfreq/.../governor

Date:		September 2011

Contact:	MyungJoo Ham <myungjoo.ham@samsung.com>

Documentation/admin-guide/kernel-parameters.txt

+6 −0
Original line number Diff line number Diff line
@@ -1867,6 +1867,12 @@ 
			Built with CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF=y,

			the default is off.



	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



	kvm.ignore_msrs=[KVM] Ignore guest accesses to unhandled MSRs.

			Default is 0 (don't ignore, but inject #GP)

Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 4

PATCHLEVEL = 14

SUBLEVEL = 168

SUBLEVEL = 170

EXTRAVERSION =

NAME = Petit Gorille

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 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/am335x-boneblack-common.dtsi

+5 −0
Original line number Diff line number Diff line
@@ -131,6 +131,11 @@ 
};



/ {

	memory@80000000 {

		device_type = "memory";

		reg = <0x80000000 0x20000000>; /* 512 MB */

	};



	clk_mcasp0_fixed: clk_mcasp0_fixed {

		#clock-cells = <0>;

		compatible = "fixed-clock";