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 android12-5.10-lts 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
Loading