From: Hans de Goede <hdegoede@redhat.com>
To: Jani Nikula <jani.nikula@linux.intel.com>,
Stephen Rothwell <sfr@canb.auug.org.au>,
Daniel Vetter <daniel.vetter@ffwll.ch>,
Joonas Lahtinen <joonas.lahtinen@linux.intel.com>,
Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Intel Graphics <intel-gfx@lists.freedesktop.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
DRI <dri-devel@lists.freedesktop.org>
Subject: Re: linux-next: manual merge of the drm-intel tree with Linus' tree
Date: Mon, 14 Nov 2022 11:35:57 +0100 [thread overview]
Message-ID: <57f57c29-cf48-67c1-b6b3-0e50e7105031@redhat.com> (raw)
In-Reply-To: <87cz9p4zj6.fsf@intel.com>
Hi,
On 11/14/22 11:10, Jani Nikula wrote:
> 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?
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
WARNING: multiple messages have this Message-ID (diff)
From: Hans de Goede <hdegoede@redhat.com>
To: Jani Nikula <jani.nikula@linux.intel.com>,
Stephen Rothwell <sfr@canb.auug.org.au>,
Daniel Vetter <daniel.vetter@ffwll.ch>,
Joonas Lahtinen <joonas.lahtinen@linux.intel.com>,
Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Intel Graphics <intel-gfx@lists.freedesktop.org>,
DRI <dri-devel@lists.freedesktop.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the drm-intel tree with Linus' tree
Date: Mon, 14 Nov 2022 11:35:57 +0100 [thread overview]
Message-ID: <57f57c29-cf48-67c1-b6b3-0e50e7105031@redhat.com> (raw)
In-Reply-To: <87cz9p4zj6.fsf@intel.com>
Hi,
On 11/14/22 11:10, Jani Nikula wrote:
> 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?
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
WARNING: multiple messages have this Message-ID (diff)
From: Hans de Goede <hdegoede@redhat.com>
To: Jani Nikula <jani.nikula@linux.intel.com>,
Stephen Rothwell <sfr@canb.auug.org.au>,
Daniel Vetter <daniel.vetter@ffwll.ch>,
Joonas Lahtinen <joonas.lahtinen@linux.intel.com>,
Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Intel Graphics <intel-gfx@lists.freedesktop.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
DRI <dri-devel@lists.freedesktop.org>
Subject: Re: [Intel-gfx] linux-next: manual merge of the drm-intel tree with Linus' tree
Date: Mon, 14 Nov 2022 11:35:57 +0100 [thread overview]
Message-ID: <57f57c29-cf48-67c1-b6b3-0e50e7105031@redhat.com> (raw)
In-Reply-To: <87cz9p4zj6.fsf@intel.com>
Hi,
On 11/14/22 11:10, Jani Nikula wrote:
> 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?
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
next prev parent reply other threads:[~2022-11-14 10:36 UTC|newest]
Thread overview: 114+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-13 23:23 linux-next: manual merge of the drm-intel tree with Linus' tree Stephen Rothwell
2022-11-13 23:23 ` [Intel-gfx] " Stephen Rothwell
2022-11-13 23:23 ` Stephen Rothwell
2022-11-14 8:19 ` Hans de Goede
2022-11-14 8:19 ` Hans de Goede
2022-11-14 8:19 ` [Intel-gfx] " Hans de Goede
2022-11-14 10:10 ` Jani Nikula
2022-11-14 10:10 ` Jani Nikula
2022-11-14 10:10 ` [Intel-gfx] " Jani Nikula
2022-11-14 10:35 ` Hans de Goede [this message]
2022-11-14 10:35 ` Hans de Goede
2022-11-14 10:35 ` Hans de Goede
2022-11-14 11:02 ` Jani Nikula
2022-11-14 11:02 ` [Intel-gfx] " Jani Nikula
2022-11-14 11:02 ` Jani Nikula
2022-11-14 19:29 ` [Intel-gfx] " Rodrigo Vivi
2022-11-14 19:29 ` Rodrigo Vivi
-- strict thread matches above, loose matches on Subject: below --
2024-01-09 0:22 Stephen Rothwell
2024-01-09 0:22 ` Stephen Rothwell
2023-11-22 0:51 Stephen Rothwell
2023-11-22 0:51 ` Stephen Rothwell
2023-11-22 1:10 ` Stephen Rothwell
2023-11-22 1:10 ` Stephen Rothwell
2023-03-06 23:09 Stephen Rothwell
2023-03-06 23:09 ` Stephen Rothwell
2022-10-17 22:05 Stephen Rothwell
2022-10-17 22:05 ` Stephen Rothwell
2022-06-07 23:59 Stephen Rothwell
2022-06-07 23:59 ` Stephen Rothwell
2022-06-07 23:53 Stephen Rothwell
2022-06-07 23:53 ` Stephen Rothwell
2022-04-05 1:00 Stephen Rothwell
2022-04-05 1:00 ` Stephen Rothwell
2022-04-05 0:53 Stephen Rothwell
2022-04-05 0:53 ` Stephen Rothwell
2022-01-24 22:39 Stephen Rothwell
2022-01-24 22:39 ` Stephen Rothwell
2022-01-24 22:33 Stephen Rothwell
2022-01-24 22:33 ` Stephen Rothwell
2021-08-02 15:29 Mark Brown
2021-05-20 0:19 Stephen Rothwell
2021-05-20 0:19 ` Stephen Rothwell
2021-05-21 1:45 ` Stephen Rothwell
2021-05-21 1:45 ` Stephen Rothwell
2021-05-12 0:28 Stephen Rothwell
2021-05-12 0:28 ` Stephen Rothwell
2020-09-08 4:00 Stephen Rothwell
2020-09-08 4:00 ` Stephen Rothwell
2020-09-08 8:22 ` Hans de Goede
2020-09-08 8:22 ` Hans de Goede
2020-09-08 11:04 ` Stephen Rothwell
2020-09-08 11:04 ` Stephen Rothwell
2020-09-08 13:20 ` Hans de Goede
2020-09-08 13:20 ` Hans de Goede
2020-06-23 1:35 Stephen Rothwell
2020-06-23 1:35 ` Stephen Rothwell
2018-03-22 2:21 Stephen Rothwell
2018-03-22 2:21 ` Stephen Rothwell
2018-03-23 0:50 ` Stephen Rothwell
2018-03-23 0:50 ` Stephen Rothwell
2017-09-19 1:42 Stephen Rothwell
2016-09-16 0:38 Stephen Rothwell
2016-09-16 0:38 ` Stephen Rothwell
2016-09-08 2:08 Stephen Rothwell
2016-09-08 2:08 ` Stephen Rothwell
2016-05-31 1:06 Stephen Rothwell
2016-05-31 1:06 ` Stephen Rothwell
2016-05-31 1:00 Stephen Rothwell
2016-05-31 1:00 ` Stephen Rothwell
2015-12-22 1:03 Stephen Rothwell
2015-12-22 1:03 ` Stephen Rothwell
2015-11-19 0:23 Stephen Rothwell
2015-11-19 0:23 ` Stephen Rothwell
2015-09-29 1:20 Stephen Rothwell
2015-09-29 1:20 ` Stephen Rothwell
2015-09-29 1:20 Stephen Rothwell
2015-09-29 1:20 ` Stephen Rothwell
2015-09-17 0:13 Stephen Rothwell
2015-09-17 0:13 ` Stephen Rothwell
2015-07-09 1:02 Stephen Rothwell
2015-07-09 1:02 ` Stephen Rothwell
2015-04-29 1:15 Stephen Rothwell
2015-04-29 1:15 ` Stephen Rothwell
2014-09-08 4:32 Stephen Rothwell
2014-09-08 4:32 ` Stephen Rothwell
2013-12-18 2:50 Stephen Rothwell
2013-12-18 2:50 ` Stephen Rothwell
2013-12-13 0:58 Stephen Rothwell
2013-12-13 0:58 ` Stephen Rothwell
2013-09-18 1:25 Stephen Rothwell
2013-09-18 1:25 ` Stephen Rothwell
2013-09-18 1:20 Stephen Rothwell
2013-09-18 1:20 ` Stephen Rothwell
2013-06-26 3:54 Stephen Rothwell
2013-06-26 3:54 ` Stephen Rothwell
2013-06-17 3:32 Stephen Rothwell
2013-06-17 3:32 ` Stephen Rothwell
2013-06-17 3:25 Stephen Rothwell
2013-06-17 3:25 ` Stephen Rothwell
2013-05-21 1:58 Stephen Rothwell
2013-05-21 1:58 ` Stephen Rothwell
2013-05-07 1:27 Stephen Rothwell
2013-05-07 1:27 ` Stephen Rothwell
2013-05-07 8:43 ` Daniel Vetter
2013-05-07 8:43 ` Daniel Vetter
2013-05-08 0:11 ` Stephen Rothwell
2013-05-08 0:11 ` Stephen Rothwell
2013-04-03 2:43 Stephen Rothwell
2013-04-03 2:43 ` Stephen Rothwell
2013-04-03 8:31 ` Daniel Vetter
2013-04-02 2:46 Stephen Rothwell
2013-04-02 2:46 ` Stephen Rothwell
2013-03-04 23:23 Stephen Rothwell
2013-03-04 23:23 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=57f57c29-cf48-67c1-b6b3-0e50e7105031@redhat.com \
--to=hdegoede@redhat.com \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jani.nikula@linux.intel.com \
--cc=joonas.lahtinen@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rodrigo.vivi@intel.com \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.