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/s390/block/dasd.c | 5 -----
1 file changed, 5 deletions(-)
diff -puN drivers/s390/block/dasd.c~linux-next-git-rejects drivers/s390/block/dasd.c
--- a/drivers/s390/block/dasd.c~linux-next-git-rejects
+++ a/drivers/s390/block/dasd.c
@@ -3918,10 +3918,6 @@ static int dasd_generic_requeue_all_requ
cqr = refers;
}
-<<<<<<< HEAD
- if (cqr->block)
- list_del_init(&cqr->blocklist);
-=======
/*
* _dasd_requeue_request already checked for a valid
* blockdevice, no need to check again
@@ -3929,7 +3925,6 @@ static int dasd_generic_requeue_all_requ
* pointer copy from the original cqr
*/
list_del_init(&cqr->blocklist);
->>>>>>> linux-next/akpm-base
cqr->block->base->discipline->free_cp(
cqr, (struct request *) cqr->callback_data);
}
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
i-need-old-gcc.patch
mm-memblock-hardcode-the-end_pfn-being-1-fix.patch
mm-memblock-hardcode-the-end_pfn-being-1-fix-fix.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
ocfs2-without-quota-support-try-to-avoid-calling-quota-recovery-checkpatch-fixes.patch
mm.patch
mm-initialize-pages-on-demand-during-boot-fix-4-fix.patch
mm-page_alloc-skip-over-regions-of-invalid-pfns-on-uma-fix.patch
direct-io-minor-cleanups-in-do_blockdev_direct_io-fix.patch
mm-fix-races-between-swapoff-and-flush-dcache-fix.patch
list_lru-prefetch-neighboring-list-entries-before-acquiring-lock-fix.patch
mm-oom-cgroup-aware-oom-killer-fix.patch
mm-oom-docs-describe-the-cgroup-aware-oom-killer-fix-2-fix.patch
proc-add-seq_put_decimal_ull_width-to-speed-up-proc-pid-smaps-fix.patch
vsprintf-remove-accidental-vla-usage-fix.patch
sysctl-add-flags-to-support-min-max-range-clamping-fix.patch
linux-next-rejects.patch
linux-next-fixup.patch
drivers-gpu-drm-i915-intel_guc_logc-work-around-gcc-444-union-initializer-issue.patch
fs-fsnotify-account-fsnotify-metadata-to-kmemcg-fix.patch
headers-untangle-kmemleakh-from-mmh-fix.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
