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>
---
arch/arm/mach-at91/pm.c | 5 -----
block/bfq-iosched.c | 8 --------
2 files changed, 13 deletions(-)
--- a/arch/arm/mach-at91/pm.c~linux-next-git-rejects
+++ a/arch/arm/mach-at91/pm.c
@@ -678,13 +678,8 @@ static int __init at91_pm_backup_init(vo
securam_fail:
put_device(&pdev->dev);
securam_fail_no_ref_dev:
-<<<<<<< HEAD
- iounmap(pm_data.sfrbu);
- pm_data.sfrbu = NULL;
-=======
iounmap(soc_pm.data.sfrbu);
soc_pm.data.sfrbu = NULL;
->>>>>>> linux-next/akpm-base
return ret;
}
--- a/block/bfq-iosched.c~linux-next-git-rejects
+++ a/block/bfq-iosched.c
@@ -703,15 +703,7 @@ static bool bfq_asymmetric_scenario(stru
(bfqd->busy_queues[0] && bfqd->busy_queues[2]) ||
(bfqd->busy_queues[1] && bfqd->busy_queues[2]);
-<<<<<<< HEAD
- /*
- * For queue weights to differ, queue_weights_tree must contain
- * at least two nodes.
- */
- return !(varied_queue_weights || multiple_classes_busy
-=======
return varied_queue_weights || multiple_classes_busy
->>>>>>> linux-next/akpm-base
#ifdef CONFIG_BFQ_GROUP_IOSCHED
|| bfqd->num_groups_with_pending_reqs > 0
#endif
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
ocfs2-clear-zero-in-unaligned-direct-io-checkpatch-fixes.patch
mm.patch
userfaultfd-sysctl-add-vmunprivileged_userfaultfd-fix.patch
mm-compaction-fix-an-undefined-behaviour-fix.patch
mm-enable-error-injection-at-add_to_page_cache-fix.patch
mm-memory_hotplug-provide-a-more-generic-restrictions-for-memory-hotplug-fix.patch
mm-add-probe_user_read-fix.patch
mm-maintain-randomization-of-page-free-lists-checkpatch-fixes.patch
fs-binfmt_elfc-remove-unneeded-initialization-of-mm-start_stack.patch
convert-struct-pid-count-to-refcount_t-fix.patch
linux-next-rejects.patch
scripts-atomic-check-atomicssh-dont-assume-that-scripts-are-executable.patch
mm-rename-ambiguously-named-memorystat-counters-and-functions-fix.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch
