Unverified Commit a67a469c authored by Ilpo Järvinen's avatar Ilpo Järvinen
Browse files

Merge tag 'fixes' into 'for-next' 

Allows uniwill-laptop feature work that depends on changes in the fixes
branch proceed.
parents 8d95d1f4 fbddf68d

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/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.

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -3989,7 +3989,7 @@ F: drivers/hwmon/asus-ec-sensors.c 
ASUS NOTEBOOKS AND EEEPC ACPI/WMI EXTRAS DRIVERS

M:	Corentin Chary <corentin.chary@gmail.com>

M:	Luke D. Jones <luke@ljones.dev>

M:	Denis Benato <benato.denis96@gmail.com>

M:	Denis Benato <denis.benato@linux.dev>

L:	platform-driver-x86@vger.kernel.org

S:	Maintained

W:	https://asus-linux.org/

drivers/platform/olpc/olpc-xo175-ec.c

+1 −1
Original line number Diff line number Diff line
@@ -482,7 +482,7 @@ static int olpc_xo175_ec_cmd(u8 cmd, u8 *inbuf, size_t inlen, u8 *resp, 
	dev_dbg(dev, "CMD %x, %zd bytes expected\n", cmd, resp_len);



	if (inlen > 5) {

		dev_err(dev, "command len %zd too big!\n", resp_len);

		dev_err(dev, "command len %zd too big!\n", inlen);

		return -EOVERFLOW;

	}

drivers/platform/x86/amd/hsmp/hsmp.c

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ static int __hsmp_send_message(struct hsmp_socket *sock, struct hsmp_message *ms 
	}



	if (unlikely(mbox_status == HSMP_STATUS_NOT_READY)) {

		dev_err(sock->dev, "Message ID 0x%X failure : SMU tmeout (status = 0x%X)\n",

		dev_err(sock->dev, "Message ID 0x%X failure : SMU timeout (status = 0x%X)\n",

			msg->msg_id, mbox_status);

		return -ETIMEDOUT;

	} else if (unlikely(mbox_status == HSMP_ERR_INVALID_MSG)) {