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

Merge 34a81f52 ("x86/cpu: Enable STIBP on AMD if Automatic IBRS is... 


Merge 34a81f52 ("x86/cpu: Enable STIBP on AMD if Automatic IBRS is enabled") into android13-5.10-lts

Steps on the way to 5.10.205

Resolves conflicts in:
	kernel/events/core.c

Change-Id: If232de81d2cd131235847c5ec48a5ae4475c75cb
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents e6f44899 34a81f52
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