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

Jani Nikula
2022-11-14T10:12:54Z

On Mon, 14 Nov 2022, Hans de Goede <hdegoede@redhat.com> wrote:
> Hi,
>
> On 11/14/22 00:23, Stephen Rothwell wrote:
>> Hi all,
>>
>> Today's linux-next merge of the drm-intel tree got a conflict in:
>>
>> drivers/gpu/drm/i915/display/intel_backlight.c
>>
>> between commit:
>>
>> b1d36e73cc1c ("drm/i915: Don't register backlight when another backlight should be used (v2)")
>>
>> from Linus' tree and commit:
>>
>> 801543b2593b ("drm/i915: stop including i915_irq.h from i915_trace.h")
>>
>> from the drm-intel tree.
>
> This is weird, because the:
>
> b1d36e73cc1c ("drm/i915: Don't register backlight when another backlight should be used (v2)")
>
> commit is in 6.1-rc1, so there can only be a conflict it 6.1-rc1 has not
> been back-merged into drm-intel yet ?

That's the reason it *is* a conflict, right?

BR,
Jani.

--
Jani Nikula, Intel Open Source Graphics Center