From: Linus Torvalds Date: Thu, 28 Jun 2018 18:42:56 +0000 (-0700) Subject: Merge branch 'akpm' (patches from Andrew) X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=ea5f39f2f994e6fb8cb8d0304aa5f422ae3bbf83;p=linux.git Merge branch 'akpm' (patches from Andrew) Merge fixes from Andrew Morton: "7 fixes" * emailed patches from Andrew Morton : 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 --- ea5f39f2f994e6fb8cb8d0304aa5f422ae3bbf83