diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-10-02 20:54:16 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-10-02 20:54:16 +0200 |
commit | 5634347dee31373a8faf084f4cdbf6d5ea0b03a4 (patch) | |
tree | 1ff99fa3cbdd23eb25dcb5a4f83e27389f61786b /fs/nfs/write.c | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gee... (diff) | |
parent | arm64: ftrace: fix function_graph tracer panic (diff) | |
download | linux-5634347dee31373a8faf084f4cdbf6d5ea0b03a4.tar.xz linux-5634347dee31373a8faf084f4cdbf6d5ea0b03a4.zip |
Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
Pull arm64 fixes from Catalin Marinas:
- Fix for transparent huge page change_protection() logic which was
inadvertently changing a huge pmd page into a pmd table entry.
- Function graph tracer panic fix caused by the return_to_handler code
corrupting the multi-regs function return value (composite types).
* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
arm64: ftrace: fix function_graph tracer panic
arm64: Fix THP protection change logic
Diffstat (limited to 'fs/nfs/write.c')
0 files changed, 0 insertions, 0 deletions