diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-15 11:41:44 -0800 | 
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-15 11:41:44 -0800 | 
| commit | 875fc4f5ddf35605581f9a5900c14afef48611f2 (patch) | |
| tree | e237a28a71a5d1e72eaf0ecda737eb5c8614c72c /lib/mpi/mpi-internal.h | |
| parent | 7d1fc01afc5af35e5197e0e75abe900f6bd279b8 (diff) | |
| parent | 7dfa4612204b511c934ca2a0e4f306f9981bd9aa (diff) | |
Merge branch 'akpm' (patches from Andrew)
Merge first patch-bomb from Andrew Morton:
 - A few hotfixes which missed 4.4 becasue I was asleep.  cc'ed to
   -stable
 - A few misc fixes
 - OCFS2 updates
 - Part of MM.  Including pretty large changes to page-flags handling
   and to thp management which have been buffered up for 2-3 cycles now.
  I have a lot of MM material this time.
[ It turns out the THP part wasn't quite ready, so that got dropped from
  this series  - Linus ]
* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (117 commits)
  zsmalloc: reorganize struct size_class to pack 4 bytes hole
  mm/zbud.c: use list_last_entry() instead of list_tail_entry()
  zram/zcomp: do not zero out zcomp private pages
  zram: pass gfp from zcomp frontend to backend
  zram: try vmalloc() after kmalloc()
  zram/zcomp: use GFP_NOIO to allocate streams
  mm: add tracepoint for scanning pages
  drivers/base/memory.c: fix kernel warning during memory hotplug on ppc64
  mm/page_isolation: use macro to judge the alignment
  mm: fix noisy sparse warning in LIBCFS_ALLOC_PRE()
  mm: rework virtual memory accounting
  include/linux/memblock.h: fix ordering of 'flags' argument in comments
  mm: move lru_to_page to mm_inline.h
  Documentation/filesystems: describe the shared memory usage/accounting
  memory-hotplug: don't BUG() in register_memory_resource()
  hugetlb: make mm and fs code explicitly non-modular
  mm/swapfile.c: use list_for_each_entry_safe in free_swap_count_continuations
  mm: /proc/pid/clear_refs: no need to clear VM_SOFTDIRTY in clear_soft_dirty_pmd()
  mm: make sure isolate_lru_page() is never called for tail page
  vmstat: make vmstat_updater deferrable again and shut down on idle
  ...
Diffstat (limited to 'lib/mpi/mpi-internal.h')
0 files changed, 0 insertions, 0 deletions
