The patch titled
Subject: linux-next-git-rejects
has been added to the -mm tree. Its filename is
linux-next-git-rejects.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/linux-next-git-rejects.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/linux-next-git-rejects.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: linux-next-git-rejects
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/mips/lib/memset.S | 5 -----
arch/s390/kernel/swsusp.S | 6 ------
drivers/s390/char/sclp_early_core.c | 3 ---
3 files changed, 14 deletions(-)
diff -puN arch/mips/lib/memset.S~linux-next-git-rejects arch/mips/lib/memset.S
--- a/arch/mips/lib/memset.S~linux-next-git-rejects
+++ a/arch/mips/lib/memset.S
@@ -286,11 +286,6 @@
PTR_SUBU a2, t1, a0
PTR_ADDIU a2, 1
jr ra
-<<<<<<< HEAD
- .set noreorder
-=======
->>>>>>> linux-next/akpm-base
-
.endm
/*
diff -puN arch/s390/kernel/swsusp.S~linux-next-git-rejects arch/s390/kernel/swsusp.S
--- a/arch/s390/kernel/swsusp.S~linux-next-git-rejects
+++ a/arch/s390/kernel/swsusp.S
@@ -198,13 +198,7 @@ pgm_check_entry:
brc 2,3b /* busy, try again */
/* Suspend CPU not available -> panic */
-<<<<<<< HEAD
- larl %r15,init_thread_union
- aghi %r15,1<<(PAGE_SHIFT+THREAD_SIZE_ORDER)
- aghi %r15,-STACK_FRAME_OVERHEAD
-=======
larl %r15,init_thread_union+THREAD_SIZE-STACK_FRAME_OVERHEAD
->>>>>>> linux-next/akpm-base
larl %r2,.Lpanic_string
brasl %r14,sclp_early_printk_force
larl %r3,.Ldisabled_wait_31
diff -puN drivers/s390/char/sclp_early_core.c~linux-next-git-rejects drivers/s390/char/sclp_early_core.c
--- a/drivers/s390/char/sclp_early_core.c~linux-next-git-rejects
+++ a/drivers/s390/char/sclp_early_core.c
@@ -237,8 +237,6 @@ void sclp_early_printk(const char *str)
void sclp_early_printk_force(const char *str)
{
__sclp_early_printk(str, strlen(str), 1);
-<<<<<<< HEAD
-=======
}
int __init sclp_early_read_info(void)
@@ -351,5 +349,4 @@ int __init sclp_early_read_storage_info(
fail:
mem_detect.count = 0;
return -EIO;
->>>>>>> linux-next/akpm-base
}
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
fix-clusters-leak-in-ocfs2_defrag_extent-fix.patch
mm.patch
mmpage_alloc-pf_wq_worker-threads-must-sleep-at-should_reclaim_retry-fix.patch
sched-loadavg-consolidate-load_int-load_frac-calc_load-fix.patch
mm-workingset-add-vmstat-counter-for-shadow-nodes-fix.patch
mm-mremap-downgrade-mmap_sem-to-read-when-shrinking-fix.patch
mm-brk-downgrade-mmap_sem-to-read-when-shrinking-fix.patch
mm-calculate-deferred-pages-after-skipping-mirrored-memory-fix.patch
list_lru-prefetch-neighboring-list-entries-before-acquiring-lock-fix.patch
lib-bitmapc-fix-remaining-space-computation-in-bitmap_print_to_pagebuf-fix.patch
lib-bitmapc-fix-remaining-space-computation-in-bitmap_print_to_pagebuf-fix-fix.patch
ipc-allow-boot-time-extension-of-ipcmni-from-32k-to-8m-checkpatch-fixes.patch
linux-next-rejects.patch
memblock-stop-using-implicit-alignement-to-smp_cache_bytes-checkpatch-fixes.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch
linux-next-git-rejects.patch
