Commit e045e18d authored Dec 11, 2023 by Greg Kroah-Hartman

Merge 6.7-rc5 into tty-next



We need the serial fixes in here as well to build off of.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parents ae5af710 a39b6ac3

.mailmap

+1 −0

Original line number	Diff line number	Diff line
		@@ -117,6 +117,7 @@ Changbin Du <changbin.du@intel.com> <changbin.du@gmail.com>
		Changbin Du <changbin.du@intel.com> <changbin.du@intel.com>
		Chao Yu <chao@kernel.org> <chao2.yu@samsung.com>
		Chao Yu <chao@kernel.org> <yuchao0@huawei.com>
		Chester Lin <chester62515@gmail.com> <clin@suse.com>
		Chris Chiu <chris.chiu@canonical.com> <chiu@endlessm.com>
		Chris Chiu <chris.chiu@canonical.com> <chiu@endlessos.org>
		Chris Lew <quic_clew@quicinc.com> <clew@codeaurora.org>

CREDITS

+8 −0

Original line number	Diff line number	Diff line
		@@ -2944,6 +2944,14 @@ D: IPX development and support
		N: Venkatesh Pallipadi (Venki)
		D: x86/HPET

		N: Antti Palosaari
		E: crope@iki.fi
		D: Various DVB drivers
		W: https://palosaari.fi/linux/
		S: Yliopistokatu 1 D 513
		S: FI-90570 Oulu
		S: FINLAND

		N: Kyungmin Park
		E: kyungmin.park@samsung.com
		D: Samsung S5Pv210 and Exynos4210 mobile platforms

Documentation/ABI/testing/sysfs-bus-optee-devices

+9 −0

Original line number	Diff line number	Diff line
		@@ -6,3 +6,12 @@ Description:
		OP-TEE bus provides reference to registered drivers under this directory. The <uuid>
		matches Trusted Application (TA) driver and corresponding TA in secure OS. Drivers
		are free to create needed API under optee-ta-<uuid> directory.

		What: /sys/bus/tee/devices/optee-ta-<uuid>/need_supplicant
		Date: November 2023
		KernelVersion: 6.7
		Contact: op-tee@lists.trustedfirmware.org
		Description:
		Allows to distinguish whether an OP-TEE based TA/device requires user-space
		tee-supplicant to function properly or not. This attribute will be present for
		devices which depend on tee-supplicant to be running.

Documentation/ABI/testing/sysfs-class-led

+0 −9

Original line number	Diff line number	Diff line
		@@ -59,15 +59,6 @@ Description:
		brightness. Reading this file when no hw brightness change
		event has happened will return an ENODATA error.

		What: /sys/class/leds/<led>/color
		Date: June 2023
		KernelVersion: 6.5
		Description:
		Color of the LED.

		This is a read-only file. Reading this file returns the color
		of the LED as a string (e.g: "red", "green", "multicolor").

		What: /sys/class/leds/<led>/trigger
		Date: March 2006
		KernelVersion: 2.6.17

Documentation/arch/loongarch/introduction.rst

+2 −2

Original line number	Diff line number	Diff line
		@@ -375,9 +375,9 @@ Developer web site of Loongson and LoongArch (Software and Documentation):

		Documentation of LoongArch ISA:

		https://github.com/loongson/LoongArch-Documentation/releases/latest/download/LoongArch-Vol1-v1.02-CN.pdf (in Chinese)
		https://github.com/loongson/LoongArch-Documentation/releases/latest/download/LoongArch-Vol1-v1.10-CN.pdf (in Chinese)

		https://github.com/loongson/LoongArch-Documentation/releases/latest/download/LoongArch-Vol1-v1.02-EN.pdf (in English)
		https://github.com/loongson/LoongArch-Documentation/releases/latest/download/LoongArch-Vol1-v1.10-EN.pdf (in English)

		Documentation of LoongArch ELF psABI: