[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <57f57c29-cf48-67c1-b6b3-0e50e7105031@redhat.com>
Date: Mon, 14 Nov 2022 11:35:57 +0100
From: Hans de Goede <hdegoede@...hat.com>
To: Jani Nikula <jani.nikula@...ux.intel.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
Hi,
On 11/14/22 11:10, Jani Nikula wrote:
> 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?
Right what I was trying to say is that I am surprised that 6.1-rc1 has not
been back-merged into drm-intel yet even though it has been released
4 weeks ago.
I thought it was more or less standard process to backmerge rc1 soon after
it is released ?
Regards,
Hans
Powered by blists - more mailing lists