Merge branch 'akpm' (patches from Andrew)

Merge misc fixes from Andrew Morton: "13 fixes" * emailed patches from Andrew Morton <akpm@linux-foundation.org>: memcg: disable hierarchy support if bound to the legacy cgroup hierarchy mm: reorder can_do_mlock to fix audit denial kasan, module: move MODULE_ALIGN macro into <linux/moduleloader.h> kasan, module, vmalloc: rework shadow allocation for modules fanotify: fix event filtering with FAN_ONDIR set mm/nommu.c: export symbol max_mapnr arch/c6x/include/asm/pgtable.h: define dummy pgprot_writecombine for !MMU nilfs2: fix deadlock of segment constructor during recovery mm: cma: fix CMA aligned offset calculation mm, hugetlb: close race when setting PageTail for gigantic pages mm, oom: do not fail __GFP_NOFAIL allocation if oom killer is disabled drivers/rtc/rtc-s3c.c: add .needs_src_clk to s3c6410 RTC data ocfs2: make append_dio an incompat feature
2026-09-26 18:16:26 +00:00 · 2015-03-12 18:46:19 -07:00 · 2015-03-12 18:46:19 -07:00 · c202baf017
commit c202baf017
parent ba68bc0115 7feee590bb
18 changed files with 63 additions and 33 deletions
--- a/arch/c6x/include/asm/pgtable.h
+++ b/arch/c6x/include/asm/pgtable.h
--- a/drivers/rtc/rtc-s3c.c
+++ b/drivers/rtc/rtc-s3c.c
--- a/fs/nilfs2/segment.c
+++ b/fs/nilfs2/segment.c
--- a/fs/notify/fanotify/fanotify.c
+++ b/fs/notify/fanotify/fanotify.c
--- a/fs/ocfs2/ocfs2.h
+++ b/fs/ocfs2/ocfs2.h
--- a/fs/ocfs2/ocfs2_fs.h
+++ b/fs/ocfs2/ocfs2_fs.h
--- a/include/linux/kasan.h
+++ b/include/linux/kasan.h
--- a/include/linux/moduleloader.h
+++ b/include/linux/moduleloader.h
--- a/include/linux/vmalloc.h
+++ b/include/linux/vmalloc.h
--- a/kernel/module.c
+++ b/kernel/module.c
--- a/mm/cma.c
+++ b/mm/cma.c
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
--- a/mm/kasan/kasan.c
+++ b/mm/kasan/kasan.c
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
--- a/mm/mlock.c
+++ b/mm/mlock.c
--- a/mm/nommu.c
+++ b/mm/nommu.c
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c