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/amd/powerplay/navi10_ppt.c | 6 ------
fs/gfs2/bmap.c | 5 -----
2 files changed, 11 deletions(-)
--- a/drivers/gpu/drm/amd/powerplay/navi10_ppt.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/amd/powerplay/navi10_ppt.c
@@ -1485,8 +1485,6 @@ static int navi10_get_thermal_temperatur
return 0;
}
-<<<<<<< HEAD
-=======
static int navi10_display_disable_memory_clock_switch(struct smu_context *smu,
bool disable_memory_clock_switch)
{
@@ -1561,7 +1559,6 @@ static int navi10_get_power_limit(struct
return 0;
}
->>>>>>> linux-next/akpm-base
static const struct pptable_funcs navi10_ppt_funcs = {
.tables_init = navi10_tables_init,
.alloc_dpm_context = navi10_allocate_dpm_context,
@@ -1598,11 +1595,8 @@ static const struct pptable_funcs navi10
.get_uclk_dpm_states = navi10_get_uclk_dpm_states,
.set_performance_level = navi10_set_performance_level,
.get_thermal_temperature_range = navi10_get_thermal_temperature_range,
-<<<<<<< HEAD
-=======
.display_disable_memory_clock_switch = navi10_display_disable_memory_clock_switch,
.get_power_limit = navi10_get_power_limit,
->>>>>>> linux-next/akpm-base
};
void navi10_set_ppt_funcs(struct smu_context *smu)
--- a/fs/gfs2/bmap.c~linux-next-git-rejects
+++ a/fs/gfs2/bmap.c
@@ -1211,13 +1211,8 @@ static int gfs2_iomap_end(struct inode *
set_bit(GLF_DIRTY, &ip->i_gl->gl_flags);
out_unlock:
-<<<<<<< HEAD
- gfs2_write_unlock(inode);
-out:
-=======
if (gfs2_iomap_need_write_lock(flags))
gfs2_write_unlock(inode);
->>>>>>> linux-next/akpm-base
return 0;
}
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
fs-ocfs2-fix-possible-null-pointer-dereferences-in-ocfs2_xa_prepare_entry-fix.patch
ocfs2-clear-zero-in-unaligned-direct-io-checkpatch-fixes.patch
mm.patch
mm-introduce-page_shift-fix.patch
mm-throttle-allocators-when-failing-reclaim-over-memoryhigh-fix.patch
mm-throttle-allocators-when-failing-reclaim-over-memoryhigh-fix-fix.patch
mm-throttle-allocators-when-failing-reclaim-over-memoryhigh-fix-fix-fix.patch
mm-memory_hotplug-remove-move_pfn_range-fix.patch
mm-compaction-clear-total_migratefree_scanned-before-scanning-a-new-zone-fix-fix.patch
mm-compaction-clear-total_migratefree_scanned-before-scanning-a-new-zone-fix-2-fix.patch
mm-oom-avoid-printk-iteration-under-rcu-fix.patch
mm-oom_killer-add-task-uid-to-info-message-on-an-oom-kill-fix.patch
psi-annotate-refault-stalls-from-io-submission-fix.patch
psi-annotate-refault-stalls-from-io-submission-fix-2.patch
diff-sucks.patch
drivers-tty-serial-sh-scic-suppress-warning.patch
kernel-forkc-export-kernel_thread-to-modules.patch
