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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <87cz9p4zj6.fsf@intel.com>
Date:   Mon, 14 Nov 2022 12:10:37 +0200
From:   Jani Nikula <jani.nikula@...ux.intel.com>
To:     Hans de Goede <hdegoede@...hat.com>,
        Stephen Rothwell <sfr@...b.auug.org.au>,
        Daniel Vetter <daniel.vetter@...ll.ch>,
        Joonas Lahtinen <joonas.lahtinen@...ux.intel.com>,
        Rodrigo Vivi <rodrigo.vivi@...el.com>
Cc:     Intel Graphics <intel-gfx@...ts.freedesktop.org>,
        DRI <dri-devel@...ts.freedesktop.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the drm-intel tree with Linus' tree

On Mon, 14 Nov 2022, Hans de Goede <hdegoede@...hat.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