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
Showing
- MAINTAINERS 9 additions, 0 deletionsMAINTAINERS
- arch/x86/kernel/e820.c 12 additions, 3 deletionsarch/x86/kernel/e820.c
- include/linux/dax.h 1 addition, 1 deletioninclude/linux/dax.h
- include/linux/slub_def.h 4 additions, 0 deletionsinclude/linux/slub_def.h
- lib/Kconfig.kasan 1 addition, 0 deletionslib/Kconfig.kasan
- lib/percpu_ida.c 1 addition, 1 deletionlib/percpu_ida.c
- mm/slab_common.c 4 additions, 0 deletionsmm/slab_common.c
- mm/slub.c 6 additions, 1 deletionmm/slub.c
- mm/vmstat.c 0 additions, 2 deletionsmm/vmstat.c
Loading
Please register or sign in to comment