[folded-merged] proc-convert-everything-to-struct-proc_ops-fix-2.patch removed from -mm tree

[folded-merged] proc-convert-everything-to-struct-proc_ops-fix-2.patch removed from -mm tree

[akpm]

The patch titled
     Subject: proc-convert-everything-to-struct-proc_ops-fix-2
has been removed from the -mm tree.  Its filename was
     proc-convert-everything-to-struct-proc_ops-fix-2.patch

This patch was dropped because it was folded into proc-convert-everything-to-struct-proc_ops.patch

------------------------------------------------------
From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: proc-convert-everything-to-struct-proc_ops-fix-2

fix kernel/sched/psi.c

Link: http://lkml.kernel.org/r/20200122180545.36222f50@canb.auug.org.au
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 kernel/sched/psi.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- a/kernel/sched/psi.c~proc-convert-everything-to-struct-proc_ops-fix-2
+++ a/kernel/sched/psi.c
@@ -1283,8 +1283,8 @@ static int __init psi_proc_init(void)
 	if (psi_enable) {
 		proc_mkdir("pressure", NULL);
 		proc_create("pressure/io", 0, NULL, &psi_io_proc_ops);
-		proc_create("pressure/memory", 0, NUL, &psi_memory_proc_ops);
-		proc_create("pressure/cpu", 0, NULL &psi_cpu_proc_ops);
+		proc_create("pressure/memory", 0, NULL, &psi_memory_proc_ops);
+		proc_create("pressure/cpu", 0, NULL, &psi_cpu_proc_ops);
 	}
 	return 0;
 }
_

Patches currently in -mm which might be from sfr@canb.auug.org.au are

proc-convert-everything-to-struct-proc_ops.patch