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

Browse Source

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: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I9d7f1e7756c6c76454aaeec1b8c08d51f544924b

...

This commit is contained in:

Greg Kroah-Hartman

2022-03-18 12:10:51 +01:00

parent cf6a46ae18 b65b87e718

commit a2db5ab2eb

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