Commit 58351f46 authored by Simona Vetter's avatar Simona Vetter
Browse files

Merge v7.0-rc3 into drm-next 



Requested by Maxime Ripard for drm-misc-next because renesas people need
fb797a70 ("drm: renesas: rz-du: mipi_dsi: Set DSI divider").

Signed-off-by: default avatarSimona Vetter <simona.vetter@ffwll.ch>
parents 5f0a63f8 1f318b96

.mailmap

+3 −0
Original line number Diff line number Diff line
@@ -219,6 +219,7 @@ Daniele Alessandrelli <daniele.alessandrelli@gmail.com> <daniele.alessandrelli@i 
Danilo Krummrich <dakr@kernel.org> <dakr@redhat.com>

David Brownell <david-b@pacbell.net>

David Collins <quic_collinsd@quicinc.com> <collinsd@codeaurora.org>

David Gow <david@davidgow.net> <davidgow@google.com>

David Heidelberg <david@ixit.cz> <d.okias@gmail.com>

David Hildenbrand <david@kernel.org> <david@redhat.com>

David Rheinsberg <david@readahead.eu> <dh.herrmann@gmail.com>
@@ -353,6 +354,7 @@ Jarkko Sakkinen <jarkko@kernel.org> <jarkko.sakkinen@opinsys.com> 
Jason Gunthorpe <jgg@ziepe.ca> <jgg@mellanox.com>

Jason Gunthorpe <jgg@ziepe.ca> <jgg@nvidia.com>

Jason Gunthorpe <jgg@ziepe.ca> <jgunthorpe@obsidianresearch.com>

Jason Xing <kerneljasonxing@gmail.com>  <kernelxing@tencent.com>

<javier@osg.samsung.com> <javier.martinez@collabora.co.uk>

Javi Merino <javi.merino@kernel.org> <javi.merino@arm.com>

Jayachandran C <c.jayachandran@gmail.com> <jayachandranc@netlogicmicro.com>
@@ -401,6 +403,7 @@ Jiri Slaby <jirislaby@kernel.org> <xslaby@fi.muni.cz> 
Jisheng Zhang <jszhang@kernel.org> <jszhang@marvell.com>

Jisheng Zhang <jszhang@kernel.org> <Jisheng.Zhang@synaptics.com>

Jishnu Prakash <quic_jprakash@quicinc.com> <jprakash@codeaurora.org>

Joe Damato <joe@dama.to> <jdamato@fastly.com>

Joel Granados <joel.granados@kernel.org> <j.granados@samsung.com>

Johan Hovold <johan@kernel.org> <jhovold@gmail.com>

Johan Hovold <johan@kernel.org> <johan@hovoldconsulting.com>

CREDITS

+8 −0
Original line number Diff line number Diff line
@@ -1242,6 +1242,10 @@ N: Veaceslav Falico 
E: vfalico@gmail.com

D: Co-maintainer and co-author of the network bonding driver.



N: Thomas Falcon

E: tlfalcon@linux.ibm.com

D: Initial author of the IBM ibmvnic network driver



N: János Farkas

E: chexum@shadow.banki.hu

D: romfs, various (mostly networking) fixes
@@ -2415,6 +2419,10 @@ S: Am Muehlenweg 38 
S: D53424 Remagen

S: Germany



N: Jonathan Lemon

E: jonathan.lemon@gmail.com

D: OpenCompute PTP clock driver (ptp_ocp)



N: Colin Leroy

E: colin@colino.net

W: http://www.geekounet.org/

Documentation/ABI/testing/sysfs-driver-uniwill-laptop

+5 −5
Original line number Diff line number Diff line 
What:		/sys/bus/platform/devices/INOU0000:XX/fn_lock_toggle_enable

What:		/sys/bus/platform/devices/INOU0000:XX/fn_lock

Date:		November 2025

KernelVersion:	6.19

Contact:	Armin Wolf <W_Armin@gmx.de>
@@ -8,15 +8,15 @@ Description: 


		Reading this file returns the current enable status of the FN lock functionality.



What:		/sys/bus/platform/devices/INOU0000:XX/super_key_toggle_enable

What:		/sys/bus/platform/devices/INOU0000:XX/super_key_enable

Date:		November 2025

KernelVersion:	6.19

Contact:	Armin Wolf <W_Armin@gmx.de>

Description:

                Allows userspace applications to enable/disable the super key functionality

                of the integrated keyboard by writing "1"/"0" into this file.

		Allows userspace applications to enable/disable the super key of the integrated

		keyboard by writing "1"/"0" into this file.



		Reading this file returns the current enable status of the super key functionality.

		Reading this file returns the current enable status of the super key.



What:		/sys/bus/platform/devices/INOU0000:XX/touchpad_toggle_enable

Date:		November 2025

Documentation/admin-guide/kernel-parameters.txt

+13 −0
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ 
	TPM	TPM drivers are enabled.

	UMS	USB Mass Storage support is enabled.

	USB	USB support is enabled.

	NVME	NVMe support is enabled

	USBHID	USB Human Interface Device support is enabled.

	V4L	Video For Linux support is enabled.

	VGA	The VGA console has been enabled.
@@ -4787,6 +4788,18 @@ Kernel parameters 
			This can be set from sysctl after boot.

			See Documentation/admin-guide/sysctl/vm.rst for details.



	nvme.quirks=    [NVME] A list of quirk entries to augment the built-in

			nvme quirk list. List entries are separated by a

			'-' character.

			Each entry has the form VendorID:ProductID:quirk_names.

			The IDs are 4-digits hex numbers and quirk_names is a

			list of quirk names separated by commas. A quirk name

			can be prefixed by '^', meaning that the specified

			quirk must be disabled.



			Example:

			nvme.quirks=7710:2267:bogus_nid,^identify_cns-9900:7711:broken_msi



	ohci1394_dma=early	[HW,EARLY] enable debugging via the ohci1394 driver.

			See Documentation/core-api/debugging-via-ohci1394.rst for more

			info.

Documentation/admin-guide/laptops/uniwill-laptop.rst

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ Keyboard settings 


The ``uniwill-laptop`` driver allows the user to enable/disable:



 - the FN and super key lock functionality of the integrated keyboard

 - the FN lock and super key of the integrated keyboard

 - the touchpad toggle functionality of the integrated touchpad



See Documentation/ABI/testing/sysfs-driver-uniwill-laptop for details.