diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-08-16 10:51:47 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-08-16 10:51:47 -0700 |
commit | b7e7c85dc7b0ea5ff821756c331489e3b151eed1 (patch) | |
tree | 60113a949e3a35025323e7fe8e45fb62b1a9c87d /fs/f2fs/data.c | |
parent | 2d63ba3e41db3ceb0d23924ed2879b910276e24c (diff) | |
parent | b6143d10d23ebb4a77af311e8b8b7f019d0163e6 (diff) |
Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'fs/f2fs/data.c')
0 files changed, 0 insertions, 0 deletions