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>
---
Documentation/PCI/pci-error-recovery.rst | 3 -
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c | 3 -
drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 20 ---------
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 5 --
drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 21 ----------
drivers/hwmon/nct6775.c | 4 -
6 files changed, 56 deletions(-)
--- a/Documentation/PCI/pci-error-recovery.rst~linux-next-git-rejects
+++ a/Documentation/PCI/pci-error-recovery.rst
@@ -421,10 +421,7 @@ That is, the recovery API only requires
- drivers/net/ixgbe
- drivers/net/cxgb3
- drivers/net/s2io.c
-<<<<<<< HEAD
- drivers/net/qlge
-=======
->>>>>>> linux-next/akpm-base
The End
-------
--- a/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c
@@ -309,10 +309,7 @@ void dcn2_init_clocks(struct clk_mgr *cl
memset(&(clk_mgr->clks), 0, sizeof(struct dc_clocks));
// Assumption is that boot state always supports pstate
clk_mgr->clks.p_state_change_support = true;
-<<<<<<< HEAD
-=======
clk_mgr->clks.prev_p_state_change_support = true;
->>>>>>> linux-next/akpm-base
}
void dcn2_enable_pme_wa(struct clk_mgr *clk_mgr_base)
--- a/drivers/gpu/drm/amd/display/dc/core/dc_stream.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/amd/display/dc/core/dc_stream.c
@@ -621,27 +621,7 @@ bool dc_stream_set_dynamic_metadata(stru
pipe_ctx->stream->dmdata_address = attr->address;
-<<<<<<< HEAD
- if (pipe_ctx->stream_res.stream_enc &&
- pipe_ctx->stream_res.stream_enc->funcs->set_dynamic_metadata != NULL) {
- if (pipe_ctx->stream->dmdata_address.quad_part != 0) {
- /* if using dynamic meta, don't set up generic infopackets */
- pipe_ctx->stream_res.encoder_info_frame.hdrsmd.valid = false;
- pipe_ctx->stream_res.stream_enc->funcs->set_dynamic_metadata(
- pipe_ctx->stream_res.stream_enc,
- true, pipe_ctx->plane_res.hubp->inst,
- dc_is_dp_signal(pipe_ctx->stream->signal) ?
- dmdata_dp : dmdata_hdmi);
- } else
- pipe_ctx->stream_res.stream_enc->funcs->set_dynamic_metadata(
- pipe_ctx->stream_res.stream_enc,
- false, pipe_ctx->plane_res.hubp->inst,
- dc_is_dp_signal(pipe_ctx->stream->signal) ?
- dmdata_dp : dmdata_hdmi);
- }
-=======
dc->hwss.program_dmdata_engine(pipe_ctx);
->>>>>>> linux-next/akpm-base
if (hubp->funcs->dmdata_set_attributes != NULL &&
pipe_ctx->stream->dmdata_address.quad_part != 0) {
--- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c
@@ -1816,14 +1816,9 @@ static void dcn20_reset_back_end_for_pip
}
}
#ifdef CONFIG_DRM_AMD_DC_DSC_SUPPORT
-<<<<<<< HEAD
- else if (pipe_ctx->stream_res.dsc)
- dp_set_dsc_enable(pipe_ctx, false);
-=======
else if (pipe_ctx->stream_res.dsc) {
dp_set_dsc_enable(pipe_ctx, false);
}
->>>>>>> linux-next/akpm-base
#endif
/* by upper caller loop, parent pipe: pipe0, will be reset last.
--- a/drivers/gpu/drm/amd/powerplay/navi10_ppt.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/amd/powerplay/navi10_ppt.c
@@ -691,12 +691,6 @@ static int navi10_print_clk_levels(struc
}
} else {
ret = smu_get_dpm_freq_by_index(smu, clk_type, 0, &freq_values[0]);
-<<<<<<< HEAD
- if (ret)
- return size;
- ret = smu_get_dpm_freq_by_index(smu, clk_type, count - 1, &freq_values[2]);
-=======
->>>>>>> linux-next/akpm-base
if (ret)
return size;
ret = smu_get_dpm_freq_by_index(smu, clk_type, count - 1, &freq_values[2]);
@@ -713,21 +707,6 @@ static int navi10_print_clk_levels(struc
size += sprintf(buf + size, "%d: %uMhz %s\n", i, freq_values[i],
i == mark_index ? "*" : "");
}
-
-<<<<<<< HEAD
- freq_values[1] = cur_value;
- mark_index = cur_value == freq_values[0] ? 0 :
- cur_value == freq_values[2] ? 2 : 1;
- if (mark_index != 1)
- freq_values[1] = (freq_values[0] + freq_values[2]) / 2;
-
- for (i = 0; i < 3; i++) {
- size += sprintf(buf + size, "%d: %uMhz %s\n", i, freq_values[i],
- i == mark_index ? "*" : "");
- }
-
-=======
->>>>>>> linux-next/akpm-base
}
break;
default:
--- a/drivers/hwmon/nct6775.c~linux-next-git-rejects
+++ a/drivers/hwmon/nct6775.c
@@ -3855,11 +3855,7 @@ static int nct6775_probe(struct platform
data->REG_FAN_TIME[1] = NCT6106_REG_FAN_STEP_UP_TIME;
data->REG_FAN_TIME[2] = NCT6106_REG_FAN_STEP_DOWN_TIME;
data->REG_TOLERANCE_H = NCT6106_REG_TOLERANCE_H;
-<<<<<<< HEAD
- data->REG_PWM[0] = NCT6106_REG_PWM;
-=======
data->REG_PWM[0] = NCT6116_REG_PWM;
->>>>>>> linux-next/akpm-base
data->REG_PWM[1] = NCT6106_REG_FAN_START_OUTPUT;
data->REG_PWM[2] = NCT6106_REG_FAN_STOP_OUTPUT;
data->REG_PWM[5] = NCT6106_REG_WEIGHT_DUTY_STEP;
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
asm-generic-fix-wtype-limits-compiler-warnings-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-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
linux-next-git-rejects.patch
