Re: linux-next: manual merge of the drm-intel tree with Linus' tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi,

On 9/8/20 1:04 PM, Stephen Rothwell wrote:
Hi Hans,

On Tue, 8 Sep 2020 10:22:06 +0200 Hans de Goede <hdegoede@xxxxxxxxxx> wrote:

On 9/8/20 6:00 AM, Stephen Rothwell wrote:

Today's linux-next merge of the drm-intel tree got a conflict in:

    drivers/gpu/drm/i915/display/intel_panel.c

between commit:

    f8bd54d21904 ("drm/i915: panel: Use atomic PWM API for devs with an external PWM controller")

This should have been

   899c537c25f9 ("drm/i915: Use 64-bit division macro")

Yes that makes more sense.

from Linus' tree and commit:

    6b51e7d23aa8 ("drm/i915: panel: Honor the VBT PWM frequency for devs with an external PWM controller")

That doesn't sound correct, those are both commits from the drm-intel tree.

from the drm-intel tree.

I fixed it up (I just used the latter)

Just taking the drivers/gpu/drm/i915/display/intel_panel.c contents of:

f8bd54d21904 ("drm/i915: panel: Use atomic PWM API for devs with an external PWM controller")

Is the right thing to do, the problem is a difference in a line which gets
removed in that commit.

Which is what I actually did, I guess :-)

Yes, looks good.

Sorry about that.

No problem and thank you for all the work you do on -next.

Regards,

Hans




[Index of Archives]     [Linux Kernel]     [Linux USB Development]     [Yosemite News]     [Linux SCSI]

  Powered by Linux