Merge tag 'timers_urgent_for_v6.1_rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull timer fix from Borislav Petkov:

- Revert a fix to RISC-V timers supposed to address an uncertainty
whether clock events are received during S3 or not which locks up
other RISC-V platforms. The issue will be fixed differently later.

* tag 'timers_urgent_for_v6.1_rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
Revert "clocksource/drivers/riscv: Events are stopped during CPU suspend"

Changed files
+1 -1
drivers
clocksource
+1 -1
drivers/clocksource/timer-riscv.c
··· 51 51 static unsigned int riscv_clock_event_irq; 52 52 static DEFINE_PER_CPU(struct clock_event_device, riscv_clock_event) = { 53 53 .name = "riscv_timer_clockevent", 54 - .features = CLOCK_EVT_FEAT_ONESHOT | CLOCK_EVT_FEAT_C3STOP, 54 + .features = CLOCK_EVT_FEAT_ONESHOT, 55 55 .rating = 100, 56 56 .set_next_event = riscv_clock_next_event, 57 57 };