From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 16 Aug 2019 17:51:47 +0000 (-0700)
Subject: Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
X-Git-Tag: v5.4-rc1~325
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b7e7c85dc7b0ea5ff821756c331489e3b151eed1;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'arm64-fixes' of git://git./linux/kernel/git/arm64/linux

Pull arm64 fixes from Catalin Marinas:

 - Don't taint the kernel if CPUs have different sets of page sizes
   supported (other than the one in use).

 - Issue I-cache maintenance for module ftrace trampoline.

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
  arm64: ftrace: Ensure module ftrace trampoline is coherent with I-side
  arm64: cpufeature: Don't treat granule sizes as strict
---

b7e7c85dc7b0ea5ff821756c331489e3b151eed1