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/configs/omap2plus_defconfig | 3 ---
1 file changed, 3 deletions(-)
--- a/arch/arm/configs/omap2plus_defconfig~linux-next-git-rejects
+++ a/arch/arm/configs/omap2plus_defconfig
@@ -364,10 +364,7 @@ CONFIG_DRM_OMAP_PANEL_TPO_TD043MTEA1=m
CONFIG_DRM_OMAP_PANEL_NEC_NL8048HL11=m
CONFIG_DRM_TILCDC=m
CONFIG_DRM_PANEL_SIMPLE=m
-<<<<<<< HEAD
-=======
CONFIG_DRM_TI_TFP410=m
->>>>>>> linux-next/akpm-base
CONFIG_FB=y
CONFIG_FIRMWARE_EDID=y
CONFIG_FB_MODE_HELPERS=y
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
ocfs2-clear-zero-in-unaligned-direct-io-checkpatch-fixes.patch
fs-ocfs2-fix-possible-null-pointer-dereferences-in-ocfs2_xa_prepare_entry-fix.patch
mm-page_alloc-fix-a-crash-in-free_pages_prepare-fix.patch
mm-vmpressure-fix-a-signedness-bug-in-vmpressure_register_event-fix.patch
mm-vmpressure-fix-a-signedness-bug-in-vmpressure_register_event-fix-fix.patch
mm-slb-guarantee-natural-alignment-for-kmallocpower-of-two-fix.patch
mm.patch
mm-oom-avoid-printk-iteration-under-rcu-fix.patch
hugetlb-remove-duplicated-code-checkpatch-fixes.patch
diff-sucks.patch
drivers-tty-serial-sh-scic-suppress-warning.patch
kernel-forkc-export-kernel_thread-to-modules.patch
