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>
---
drivers/md/md.h | 3 ---
drivers/md/raid5-cache.c | 4 ----
2 files changed, 7 deletions(-)
diff -puN drivers/md/md.h~linux-next-git-rejects drivers/md/md.h
--- a/drivers/md/md.h~linux-next-git-rejects
+++ a/drivers/md/md.h
@@ -710,9 +710,6 @@ static inline void mddev_clear_unsupport
{
mddev->flags &= ~unsupported_flags;
}
-<<<<<<< HEAD
-=======
extern void md_writesame_setup(struct mddev *mddev, struct bio *bio);
->>>>>>> linux-next/akpm-base
#endif /* _MD_MD_H */
diff -puN drivers/md/raid5-cache.c~linux-next-git-rejects drivers/md/raid5-cache.c
--- a/drivers/md/raid5-cache.c~linux-next-git-rejects
+++ a/drivers/md/raid5-cache.c
@@ -2499,11 +2499,7 @@ void r5c_finish_stripe_write_out(struct
if (do_wakeup)
wake_up(&conf->wait_for_overlap);
-<<<<<<< HEAD
- spin_lock_irq(&conf->log->stripe_in_journal_lock);
-=======
spin_lock_irq(&log->stripe_in_journal_lock);
->>>>>>> linux-next/akpm-base
list_del_init(&sh->r5c);
spin_unlock_irq(&log->stripe_in_journal_lock);
sh->log_start = MaxSector;
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
i-need-old-gcc.patch
mm-respect-foll_force-foll_cow-for-thp-checkpatch-fixes.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
ocfs2-old-mle-put-and-release-after-the-function-dlm_add_migration_mle-called-fix.patch
kernel-watchdog-prevent-false-hardlockup-on-overloaded-system-fix.patch
mm.patch
mm-throttle-show_mem-from-warn_alloc-fix.patch
linux-kernelh-fix-div_round_closest-to-support-negative-divisors-fix.patch
linux-next-rejects.patch
reimplement-idr-and-ida-using-the-radix-tree-support-storing-null-in-the-idr-checkpatch-fixes.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
