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>

diff --cc Documentation/admin-guide/kernel-parameters.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc arch/x86/kernel/apic/apic.c
Simple merge

diff --cc include/linux/jiffies.h
Simple merge

diff --cc include/linux/rseq_entry.h
index 17956e119e813fe988c819111623673310f3351e,c6831c93cd6ee506310f826b276c1aed07d499a2..f11ebd34f8b9553c4620f3709ef9586cea9cfaec
--- 1/include/linux/rseq_entry.h
--- 2/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);

diff --cc kernel/sched/core.c
Simple merge

diff --cc kernel/sched/fair.c
Simple merge

diff --cc kernel/sched/sched.h
Simple merge

diff --cc kernel/time/jiffies.c
Simple merge

diff --cc kernel/time/timekeeping.c
Simple merge