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/c6x/Kconfig | 5 -----
arch/sparc/kernel/setup_64.c | 4 ----
2 files changed, 9 deletions(-)
--- a/arch/c6x/Kconfig~linux-next-git-rejects
+++ a/arch/c6x/Kconfig
@@ -13,11 +13,6 @@ config C6X
select GENERIC_ATOMIC64
select GENERIC_IRQ_SHOW
select HAVE_ARCH_TRACEHOOK
-<<<<<<< HEAD
-=======
- select HAVE_MEMBLOCK
- select NO_BOOTMEM
->>>>>>> linux-next/akpm-base
select SPARSE_IRQ
select IRQ_DOMAIN
select OF
--- a/arch/sparc/kernel/setup_64.c~linux-next-git-rejects
+++ a/arch/sparc/kernel/setup_64.c
@@ -32,12 +32,8 @@
#include <linux/initrd.h>
#include <linux/module.h>
#include <linux/start_kernel.h>
-<<<<<<< HEAD
-#include <linux/memblock.h>
-=======
#include <linux/bootmem.h>
#include <uapi/linux/mount.h>
->>>>>>> linux-next/akpm-base
#include <asm/io.h>
#include <asm/processor.h>
_
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
memory_hotplug-free-pages-as-higher-order-fix.patch
list_lru-prefetch-neighboring-list-entries-before-acquiring-lock-fix.patch
ipc-allow-boot-time-extension-of-ipcmni-from-32k-to-8m-checkpatch-fixes.patch
linux-next-rejects.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch
linux-next-git-rejects.patch
