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/gpu/drm/sun4i/sun8i_mixer.c | 6 ------
1 file changed, 6 deletions(-)
--- a/drivers/gpu/drm/sun4i/sun8i_mixer.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/sun4i/sun8i_mixer.c
@@ -553,8 +553,6 @@ static const struct sun8i_mixer_cfg sun8
.mod_rate = 150000000,
};
-<<<<<<< HEAD
-=======
static const struct sun8i_mixer_cfg sun50i_a64_mixer0_cfg = {
.ccsc = 0,
.mod_rate = 297000000,
@@ -571,7 +569,6 @@ static const struct sun8i_mixer_cfg sun5
.vi_num = 1,
};
->>>>>>> linux-next/akpm-base
static const struct of_device_id sun8i_mixer_of_table[] = {
{
.compatible = "allwinner,sun8i-a83t-de2-mixer-0",
@@ -588,8 +585,6 @@ static const struct of_device_id sun8i_m
{
.compatible = "allwinner,sun8i-v3s-de2-mixer",
.data = &sun8i_v3s_mixer_cfg,
-<<<<<<< HEAD
-=======
},
{
.compatible = "allwinner,sun50i-a64-de2-mixer-0",
@@ -598,7 +593,6 @@ static const struct of_device_id sun8i_m
{
.compatible = "allwinner,sun50i-a64-de2-mixer-1",
.data = &sun50i_a64_mixer1_cfg,
->>>>>>> linux-next/akpm-base
},
{ }
};
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
fix-crash-on-ocfs2_duplicate_clusters_by_page-v5-checkpatch-fixes.patch
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-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
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch
