Merge branch 'akpm' (patches from Andrew)

Browse source

Merge fixes from Andrew Morton:
 "11 fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  .mailmap: add Christophe Ricard
  Make CONFIG_FHANDLE default y
  mm/page_isolation.c: fix the function comments
  oom, oom_reaper: do not enqueue task if it is on the oom_reaper_list head
  mm/page_isolation: fix tracepoint to mirror check function behavior
  mm/rmap: batched invalidations should use existing api
  x86/mm: TLB_REMOTE_SEND_IPI should count pages
  mm: fix invalid node in alloc_migrate_target()
  include/linux/huge_mm.h: return NULL instead of false for pmd_trans_huge_lock()
  mm, kasan: fix compilation for CONFIG_SLAB
  MAINTAINERS: orangefs mailing list is subscribers-only

...

This commit is contained in:

Linus Torvalds 2016-04-01 19:31:19 -05:00

parent 82d2a348bb 394532e4b6

commit 4e19fd9395

11 changed files with 34 additions and 42 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1

.mailmap

View file

2

MAINTAINERS

View file

6

arch/x86/include/asm/tlbflush.h

View file

14

arch/x86/mm/tlb.c

View file

2

include/linux/huge_mm.h

View file

2

include/trace/events/page_isolation.h

View file

3

init/Kconfig

View file

2

mm/kasan/kasan.c

View file

6

mm/oom_kill.c

View file

10

mm/page_isolation.c

View file

28

mm/rmap.c

View file