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

Merge 4a19dac7 ("hrtimers: Unconditionally update target CPU base after... 


Merge 4a19dac7 ("hrtimers: Unconditionally update target CPU base after offline timer migration") into android14-6.1-lts

Steps on the way to 6.1.153

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

Change-Id: Ieb219a1be267e2b0ba237a485abce0cd8f5e7695
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents a964fab0 4a19dac7
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment