diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-19 18:49:28 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-19 18:49:28 -0700 |
commit | a07a6e4121f1d4e1bbaead8210404a7f37139267 (patch) | |
tree | 6d4a06a64c146616df97859ab9aa9a0b94b7c8ab /include/asm-x86/topology_32.h | |
parent | 4571bc5abfba3bed8cb18f640bfcaf336473aee3 (diff) | |
parent | 8971e1c79d3f6c9a5e6f7a65c50c41f434a4dae6 (diff) | |
download | op-kernel-dev-a07a6e4121f1d4e1bbaead8210404a7f37139267.zip op-kernel-dev-a07a6e4121f1d4e1bbaead8210404a7f37139267.tar.gz |
Merge tag 'powerpc-4.11-5' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux
Pull more powerpc fixes from Michael Ellerman:
"A couple of minor powerpc fixes for 4.11:
- wire up statx() syscall
- don't print a warning on memory hotplug when HPT resizing isn't
available
Thanks to: David Gibson, Chandan Rajendra"
* tag 'powerpc-4.11-5' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
powerpc/pseries: Don't give a warning when HPT resizing isn't available
powerpc: Wire up statx() syscall
Diffstat (limited to 'include/asm-x86/topology_32.h')
0 files changed, 0 insertions, 0 deletions