From: Ingo Molnar <mingo@kernel.org>
Date: Sat, 21 Mar 2026 07:02:36 +0000 (+0100)
Subject: Merge tag 'v7.0-rc4' into timers/core, to resolve conflict
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f6472b17933f9adb825e7c7da31f7b7b2edb1950;p=thirdparty%2Fkernel%2Flinux.git

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>
---

f6472b17933f9adb825e7c7da31f7b7b2edb1950
diff --cc include/linux/rseq_entry.h
index 17956e119e813,c6831c93cd6ee..f11ebd34f8b95
--- a/include/linux/rseq_entry.h
+++ b/include/linux/rseq_entry.h
@@@ -216,20 -215,11 +216,20 @@@ efault
  	return false;
  }
  
 +static __always_inline bool rseq_grant_slice_extension(unsigned long ti_work, unsigned long mask)
 +{
 +	if (unlikely(__rseq_grant_slice_extension(ti_work & mask))) {
 +		hrtimer_rearm_deferred_tif(ti_work);
 +		return true;
 +	}
 +	return false;
 +}
 +
  #else /* CONFIG_RSEQ_SLICE_EXTENSION */
- static inline bool rseq_slice_extension_enabled(void) { return false; }
- static inline bool rseq_arm_slice_extension_timer(void) { return false; }
- static inline void rseq_slice_clear_grant(struct task_struct *t) { }
- static inline bool rseq_grant_slice_extension(unsigned long ti_work, unsigned long mask) { return false; }
+ static __always_inline bool rseq_slice_extension_enabled(void) { return false; }
+ static __always_inline bool rseq_arm_slice_extension_timer(void) { return false; }
+ static __always_inline void rseq_slice_clear_grant(struct task_struct *t) { }
 -static __always_inline bool rseq_grant_slice_extension(bool work_pending) { return false; }
++static __always_inline bool rseq_grant_slice_extension(unsigned long ti_work, unsigned long mask) { return false; }
  #endif /* !CONFIG_RSEQ_SLICE_EXTENSION */
  
  bool rseq_debug_update_user_cs(struct task_struct *t, struct pt_regs *regs, unsigned long csaddr);