Commit 0e42b5fe authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 6.7-rc5 into char-misc-next 



We need the char/misc fixes in here as well for testing and to build off
of.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents 386a766c 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/devicetree/bindings/display/bridge/adi,adv7533.yaml

+6 −0
Original line number Diff line number Diff line
@@ -9,6 +9,9 @@ title: Analog Devices ADV7533/35 HDMI Encoders 
maintainers:

  - Laurent Pinchart <laurent.pinchart@ideasonboard.com>



allOf:

  - $ref: /schemas/sound/dai-common.yaml#



description: |

  The ADV7533 and ADV7535 are HDMI audio and video transmitters

  compatible with HDMI 1.4 and DVI 1.0. They support color space
@@ -89,6 +92,9 @@ properties: 
    $ref: /schemas/types.yaml#/definitions/uint32

    enum: [ 1, 2, 3, 4 ]



  "#sound-dai-cells":

    const: 0



  ports:

    description:

      The ADV7533/35 has two video ports and one audio port.