[folded-merged] mm-memcontrol-add-file_thp-shmem_thp-to-memorystat-fix.patch removed from -mm tree

[folded-merged] mm-memcontrol-add-file_thp-shmem_thp-to-memorystat-fix.patch removed from -mm tree

[akpm]

The patch titled
     Subject: mm: memcontrol: add file_thp, shmem_thp to memory.stat fix
has been removed from the -mm tree.  Its filename was
     mm-memcontrol-add-file_thp-shmem_thp-to-memorystat-fix.patch

This patch was dropped because it was folded into mm-memcontrol-add-file_thp-shmem_thp-to-memorystat.patch

------------------------------------------------------
From: Johannes Weiner <hannes@cmpxchg.org>
Subject: mm: memcontrol: add file_thp, shmem_thp to memory.stat fix

add documentation

Link: https://lkml.kernel.org/r/20201026174029.GC548555@cmpxchg.org
Signed-off-by: Johannes Weiner <hannes@cmpxchg.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 Documentation/admin-guide/cgroup-v2.rst |    8 ++++++++
 1 file changed, 8 insertions(+)

--- a/Documentation/admin-guide/cgroup-v2.rst~mm-memcontrol-add-file_thp-shmem_thp-to-memorystat-fix
+++ a/Documentation/admin-guide/cgroup-v2.rst
@@ -1300,6 +1300,14 @@ PAGE_SIZE multiple when read back.
 		Amount of memory used in anonymous mappings backed by
 		transparent hugepages
 
+	  file_thp
+		Amount of cached filesystem data backed by transparent
+		hugepages
+
+	  shmem_thp
+		Amount of shm, tmpfs, shared anonymous mmap()s backed by
+		transparent hugepages
+
 	  inactive_anon, active_anon, inactive_file, active_file, unevictable
 		Amount of memory, swap-backed and filesystem-backed,
 		on the internal memory management lists used by the
_

Patches currently in -mm which might be from hannes@cmpxchg.org are

mm-memcontrol-add-file_thp-shmem_thp-to-memorystat.patch
mm-dont-wake-kswapd-prematurely-when-watermark-boosting-is-disabled.patch