Merge 9202c71e ("arm64: proton-pack: Add new CPUs 'k' values for branch...

Merge 9202c71e ("arm64: proton-pack: Add new CPUs 'k' values for branch mitigation") into android13-5.10-lts

Steps on the way to 5.10.239

Resolves merge conflicts in:
	arch/arm64/kernel/proton-pack.c
	Documentation/admin-guide/kernel-parameters.txt
	arch/arm64/include/asm/cputype.h
	arch/arm64/include/asm/spectre.h
	arch/arm64/net/bpf_jit_comp.c

by merging AROUND the following commits due to massive merge issues due
to previous cherry-picks into this branch.  If they are needed in the
future, they can come back in a workable way later:
	9202c71e arm64: proton-pack: Add new CPUs 'k' values for branch mitigation
	038866e0 arm64: bpf: Only mitigate cBPF programs loaded by unprivileged users
	c6a8735d arm64: bpf: Add BHB mitigation to the epilogue for cBPF programs
	d38941ee arm64: spectre: increase parameters that can be used to turn off bhb mitigation individually
	86ca6765 arm64: proton-pack: Expose whether the branchy loop k value
	e68da90a arm64: errata: Add missing sentinels to Spectre-BHB MIDR arrays
	4a2f3d82 arm64: errata: Add newer ARM cores to the spectre_bhb_loop_affected() lists
	777f973a arm64: errata: Add KRYO 2XX/3XX/4XX silver cores to Spectre BHB safe list
	1c24e2af arm64: errata: Assume that unknown CPUs _are_ vulnerable to Spectre BHB

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