The patch titled
Subject: linux-next-git-rejects
has been removed from the -mm tree. Its filename was
linux-next-git-rejects.patch
This patch was dropped because it is obsolete
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: linux-next-git-rejects
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
net/sunrpc/debugfs.c | 4 ----
1 file changed, 4 deletions(-)
--- a/net/sunrpc/debugfs.c~linux-next-git-rejects
+++ a/net/sunrpc/debugfs.c
@@ -160,9 +160,6 @@ rpc_clnt_debugfs_register(struct rpc_cln
debugfs_create_file("tasks", S_IFREG | 0400, clnt->cl_debugfs, clnt,
&tasks_fops);
-<<<<<<< HEAD
- rpc_clnt_iterate_for_each_xprt(clnt, do_xprt_debugfs, &xprtnum);
-=======
if (rpc_clnt_iterate_for_each_xprt(clnt, do_xprt_debugfs, &xprtnum) < 0)
goto out_err;
@@ -170,7 +167,6 @@ rpc_clnt_debugfs_register(struct rpc_cln
out_err:
debugfs_remove_recursive(clnt->cl_debugfs);
clnt->cl_debugfs = NULL;
->>>>>>> linux-next/akpm-base
}
void
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
ocfs2-clear-zero-in-unaligned-direct-io-checkpatch-fixes.patch
mm.patch
mm-oom_killer-add-task-uid-to-info-message-on-an-oom-kill-fix.patch
diff-sucks.patch
drivers-tty-serial-sh-scic-suppress-warning.patch
kernel-forkc-export-kernel_thread-to-modules.patch
