lkml.org 
[lkml]   [2022]   [Nov]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
SubjectRe: linux-next: manual merge of the drm-intel tree with Linus' tree
From
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 ?

Regards,

Hans

\
 
 \ /
  Last update: 2022-11-14 09:24    [W:0.074 / U:3.472 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site