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

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

) into android-mainline

Steps on the way to v6.16-rc1

Resolves merge conflicts in:
        arch/arm64/kernel/image-vars.h

Change-Id: I4b4bcbdbd041713ecbcdeb7cb620e155481db955
Signed-off-by: Carlos Llamas <cmllamas@google.com>