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

Merge f4ca0cf5 ("perf/x86/intel: Ensure LBRs are disabled when a CPU is... 


Merge f4ca0cf5 ("perf/x86/intel: Ensure LBRs are disabled when a CPU is starting") into android13-5.15-lts

Steps on the way to 5.15.179

Resolves merge conflicts in:
	drivers/pci/quirks.c

Change-Id: Ia43acbe694e61224c679986c373bdf8f48b37cf3
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 76076402 f4ca0cf5
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