Merge 0e9bcda5 ("Merge tag 'arm64-fixes' of...

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

) into android-mainline

Fixes along the way to 5.11-rc6

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