* [folded-merged] mm-memcontrol-switch-to-rstat-fix.patch removed from -mm tree
@ 2021-04-30 5:22 akpm
0 siblings, 0 replies; only message in thread
From: akpm @ 2021-04-30 5:22 UTC (permalink / raw)
To: akpm, hannes, mm-commits
The patch titled
Subject: mm-memcontrol-switch-to-rstat-fix
has been removed from the -mm tree. Its filename was
mm-memcontrol-switch-to-rstat-fix.patch
This patch was dropped because it was folded into mm-memcontrol-switch-to-rstat.patch
------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: mm-memcontrol-switch-to-rstat-fix
merge fix
Cc: Johannes Weiner <hannes@cmpxchg.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
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
@@ -1373,7 +1373,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@linux-foundation.org are
mm-memcontrol-switch-to-rstat.patch
mm-vmalloc-remove-unmap_kernel_range-fix-fix.patch
mm-page_alloc-add-an-array-based-interface-to-the-bulk-page-allocator-fix.patch
mm.patch
mm-vmscan-add-shrinker_info_protected-helper-fix.patch
mm-drop-redundant-arch_enable__migration-fix.patch
mm-drop-redundant-arch_enable__migration-fix-fix.patch
kernel-resource-allow-region_intersects-users-to-hold-resource_lock-fix.patch
linux-next-rejects.patch
linux-next-git-rejects.patch
cifsd-is-broken.patch
kernel-forkc-export-kernel_thread-to-modules.patch
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2021-04-30 5:23 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-30 5:22 [folded-merged] mm-memcontrol-switch-to-rstat-fix.patch removed from -mm tree akpm
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).