Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 16 Aug 2019 17:51:47 +0000 (10:51 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 16 Aug 2019 17:51:47 +0000 (10:51 -0700)
commitb7e7c85dc7b0ea5ff821756c331489e3b151eed1
tree60113a949e3a35025323e7fe8e45fb62b1a9c87d
parent2d63ba3e41db3ceb0d23924ed2879b910276e24c
parentb6143d10d23ebb4a77af311e8b8b7f019d0163e6
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