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

Merge cde8ad8a ("arm64: proton-pack: Expose whether the platform is...


Merge cde8ad8a ("arm64: proton-pack: Expose whether the platform is mitigated by firmware") into android13-5.10-lts

Steps on the way to 5.10.239

Resolves merge conflicts in:
	arch/arm64/kernel/proton-pack.c

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