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>
---
fs/btrfs/reflink.c | 4 ----
1 file changed, 4 deletions(-)
--- a/fs/btrfs/reflink.c~linux-next-git-rejects
+++ a/fs/btrfs/reflink.c
@@ -567,11 +567,7 @@ process_slot:
set_bit(BTRFS_INODE_NEEDS_FULL_SYNC,
&BTRFS_I(inode)->runtime_flags);
-<<<<<<< HEAD
- ret = btrfs_replace_file_extents(inode, path, last_dest_end,
-=======
ret = btrfs_replace_file_extents(BTRFS_I(inode), path, last_dest_end,
->>>>>>> linux-next/akpm-base
destoff + len - 1, NULL, &trans);
if (ret)
goto out;
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
mm-page_allocc-refactor-initialization-of-struct-page-for-holes-in-memory-layout-fix.patch
mm.patch
mm-vmstat-fix-proc-sys-vm-stat_refresh-generating-false-warnings-fix-2.patch
kernel-forkc-export-kernel_thread-to-modules.patch
