The patch titled
Subject: mm-memcontrol-switch-to-rstat-fix
has been added to the -mm tree. Its filename is
mm-memcontrol-switch-to-rstat-fix.patch
This patch should soon appear at
https://ozlabs.org/~akpm/mmots/broken-out/mm-memcontrol-switch-to-rstat-fix.patch
and later at
https://ozlabs.org/~akpm/mmotm/broken-out/mm-memcontrol-switch-to-rstat-fix.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: mm-memcontrol-switch-to-rstat-fix
merge fix
Cc: Johannes Weiner <hannes@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/memcontrol.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/include/linux/memcontrol.h~mm-memcontrol-switch-to-rstat-fix
+++ a/include/linux/memcontrol.h
@@ -1386,7 +1386,7 @@ void count_memcg_event_mm(struct mm_stru
{
}
-static inline void split_page_memcg(struct page *head)
+static inline void split_page_memcg(struct page *head, unsigned int nr)
{
}
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
mm-page_allocc-refactor-initialization-of-struct-page-for-holes-in-memory-layout-fix.patch
mm.patch
mm-memcontrol-switch-to-rstat-fix.patch
linux-next-rejects.patch
linux-next-git-rejects.patch
kernel-forkc-export-kernel_thread-to-modules.patch
