From: Linus Torvalds Date: Thu, 27 May 2021 21:58:26 +0000 (-1000) Subject: Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux X-Git-Tag: v5.15~1059 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3c856a3180daf38d33166c0c98da921841588019;p=platform%2Fkernel%2Flinux-starfive.git Merge tag 'arm64-fixes' of git://git./linux/kernel/git/arm64/linux Pull arm64 fixes from Catalin Marinas: - Don't use contiguous or block mappings for the linear map when KFENCE is enabled. - Fix link in the arch_counter_enforce_ordering() comment. * tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux: arm64: mm: don't use CON and BLK mapping if KFENCE is enabled arm64: Fix stale link in the arch_counter_enforce_ordering() comment --- 3c856a3180daf38d33166c0c98da921841588019