Merge branch 'linus' into perf/urgent, to pick up dependent commits (4fc31ba1) · Commits · e / devices / android_kernel_fairphone_FP5

Documentation/ABI/stable/sysfs-devices

+1 −1

Original line number	Original line	Diff line number	Diff line
	# Note: This documents additional properties of any device beyond what		# Note: This documents additional properties of any device beyond what
	# is documented in Documentation/sysfs-rules.txt		# is documented in Documentation/admin-guide/sysfs-rules.rst

	What: /sys/devices/*/of_node		What: /sys/devices/*/of_node
	Date: February 2015		Date: February 2015

Documentation/ABI/testing/evm

+34 −14

Original line number	Original line	Diff line number	Diff line
	@@ -7,17 +7,37 @@ Description:
	HMAC-sha1 value across the extended attributes, storing the		HMAC-sha1 value across the extended attributes, storing the
	value as the extended attribute 'security.evm'.		value as the extended attribute 'security.evm'.

	EVM depends on the Kernel Key Retention System to provide it		EVM supports two classes of security.evm. The first is
	with a trusted/encrypted key for the HMAC-sha1 operation.		an HMAC-sha1 generated locally with a
	The key is loaded onto the root's keyring using keyctl. Until		trusted/encrypted key stored in the Kernel Key
	EVM receives notification that the key has been successfully		Retention System. The second is a digital signature
	loaded onto the keyring (echo 1 > <securityfs>/evm), EVM		generated either locally or remotely using an
	can not create or validate the 'security.evm' xattr, but		asymmetric key. These keys are loaded onto root's
	returns INTEGRITY_UNKNOWN. Loading the key and signaling EVM		keyring using keyctl, and EVM is then enabled by
	should be done as early as possible. Normally this is done		echoing a value to <securityfs>/evm:
	in the initramfs, which has already been measured as part
	of the trusted boot. For more information on creating and		1: enable HMAC validation and creation
	loading existing trusted/encrypted keys, refer to:		2: enable digital signature validation
	Documentation/keys-trusted-encrypted.txt. (A sample dracut		3: enable HMAC and digital signature validation and HMAC
	patch, which loads the trusted/encrypted key and enables		creation
	EVM, is available from http://linux-ima.sourceforge.net/#EVM.)
			Further writes will be blocked if HMAC support is enabled or
			if bit 32 is set:

			echo 0x80000002 ><securityfs>/evm

			will enable digital signature validation and block
			further writes to <securityfs>/evm.

			Until this is done, EVM can not create or validate the
			'security.evm' xattr, but returns INTEGRITY_UNKNOWN.
			Loading keys and signaling EVM should be done as early
			as possible. Normally this is done in the initramfs,
			which has already been measured as part of the trusted
			boot. For more information on creating and loading
			existing trusted/encrypted keys, refer to:

			Documentation/security/keys/trusted-encrypted.rst. Both dracut
			(via 97masterkey and 98integrity) and systemd (via
			core/ima-setup) have support for loading keys at boot
			time.

Documentation/ABI/testing/sysfs-bus-mmc

0 → 100644

+4 −0

Original line number	Original line	Diff line number	Diff line
			What: /sys/bus/mmc/devices/.../rev
			Date: October 2017
			Contact: Jin Qian <jinqian@android.com>
			Description: Extended CSD revision number

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

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -187,7 +187,8 @@ Description: Processor frequency boosting control
	This switch controls the boost setting for the whole system.		This switch controls the boost setting for the whole system.
	Boosting allows the CPU and the firmware to run at a frequency		Boosting allows the CPU and the firmware to run at a frequency
	beyound it's nominal limit.		beyound it's nominal limit.
	More details can be found in Documentation/cpu-freq/boost.txt		More details can be found in
			Documentation/admin-guide/pm/cpufreq.rst


	What: /sys/devices/system/cpu/cpu#/crash_notes		What: /sys/devices/system/cpu/cpu#/crash_notes
	@@ -223,7 +224,8 @@ Description: Parameters for the Intel P-state driver
	no_turbo: limits the driver to selecting P states below the turbo		no_turbo: limits the driver to selecting P states below the turbo
	frequency range.		frequency range.

	More details can be found in Documentation/cpu-freq/intel-pstate.txt		More details can be found in
			Documentation/admin-guide/pm/intel_pstate.rst

	What: /sys/devices/system/cpu/cpu/cache/index/<set_of_attributes_mentioned_below>		What: /sys/devices/system/cpu/cpu/cache/index/<set_of_attributes_mentioned_below>
	Date: July 2014(documented, existed before August 2008)		Date: July 2014(documented, existed before August 2008)

Documentation/ABI/testing/sysfs-power

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -18,7 +18,8 @@ Description:
	Writing one of the above strings to this file causes the system		Writing one of the above strings to this file causes the system
	to transition into the corresponding state, if available.		to transition into the corresponding state, if available.

	See Documentation/power/states.txt for more information.		See Documentation/admin-guide/pm/sleep-states.rst for more
			information.

	What: /sys/power/mem_sleep		What: /sys/power/mem_sleep
	Date: November 2016		Date: November 2016
	@@ -35,7 +36,8 @@ Description:
	represented by it to be used on subsequent attempts to suspend		represented by it to be used on subsequent attempts to suspend
	the system.		the system.

	See Documentation/power/states.txt for more information.		See Documentation/admin-guide/pm/sleep-states.rst for more
			information.

	What: /sys/power/disk		What: /sys/power/disk
	Date: September 2006		Date: September 2006