Merge 99ca0edb ("Merge tag 'arm64-upstream' of...

Merge 99ca0edb ("Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux"

) into android-mainline

Steps on the way to 5.12-rc1

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