Merge 6.14-rc4 into usb-next

We need the USB fixes in here as well for testing. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2024-12-23 07:59:03 +01:00
parent 362a7993ed 4bbf9020be
commit d3571faa1b
276 changed files with 3879 additions and 1573 deletions
@@ -3,8 +3,8 @@
 #define _UAPI_LINUX_THERMAL_H

 #define THERMAL_NAME_LENGTH	20
-#define THERMAL_THRESHOLD_WAY_UP	BIT(0)
-#define THERMAL_THRESHOLD_WAY_DOWN	BIT(1)
+#define THERMAL_THRESHOLD_WAY_UP	0x1
+#define THERMAL_THRESHOLD_WAY_DOWN	0x2

 enum thermal_device_mode {
 	THERMAL_DEVICE_DISABLED = 0,