From: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Date: Mon, 21 Jul 2025 13:37:27 +0000 (+0300)
Subject: Merge branch 'fixes' into 'for-next'
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b5f20799f164053a0fbf7c61b3c99f8cf9cf0656;p=thirdparty%2Fkernel%2Fstable.git

Merge branch 'fixes' into 'for-next'

Merge the fixes branch into the for-next branch to resolve Makefile
conflict and include the power supply accessor work that is required
by the upcoming Uniwill driver.
---

b5f20799f164053a0fbf7c61b3c99f8cf9cf0656
diff --cc drivers/platform/x86/Makefile
index 0530a224bebd5,bea87a85ae75a..a0c5848513e38
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@@ -58,12 -58,19 +58,14 @@@ obj-$(CONFIG_X86_PLATFORM_DRIVERS_HP)	+
  # Hewlett Packard Enterprise
  obj-$(CONFIG_UV_SYSFS)       += uv_sysfs.o
  
+ obj-$(CONFIG_FW_ATTR_CLASS)	+= firmware_attributes_class.o
+ 
 -# IBM Thinkpad and Lenovo
 +# IBM Thinkpad (before 2005)
  obj-$(CONFIG_IBM_RTL)		+= ibm_rtl.o
 -obj-$(CONFIG_IDEAPAD_LAPTOP)	+= ideapad-laptop.o
 -obj-$(CONFIG_LENOVO_WMI_HOTKEY_UTILITIES)	+= lenovo-wmi-hotkey-utilities.o
 -obj-$(CONFIG_LENOVO_YMC)	+= lenovo-ymc.o
  obj-$(CONFIG_SENSORS_HDAPS)	+= hdaps.o
 -obj-$(CONFIG_THINKPAD_ACPI)	+= thinkpad_acpi.o
 -obj-$(CONFIG_THINKPAD_LMI)	+= think-lmi.o
 -obj-$(CONFIG_YOGABOOK)		+= lenovo-yogabook.o
 -obj-$(CONFIG_YT2_1380)		+= lenovo-yoga-tab2-pro-1380-fastcharger.o
 -obj-$(CONFIG_LENOVO_WMI_CAMERA)	+= lenovo-wmi-camera.o
 +
 +# Lenovo
 +obj-y				+= lenovo/
  
  # Intel
  obj-y				+= intel/