From: akpm@linux-foundation.org
To: akpm@linux-foundation.org, hannes@cmpxchg.org,
mm-commits@vger.kernel.org
Subject: [folded-merged] mm-memcontrol-switch-to-rstat-fix.patch removed from -mm tree
Date: Thu, 29 Apr 2021 22:22:58 -0700 [thread overview]
Message-ID: <20210430052258.E1qVVONO7%akpm@linux-foundation.org> (raw)
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
reply other threads:[~2021-04-30 5:23 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210430052258.E1qVVONO7%akpm@linux-foundation.org \
--to=akpm@linux-foundation.org \
--cc=hannes@cmpxchg.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mm-commits@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).