From: Dmitry Torokhov Date: Tue, 18 Nov 2025 07:16:55 +0000 (-0800) Subject: Merge tag 'v6.18-rc6' into for-linus X-Git-Tag: v6.18-rc7~8^2~1 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f39b6c468c52745dbca9a842d91c8373fda208ab;p=thirdparty%2Flinux.git Merge tag 'v6.18-rc6' into for-linus Sync up with the mainline to bring in definition of INPUT_PROP_HAPTIC_TOUCHPAD. --- f39b6c468c52745dbca9a842d91c8373fda208ab