Merge b65b87e718 ("arm64: proton-pack: Include unprivileged eBPF status in Spectre v2 mitigation reporting") into android12-5.10-lts

Browse Source

Steps on the way to 5.10.105

Resolves conflicts with:
	arch/arm64/include/asm/cpucaps.h
	arch/arm64/include/asm/cpufeature.h
	arch/arm64/include/asm/kvm_asm.h
	arch/arm64/include/asm/kvm_mmu.h
	arch/arm64/include/asm/mmu.h
	arch/arm64/include/asm/spectre.h
	arch/arm64/kernel/cpufeature.c
	arch/arm64/kernel/proton-pack.c
	arch/arm64/kvm/arm.c
	arch/arm64/kvm/hyp/smccc_wa.S

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I378076b3deff66ab705a035a071324213b8e80c8

...

This commit is contained in:

Greg Kroah-Hartman

2022-03-18 15:01:03 +01:00

parent 9fddd6c893 b65b87e718

commit 55d57b8929

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available