[folded-merged] mm-gup_benchmark-gup_benchmark-depends-on-debug_fs-v2.patch removed from -mm tree

[folded-merged] mm-gup_benchmark-gup_benchmark-depends-on-debug_fs-v2.patch removed from -mm tree

[akpm]

The patch titled
     Subject: mm-gup_benchmark-gup_benchmark-depends-on-debug_fs-v2
has been removed from the -mm tree.  Its filename was
     mm-gup_benchmark-gup_benchmark-depends-on-debug_fs-v2.patch

This patch was dropped because it was folded into mm-gup_benchmark-gup_benchmark-depends-on-debug_fs.patch

------------------------------------------------------
From: Barry Song <song.bao.hua@hisilicon.com>
Subject: mm-gup_benchmark-gup_benchmark-depends-on-debug_fs-v2

add comment as a prompt to users as commented by John and Randy

Link: https://lkml.kernel.org/r/20201108083732.15336-1-song.bao.hua@hisilicon.com
Signed-off-by: Barry Song <song.bao.hua@hisilicon.com>
Suggested-by: John Garry <john.garry@huawei.com>
Cc: John Hubbard <jhubbard@nvidia.com>
Cc: Ralph Campbell <rcampbell@nvidia.com>
Cc: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 mm/Kconfig |    3 +++
 1 file changed, 3 insertions(+)

--- a/mm/Kconfig~mm-gup_benchmark-gup_benchmark-depends-on-debug_fs-v2
+++ a/mm/Kconfig
@@ -841,6 +841,9 @@ config GUP_TEST
 
 	  See tools/testing/selftests/vm/gup_test.c
 
+comment "GUP_TEST needs to have DEBUG_FS enabled"
+	depends on !GUP_TEST && !DEBUG_FS
+
 config GUP_GET_PTE_LOW_HIGH
 	bool
 
_

Patches currently in -mm which might be from song.bao.hua@hisilicon.com are

mm-gup_benchmark-mark-gup_benchmark_init-as-__init-function.patch
mm-gup_benchmark-gup_benchmark-depends-on-debug_fs.patch
mm-zswap-move-to-use-crypto_acomp-api-for-hardware-acceleration.patch