Re: linux-next: manual merge of the amdgpu tree with the origin tree

[Mark Brown]

On Thu, Oct 29, 2026 at 10:24:43AM -0400, Alex Deucher wrote:
> On Thu, Oct 29, 2026 at 10:18 AM Mark Brown <broonie@xxxxxxxxxx> wrote:

> >         case PP_OD_EDIT_FAN_ZERO_RPM_STOP_TEMP:
> >                 od_table->OverDriveTable.FanZeroRpmStopTemp =
> >                                         boot_overdrive_table->OverDriveTable.FanZeroRpmStopTemp;
> >  +              od_table->OverDriveTable.FeatureCtrlMask |= BIT(PP_OD_FEATURE_ZERO_FAN_BIT);
> 
> I believe this should be dropped.  The FeatureCtrlMask updates are
> handled in smu_v14_0_2_od_edit_dpm_table() now.

I guess it'll get dropped from your tree in that case?  With all this
cherry picking noise I tend to assume that the amdgpu tree has the
indended state...

Attachment: signature.asc
Description: PGP signature