Commit cf4cf828 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 24a65b46 ("hrtimers: Unconditionally update target CPU base after...


Merge 24a65b46 ("hrtimers: Unconditionally update target CPU base after offline timer migration") into android13-5.15-lts

Steps on the way to 5.15.194

Resolves merge conflicts with:
	kernel/time/hrtimer.c

by merging away the following commits due to abi issues:

	24a65b46 hrtimers: Unconditionally update target CPU base after offline timer migration
	e90b685c hrtimer: Rename __hrtimer_hres_active() to hrtimer_hres_active()
	95b76ebe hrtimer: Remove unused function

Change-Id: Ie6696cb08f78a73c18a4fdee49050442939eec78
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents d21b5b1e 24a65b46
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment