From: Linus Torvalds Date: Thu, 29 Mar 2018 00:34:55 +0000 (-1000) Subject: Merge branch 'akpm' (patches from Andrew) X-Git-Tag: v4.16~14 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=68b8dffce68e8cae208a891c4833c7a7990bf2c4;p=tomoyo%2Ftomoyo-test1.git Merge branch 'akpm' (patches from Andrew) Merge misc fixes from Andrew Morton: "8 fixes" * emailed patches from Andrew Morton : MAINTAINERS: demote ARM port to "odd fixes" MAINTAINERS: correct rmk's email address mm/kmemleak.c: wait for scan completion before disabling free mm/memcontrol.c: fix parameter description mismatch mm/vmstat.c: fix vmstat_update() preemption BUG mm/page_owner: fix recursion bug after changing skip entries ipc/shm.c: add split function to shm_vm_ops mm, slab: memcg_link the SLAB's kmem_cache --- 68b8dffce68e8cae208a891c4833c7a7990bf2c4