Merge branch 'arm64/common-esr-macros' of git://git.kernel.org/pub/scm/linux/kernel...