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

Merge b65b87e7 ("arm64: proton-pack: Include unprivileged eBPF status in...


Merge b65b87e7 ("arm64: proton-pack: Include unprivileged eBPF status in Spectre v2 mitigation reporting") into android-mainline

Steps on the way to 5.10.105

Resolves merge conflicts in:
	arch/arm64/include/asm/assembler.h
	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
	arch/arm64/kvm/hyp/vhe/switch.c
	include/linux/arm-smccc.h

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