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/pm/powerplay/hwmgr/vega10_hwmgr.c | 3 ---
drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega12_hwmgr.c | 3 ---
drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c | 7 -------
3 files changed, 13 deletions(-)
--- a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c
@@ -1546,8 +1546,6 @@ static int vega10_override_pcie_paramete
pp_table->PcieLaneCount[i] = pcie_width;
}
-<<<<<<< HEAD
-=======
if (data->registry_data.pcie_dpm_key_disabled) {
for (i = 0; i < NUM_LINK_LEVELS; i++) {
pp_table->PcieGenSpeed[i] = pcie_gen;
@@ -1555,7 +1553,6 @@ static int vega10_override_pcie_paramete
}
}
->>>>>>> linux-next/akpm-base
return 0;
}
--- a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega12_hwmgr.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega12_hwmgr.c
@@ -540,8 +540,6 @@ static int vega12_override_pcie_paramete
pp_table->PcieLaneCount[i] = pcie_width_arg;
}
-<<<<<<< HEAD
-=======
/* override to the highest if it's disabled from ppfeaturmask */
if (data->registry_data.pcie_dpm_key_disabled) {
for (i = 0; i < NUM_LINK_LEVELS; i++) {
@@ -565,7 +563,6 @@ static int vega12_override_pcie_paramete
data->smu_features[GNLD_DPM_LINK].enabled = false;
data->smu_features[GNLD_DPM_LINK].supported = false;
}
->>>>>>> linux-next/akpm-base
return 0;
}
--- a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c
@@ -879,12 +879,6 @@ static int vega20_override_pcie_paramete
"[OverridePcieParameters] Attempt to override pcie params failed!",
return ret);
}
-<<<<<<< HEAD
-
- /* update the pptable */
- pp_table->PcieGenSpeed[i] = pcie_gen_arg;
- pp_table->PcieLaneCount[i] = pcie_width_arg;
-=======
/* update the pptable */
pp_table->PcieGenSpeed[i] = pcie_gen_arg;
@@ -913,7 +907,6 @@ static int vega20_override_pcie_paramete
return ret);
data->smu_features[GNLD_DPM_LINK].enabled = false;
data->smu_features[GNLD_DPM_LINK].supported = false;
->>>>>>> linux-next/akpm-base
}
return 0;
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
mm.patch
mm-memcontrol-switch-to-rstat-fix.patch
kasan-remove-redundant-config-option-fix.patch
mmmemory_hotplug-allocate-memmap-from-the-added-memory-range-fix.patch
kernel-forkc-export-kernel_thread-to-modules.patch
