[folded-merged] mm-memcontrol-convert-objcg-to-be-per-memcg-per-node-type-fix-fix-fix-2-fix.patch removed from -mm tree

[folded-merged] mm-memcontrol-convert-objcg-to-be-per-memcg-per-node-type-fix-fix-fix-2-fix.patch removed from -mm tree

[Andrew Morton]

The quilt patch titled
     Subject: mm-memcontrol-convert-objcg-to-be-per-memcg-per-node-type-fix-fix-fix-2-fix
has been removed from the -mm tree.  Its filename was
     mm-memcontrol-convert-objcg-to-be-per-memcg-per-node-type-fix-fix-fix-2-fix.patch

This patch was dropped because it was folded into mm-memcontrol-convert-objcg-to-be-per-memcg-per-node-type.patch

------------------------------------------------------
From: David Carlier <devnexen@gmail.com>
Subject: mm-memcontrol-convert-objcg-to-be-per-memcg-per-node-type-fix-fix-fix-2-fix
Date: Mon, 23 Mar 2026 06:30:06 +0000

add newline, per Qi Zheng

Link: https://lkml.kernel.org/r/20260323063007.7783-1-devnexen@gmail.com
Fixes: 098fad3e1621 ("mm: memcontrol: convert objcg to be per-memcg per-node type")
Signed-off-by: David Carlier <devnexen@gmail.com>
Cc: Qi Zheng <zhengqi.arch@bytedance.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 mm/memcontrol.c |    1 +
 1 file changed, 1 insertion(+)

--- a/mm/memcontrol.c~mm-memcontrol-convert-objcg-to-be-per-memcg-per-node-type-fix-fix-fix-2-fix
+++ a/mm/memcontrol.c
@@ -4058,6 +4058,7 @@ free_objcg:
 	for_each_node(nid) {
 		struct mem_cgroup_per_node *pn = memcg->nodeinfo[nid];
 		objcg = rcu_replace_pointer(pn->objcg, NULL, true);
+
 		if (objcg)
 			percpu_ref_kill(&objcg->refcnt);
 
_

Patches currently in -mm which might be from devnexen@gmail.com are

mm-hugetlb-restore-reservation-on-error-in-hugetlb_mfill_atomic_pte-resubmission-path.patch
mm-memcontrol-convert-objcg-to-be-per-memcg-per-node-type.patch
mm-page_io-fix-pswpin-undercount-for-large-folios-in-sio_read_complete.patch

Re: [folded-merged] mm-memcontrol-convert-objcg-to-be-per-memcg-per-node-type-fix-fix-fix-2-fix.patch removed from -mm tree

[Qi Zheng]

On 3/25/26 7:16 AM, Andrew Morton wrote:
> The quilt patch titled
>       Subject: mm-memcontrol-convert-objcg-to-be-per-memcg-per-node-type-fix-fix-fix-2-fix
> has been removed from the -mm tree.  Its filename was
>       mm-memcontrol-convert-objcg-to-be-per-memcg-per-node-type-fix-fix-fix-2-fix.patch
> 
> This patch was dropped because it was folded into mm-memcontrol-convert-objcg-to-be-per-memcg-per-node-type.patch
> 
> ------------------------------------------------------
> From: David Carlier <devnexen@gmail.com>
> Subject: mm-memcontrol-convert-objcg-to-be-per-memcg-per-node-type-fix-fix-fix-2-fix
> Date: Mon, 23 Mar 2026 06:30:06 +0000
> 
> add newline, per Qi Zheng
> 
> Link: https://lkml.kernel.org/r/20260323063007.7783-1-devnexen@gmail.com
> Fixes: 098fad3e1621 ("mm: memcontrol: convert objcg to be per-memcg per-node type")
> Signed-off-by: David Carlier <devnexen@gmail.com>
> Cc: Qi Zheng <zhengqi.arch@bytedance.com>
> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
> ---
> 
>   mm/memcontrol.c |    1 +
>   1 file changed, 1 insertion(+)
> 
> --- a/mm/memcontrol.c~mm-memcontrol-convert-objcg-to-be-per-memcg-per-node-type-fix-fix-fix-2-fix
> +++ a/mm/memcontrol.c
> @@ -4058,6 +4058,7 @@ free_objcg:
>   	for_each_node(nid) {
>   		struct mem_cgroup_per_node *pn = memcg->nodeinfo[nid];

The newline should be here. ;)

>   		objcg = rcu_replace_pointer(pn->objcg, NULL, true);
> +
>   		if (objcg)
>   			percpu_ref_kill(&objcg->refcnt);
>   
> _
> 
> Patches currently in -mm which might be from devnexen@gmail.com are
> 
> mm-hugetlb-restore-reservation-on-error-in-hugetlb_mfill_atomic_pte-resubmission-path.patch
> mm-memcontrol-convert-objcg-to-be-per-memcg-per-node-type.patch
> mm-page_io-fix-pswpin-undercount-for-large-folios-in-sio_read_complete.patch
> 

Re: [folded-merged] mm-memcontrol-convert-objcg-to-be-per-memcg-per-node-type-fix-fix-fix-2-fix.patch removed from -mm tree

[Andrew Morton]

On Wed, 25 Mar 2026 10:51:40 +0800 Qi Zheng <qi.zheng@linux.dev> wrote:

> > --- a/mm/memcontrol.c~mm-memcontrol-convert-objcg-to-be-per-memcg-per-node-type-fix-fix-fix-2-fix
> > +++ a/mm/memcontrol.c
> > @@ -4058,6 +4058,7 @@ free_objcg:
> >   	for_each_node(nid) {
> >   		struct mem_cgroup_per_node *pn = memcg->nodeinfo[nid];
> 
> The newline should be here. ;)

well dang.

<edit><edit>

there.