mm-commits.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [folded-merged] mm-memcg-percpu-account-percpu-memory-to-memory-cgroups-fix-fix.patch removed from -mm tree
@ 2020-08-12  0:56 akpm
  0 siblings, 0 replies; only message in thread
From: akpm @ 2020-08-12  0:56 UTC (permalink / raw)
  To: akpm, cl, cuibixuan, dennis, guro, hannes, iamjoonsoo.kim,
	longman, mgorman, mhocko, mkoutny, mm-commits, penberg, rientjes,
	sfr, shakeelb, tj, tobin, vbabka


The patch titled
     Subject: mm-memcg-percpu-account-percpu-memory-to-memory-cgroups-fix-fix
has been removed from the -mm tree.  Its filename was
     mm-memcg-percpu-account-percpu-memory-to-memory-cgroups-fix-fix.patch

This patch was dropped because it was folded into mm-memcg-percpu-account-percpu-memory-to-memory-cgroups.patch

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: mm-memcg-percpu-account-percpu-memory-to-memory-cgroups-fix-fix

move unreachable code, per Roman

Cc: Christoph Lameter <cl@linux.com>
Cc: David Rientjes <rientjes@google.com>
Cc: Dennis Zhou <dennis@kernel.org>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Cc: Mel Gorman <mgorman@techsingularity.net>
Cc: Michal Hocko <mhocko@kernel.org>
Cc: Pekka Enberg <penberg@kernel.org>
Cc: Roman Gushchin <guro@fb.com>
Cc: Shakeel Butt <shakeelb@google.com>
Cc: Tejun Heo <tj@kernel.org>
Cc: Tobin C. Harding <tobin@kernel.org>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: Waiman Long <longman@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 mm/percpu.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/mm/percpu.c~mm-memcg-percpu-account-percpu-memory-to-memory-cgroups-fix-fix
+++ a/mm/percpu.c
@@ -1440,8 +1440,8 @@ static struct pcpu_chunk *pcpu_alloc_chu
 
 #ifdef CONFIG_MEMCG_KMEM
 objcg_fail:
-#endif
 	pcpu_mem_free(chunk->md_blocks);
+#endif
 md_blocks_fail:
 	pcpu_mem_free(chunk->bound_map);
 bound_map_fail:
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

mm-memcg-percpu-account-percpu-memory-to-memory-cgroups.patch
mm-hugetlb-add-mempolicy-check-in-the-reservation-routine-fix.patch
mm-vmstat-add-events-for-thp-migration-without-split-fix.patch
mm-migrate-clear-__gfp_reclaim-to-make-the-migration-callback-consistent-with-regular-thp-allocations-fix.patch
mm-migrate-make-a-standard-migration-target-allocation-function-fix.patch
mm.patch
mm-vmstat-fix-proc-sys-vm-stat_refresh-generating-false-warnings-fix-2.patch
mm-madvise-introduce-process_madvise-syscall-an-external-memory-hinting-api-fix.patch
kernel-forkc-export-kernel_thread-to-modules.patch


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2020-08-12  0:56 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-12  0:56 [folded-merged] mm-memcg-percpu-account-percpu-memory-to-memory-cgroups-fix-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).