Ingo Molnar 94bf12af35 Merge tag 'v6.8-rc5' into timers/core, to resolve conflict
There's a conflict between this recent upstream fix:

  dad6a09f3148 ("hrtimer: Report offline hrtimer enqueue")

and a pending commit in the timers tree:

  1a4729ecafc2 ("hrtimers: Move hrtimer base related definitions into hrtimer_defs.h")

Resolve it by applying the upstream fix to the new <linux/hrtimer_defs.h> header.

 Conflict:
	include/linux/hrtimer.h
 Semantic conflict:
	include/linux/hrtimer_defs.h

Signed-off-by: Ingo Molnar <mingo@kernel.org>
2024-02-19 22:27:57 +01:00
..
2024-01-18 09:48:40 -08:00
2024-01-18 16:49:34 -08:00
2024-01-12 16:35:58 -08:00
2024-01-10 18:00:18 -08:00
2023-11-03 15:44:25 -10:00
2024-02-17 07:59:47 -08:00
2024-01-10 16:43:55 -08:00
2022-09-26 10:13:13 -07:00
2024-01-09 10:36:07 -08:00
2023-12-23 15:52:13 +01:00
2023-03-24 11:01:29 +01:00
2023-10-19 11:02:48 +02:00
2023-10-09 16:59:47 +10:00
2023-12-01 09:51:44 -08:00
2023-12-12 14:24:14 +01:00
2024-01-09 16:20:17 -08:00
2023-12-12 14:24:14 +01:00
2023-10-30 17:56:53 -10:00
2023-10-04 10:41:57 -07:00
2023-12-29 12:22:29 -08:00
2024-01-09 12:57:46 -08:00
2023-11-01 15:28:33 -10:00
2023-08-15 15:26:17 -07:00
2023-10-11 08:46:01 -07:00