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

Commit 896be8f4 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 5.4-rc1-prereleae into android-mainline 



To make the 5.4-rc1 merge easier, merge at a prerelease point in time
before the final release happens.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I29b683c837ed1a3324644dbf9bf863f30740cd0b
parents 938a8992 619e17cf

.gitignore

+2 −1
Original line number Diff line number Diff line
@@ -32,9 +32,9 @@ 
*.lzo

*.mod

*.mod.c

*.ns_deps

*.o

*.o.*

*.order

*.patch

*.s

*.so
@@ -46,6 +46,7 @@ 
*.xz

Module.symvers

modules.builtin

modules.order



#

# Top-level generic files

Documentation/ABI/testing/dev-kmsg

+7 −8
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ Description: The /dev/kmsg character device node provides userspace access 
		The logged line can be prefixed with a <N> syslog prefix, which

		carries the syslog priority and facility. The single decimal

		prefix number is composed of the 3 lowest bits being the syslog

		priority and the higher bits the syslog facility number.

		priority and the next 8 bits the syslog facility number.



		If no prefix is given, the priority number is the default kernel

		log priority and the facility number is set to LOG_USER (1). It
@@ -90,13 +90,12 @@ Description: The /dev/kmsg character device node provides userspace access 
		  +sound:card0 - subsystem:devname



		The flags field carries '-' by default. A 'c' indicates a

		fragment of a line. All following fragments are flagged with

		'+'. Note, that these hints about continuation lines are not

		necessarily correct, and the stream could be interleaved with

		unrelated messages, but merging the lines in the output

		usually produces better human readable results. A similar

		logic is used internally when messages are printed to the

		console, /proc/kmsg or the syslog() syscall.

		fragment of a line. Note, that these hints about continuation

		lines are not necessarily correct, and the stream could be

		interleaved with unrelated messages, but merging the lines in

		the output usually produces better human readable results. A

		similar logic is used internally when messages are printed to

		the console, /proc/kmsg or the syslog() syscall.



		By default, kernel tries to avoid fragments by concatenating

		when it can and fragments are rare; however, when extended

Documentation/ABI/testing/sysfs-class-remoteproc

+10 −0
Original line number Diff line number Diff line
@@ -48,3 +48,13 @@ Description: Remote processor state 


		Writing "stop" will attempt to halt the remote processor and

		return it to the "offline" state.



What:		/sys/class/remoteproc/.../name

Date:		August 2019

KernelVersion:	5.4

Contact:	Suman Anna <s-anna@ti.com>

Description:	Remote processor name



		Reports the name of the remote processor. This can be used by

		userspace in exactly identifying a remote processor and ease

		up the usage in modifying the 'firmware' or 'state' files.

Documentation/ABI/testing/sysfs-devices-system-cpu

+10 −0
Original line number Diff line number Diff line
@@ -562,3 +562,13 @@ Description: Umwait control 
			  or C0.2 state. The time is an unsigned 32-bit number.

			  Note that a value of zero means there is no limit.

			  Low order two bits must be zero.



What:		/sys/devices/system/cpu/svm

Date:		August 2019

Contact:	Linux kernel mailing list <linux-kernel@vger.kernel.org>

		Linux for PowerPC mailing list <linuxppc-dev@ozlabs.org>

Description:	Secure Virtual Machine



		If 1, it means the system is using the Protected Execution

		Facility in POWER9 and newer processors. i.e., it is a Secure

		Virtual Machine.

Documentation/ABI/testing/sysfs-fs-f2fs

+7 −0
Original line number Diff line number Diff line
@@ -251,3 +251,10 @@ Description: 
		If checkpoint=disable, it displays the number of blocks that are unusable.

                If checkpoint=enable it displays the enumber of blocks that would be unusable

                if checkpoint=disable were to be set.



What:		/sys/fs/f2fs/<disk>/encoding

Date		July 2019

Contact:	"Daniel Rosenberg" <drosen@google.com>

Description:

		Displays name and version of the encoding set for the filesystem.

                If no encoding is set, displays (none)