Merge 2d38c80d ("Merge tag 'for-linus' of...

Merge 2d38c80d ("Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm"

) into android-mainline

Steps on the way to 5.10-rc2

Resolves conflicts in:
	arch/arm64/include/asm/cpufeature.h

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