Merge aab6bf50 ("Merge tag 'arm64-fixes' of...

Merge aab6bf50 ("Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux"

) into android-mainline

Steps on the way to 5.10-rc2

Resolves conflicts in:
	arch/arm64/kernel/vdso32/Makefile

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