OSDN Git Service

Merge branch 'akpm' (patches from Andrew)
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 28 Jun 2018 18:42:56 +0000 (11:42 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 28 Jun 2018 18:42:56 +0000 (11:42 -0700)
commitea5f39f2f994e6fb8cb8d0304aa5f422ae3bbf83
tree59c4199a71da59a4ee917ae06d4b49f6684bd3f7
parenta11e1d432b51f63ba698d044441284a661f01144
parent008e682b5bf1bdd735b2eecf2f3903d7da49dd52
Merge branch 'akpm' (patches from Andrew)

Merge fixes from Andrew Morton:
 "7 fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  proc: add Alexey to MAINTAINERS
  kasan: depend on CONFIG_SLUB_DEBUG
  include/linux/dax.h: dax_iomap_fault() returns vm_fault_t
  x86/e820: put !E820_TYPE_RAM regions into memblock.reserved
  slub: fix failure when we delete and create a slab cache
  Revert mm/vmstat.c: fix vmstat_update() preemption BUG
  lib/percpu_ida.c: don't do alloc from per-CPU list if there is none