diff options
| author | Linus Torvalds | 2017-03-20 02:49:28 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2017-03-20 02:49:28 +0100 |
| commit | a07a6e4121f1d4e1bbaead8210404a7f37139267 (patch) | |
| tree | 6d4a06a64c146616df97859ab9aa9a0b94b7c8ab /mm/swap_slots.c | |
| parent | Merge branch 'parisc-4.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
| parent | powerpc/pseries: Don't give a warning when HPT resizing isn't available (diff) | |
| download | kernel-qcow2-linux-a07a6e4121f1d4e1bbaead8210404a7f37139267.tar.gz kernel-qcow2-linux-a07a6e4121f1d4e1bbaead8210404a7f37139267.tar.xz kernel-qcow2-linux-a07a6e4121f1d4e1bbaead8210404a7f37139267.zip | |
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 'mm/swap_slots.c')
0 files changed, 0 insertions, 0 deletions