Merge branch 'for-5.5/core' into for-linus (b746a1a2) · Commits · 戴 / test

.mailmap

+3 −1

Original line number	Diff line number	Diff line
		@@ -196,7 +196,8 @@ Oleksij Rempel <linux@rempel-privat.de> <o.rempel@pengutronix.de>
		Oleksij Rempel <linux@rempel-privat.de> <ore@pengutronix.de>
		Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
		Patrick Mochel <mochel@digitalimplant.org>
		Paul Burton <paul.burton@mips.com> <paul.burton@imgtec.com>
		Paul Burton <paulburton@kernel.org> <paul.burton@imgtec.com>
		Paul Burton <paulburton@kernel.org> <paul.burton@mips.com>
		Peter A Jonsson <pj@ludd.ltu.se>
		Peter Oruba <peter@oruba.de>
		Peter Oruba <peter.oruba@amd.com>
		@@ -229,6 +230,7 @@ Shuah Khan <shuah@kernel.org> <shuahkhan@gmail.com>
		Shuah Khan <shuah@kernel.org> <shuah.khan@hp.com>
		Shuah Khan <shuah@kernel.org> <shuahkh@osg.samsung.com>
		Shuah Khan <shuah@kernel.org> <shuah.kh@samsung.com>
		Simon Arlott <simon@octiron.net> <simon@fire.lp0.eu>
		Simon Kelley <simon@thekelleys.org.uk>
		Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>
		Stephen Hemminger <shemminger@osdl.org>

CREDITS

+4 −0

Original line number	Diff line number	Diff line
		@@ -1637,6 +1637,10 @@ S: Panoramastrasse 18
		S: D-69126 Heidelberg
		S: Germany

		N: Simon Horman
		M: horms@verge.net.au
		D: Renesas ARM/ARM64 SoC maintainer

		N: Christopher Horn
		E: chorn@warwick.net
		D: Miscellaneous sysctl hacks

Documentation/ABI/testing/ima_policy

+5 −1

Original line number	Diff line number	Diff line
		@@ -37,7 +37,7 @@ Description:
		euid:= decimal value
		fowner:= decimal value
		lsm: are LSM specific
		option: appraise_type:= [imasig]
		option: appraise_type:= [imasig] [imasig\|modsig]
		template:= name of a defined IMA template type
		(eg, ima-ng). Only valid when action is "measure".
		pcr:= decimal value
		@@ -105,3 +105,7 @@ Description:

		measure func=KEXEC_KERNEL_CHECK pcr=4
		measure func=KEXEC_INITRAMFS_CHECK pcr=5

		Example of appraise rule allowing modsig appended signatures:

		appraise func=KEXEC_KERNEL_CHECK appraise_type=imasig\|modsig

Documentation/ABI/testing/sysfs-class-backlight

0 → 100644

+26 −0

Original line number	Diff line number	Diff line
		What: /sys/class/backlight/<backlight>/scale
		Date: July 2019
		KernelVersion: 5.4
		Contact: Daniel Thompson <daniel.thompson@linaro.org>
		Description:
		Description of the scale of the brightness curve.

		The human eye senses brightness approximately logarithmically,
		hence linear changes in brightness are perceived as being
		non-linear. To achieve a linear perception of brightness changes
		controls like sliders need to apply a logarithmic mapping for
		backlights with a linear brightness curve.

		Possible values of the attribute are:

		unknown
		The scale of the brightness curve is unknown.

		linear
		The brightness changes linearly with each step. Brightness
		controls should apply a logarithmic mapping for a linear
		perception.

		non-linear
		The brightness changes non-linearly with each step. Brightness
		controls should use a linear mapping for a linear perception.

Documentation/ABI/testing/sysfs-class-watchdog

+34 −0

Original line number	Diff line number	Diff line
		@@ -72,3 +72,37 @@ Description:
		It is a read/write file. When read, the currently assigned
		pretimeout governor is returned. When written, it sets
		the pretimeout governor.

		What: /sys/class/watchdog/watchdog1/access_cs0
		Date: August 2019
		Contact: Ivan Mikhaylov <i.mikhaylov@yadro.com>,
		Alexander Amelkin <a.amelkin@yadro.com>
		Description:
		It is a read/write file. This attribute exists only if the
		system has booted from the alternate flash chip due to
		expiration of a watchdog timer of AST2400/AST2500 when
		alternate boot function was enabled with 'aspeed,alt-boot'
		devicetree option for that watchdog or with an appropriate
		h/w strapping (for WDT2 only).

		At alternate flash the 'access_cs0' sysfs node provides:
		ast2400: a way to get access to the primary SPI flash
		chip at CS0 after booting from the alternate
		chip at CS1.
		ast2500: a way to restore the normal address mapping
		from (CS0->CS1, CS1->CS0) to (CS0->CS0,
		CS1->CS1).

		Clearing the boot code selection and timeout counter also
		resets to the initial state the chip select line mapping. When
		the SoC is in normal mapping state (i.e. booted from CS0),
		clearing those bits does nothing for both versions of the SoC.
		For alternate boot mode (booted from CS1 due to wdt2
		expiration) the behavior differs as described above.

		This option can be used with wdt2 (watchdog1) only.

		When read, the current status of the boot code selection is
		shown. When written with any non-zero value, it clears
		the boot code selection and the timeout counter, which results
		in chipselect reset for AST2400/AST2500.

Admin message