diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2026-03-21 08:02:36 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2026-03-21 08:02:36 +0100 |
| commit | f6472b17933f9adb825e7c7da31f7b7b2edb1950 (patch) | |
| tree | 84cca5e27843ed65fd49e62352d0a1de582470be /samples/kobject/ssh:/git@git.zx2c4.com | |
| parent | clocksource: Rewrite watchdog code completely (diff) | |
| parent | Linux 7.0-rc4 (diff) | |
Merge tag 'v7.0-rc4' into timers/core, to resolve conflict
Resolve conflict between this change in the upstream kernel:
4c652a47722f ("rseq: Mark rseq_arm_slice_extension_timer() __always_inline")
... and this pending change in timers/core:
0e98eb14814e ("entry: Prepare for deferred hrtimer rearming")
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'samples/kobject/ssh:/git@git.zx2c4.com')
0 files changed, 0 insertions, 0 deletions