From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 8 Apr 2017 08:35:32 +0000 (-0700)
Subject: Merge branch 'akpm' (patches from Andrew)
X-Git-Tag: MMI-PSA29.97-13-9~5858
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=56c29979653f6313b6c47b22f54ed54150fd92ed;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'akpm' (patches from Andrew)

Merge misc fixes from Andrew Morton:
 "10 fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  mm: move pcp and lru-pcp draining into single wq
  mailmap: update Yakir Yang email address
  mm, swap_cgroup: reschedule when neeed in swap_cgroup_swapoff()
  dax: fix radix tree insertion race
  mm, thp: fix setting of defer+madvise thp defrag mode
  ptrace: fix PTRACE_LISTEN race corrupting task->state
  vmlinux.lds: add missing VMLINUX_SYMBOL macros
  mm/page_alloc.c: fix print order in show_free_areas()
  userfaultfd: report actual registered features in fdinfo
  mm: fix page_vma_mapped_walk() for ksm pages
---

56c29979653f6313b6c47b22f54ed54150fd92ed