From: Jani Nikula <jani.nikula@linux.intel.com>
To: "Vivi\, Rodrigo" <rodrigo.vivi@intel.com>, "Roper\,
Matthew D" <matthew.d.roper@intel.com>, "De Marchi\,
Lucas" <lucas.demarchi@intel.com>
Cc: "intel-gfx@lists.freedesktop.org" <intel-gfx@lists.freedesktop.org>
Subject: Re: [Intel-gfx] [PATCH 1/2] drm/i915/tgl: Use TGL stepping info for applying WAs
Date: Tue, 12 Jan 2021 19:39:52 +0200 [thread overview]
Message-ID: <87ft36t5p3.fsf@intel.com> (raw)
In-Reply-To: <13f8831443053efa9502c4ab35c546952ebb225e.camel@intel.com>
On Tue, 12 Jan 2021, "Vivi, Rodrigo" <rodrigo.vivi@intel.com> wrote:
> On Mon, 2021-01-11 at 13:25 -0800, Lucas De Marchi wrote:
>> last time we talked about this was regarding dg1 AFAIR and the
>> consensus was to create a topic branch and that topic branch to be
>> merged in both branches. That would avoid having 2 commits in
>> different branches.
>
> Yeap, I believe this is the way to go.
>
>>
>> Not sure if it would work out nicely for getting test on CI though.
>
> create an empty topic branch using dim.
>
> Pre-merge CI with drm-tip. Only if passing and if everything is realy
> ready. Push to the topic branch using dim.
>
> Then it will be part of drm-tip already for any subsequential pre-merge
> CI...
>
> Then do the pull requests to bot drm-intel-next and drm-intel-gt-next.
>
> After everything is pulled to both places, then delete the topic
> branch.
Atm the problem is this:
$ git merge-base drm-intel/drm-intel-next drm-intel/drm-intel-gt-next
That would be the baseline for the topic branch.
BR,
Jani.
--
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2021-01-12 17:40 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-08 23:18 [Intel-gfx] [PATCH 0/2] Use TGL stepping info and add ADLS platform changes Aditya Swarup
2021-01-08 23:18 ` [Intel-gfx] [PATCH 1/2] drm/i915/tgl: Use TGL stepping info for applying WAs Aditya Swarup
2021-01-08 23:44 ` Matt Roper
2021-01-11 20:13 ` Jani Nikula
2021-01-11 20:18 ` Jani Nikula
2021-01-11 20:57 ` Matt Roper
2021-01-11 21:25 ` Lucas De Marchi
2021-01-12 16:24 ` Jani Nikula
2021-01-12 17:16 ` Matt Roper
2021-01-12 17:33 ` Vivi, Rodrigo
2021-01-12 17:39 ` Jani Nikula [this message]
2021-01-11 22:58 ` Aditya Swarup
2021-01-12 16:32 ` Jani Nikula
2021-01-11 20:20 ` Aditya Swarup
2021-01-12 16:11 ` Jani Nikula
2021-01-12 2:04 ` Lucas De Marchi
2021-01-12 16:18 ` Jani Nikula
2021-01-08 23:18 ` [Intel-gfx] [PATCH 2/2] drm/i915/adl_s: Add ADL-S platform info and PCI ids Aditya Swarup
2021-01-09 0:20 ` Matt Roper
2021-01-11 19:37 ` Aditya Swarup
2021-01-09 2:21 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Use TGL stepping info and add ADLS platform changes Patchwork
2021-01-09 2:50 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2021-01-09 10:58 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
2021-01-11 19:29 [Intel-gfx] [PATCH 0/2] " Aditya Swarup
2021-01-11 19:29 ` [Intel-gfx] [PATCH 1/2] drm/i915/tgl: Use TGL stepping info for applying WAs Aditya Swarup
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=87ft36t5p3.fsf@intel.com \
--to=jani.nikula@linux.intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=lucas.demarchi@intel.com \
--cc=matthew.d.roper@intel.com \
--cc=rodrigo.vivi@intel.com \
/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.