All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Christian König" <christian.koenig@amd.com>
To: "Thomas Hellström (Intel)" <thomas_os@shipmail.org>,
	"Thomas Hellström" <thomas.hellstrom@linux.intel.com>,
	"DRI Development" <dri-devel@lists.freedesktop.org>,
	"Intel Graphics Development" <intel-gfx@lists.freedesktop.org>
Cc: Matthew Auld <matthew.auld@intel.com>
Subject: Re: Merging TTM branches through the Intel tree?
Date: Wed, 2 Jun 2021 11:48:41 +0200	[thread overview]
Message-ID: <baf4f828-76c8-6b47-5bba-9b9c8e7b307b@amd.com> (raw)
In-Reply-To: <b4c18e45-98c9-ce7f-b22c-c00c795844c2@shipmail.org>

Am 02.06.21 um 11:16 schrieb Thomas Hellström (Intel):
>
> On 6/2/21 10:32 AM, Christian König wrote:
>> Uff I'm just waiting for feedback from Philip to merge a large patch 
>> set for TTM through drm-misc-next.
>>
>> I'm pretty sure we will run into merge conflicts if you try to push 
>> your changes through the Intel tree.
>>
>> Christian.
>
> OK, so what would be the best approach here?, Adding the TTM patches 
> to drm-misc-next when your set has landed?

I think I will send out out my set to Matthew once more for review, then 
push the common TTM stuff to drm-misc-next as much as possible.

Then you should be able to land your stuff to drm-misc-next and rebase 
on the end result.

Just need to note to David that drm-misc-next should be merged to 
drm-next before the Intel patches depending on that stuff land as well.

Christian.

>
> Thanks,
>
> Thomas
>


WARNING: multiple messages have this Message-ID (diff)
From: "Christian König" <christian.koenig@amd.com>
To: "Thomas Hellström (Intel)" <thomas_os@shipmail.org>,
	"Thomas Hellström" <thomas.hellstrom@linux.intel.com>,
	"DRI Development" <dri-devel@lists.freedesktop.org>,
	"Intel Graphics Development" <intel-gfx@lists.freedesktop.org>
Cc: Matthew Auld <matthew.auld@intel.com>
Subject: Re: [Intel-gfx] Merging TTM branches through the Intel tree?
Date: Wed, 2 Jun 2021 11:48:41 +0200	[thread overview]
Message-ID: <baf4f828-76c8-6b47-5bba-9b9c8e7b307b@amd.com> (raw)
In-Reply-To: <b4c18e45-98c9-ce7f-b22c-c00c795844c2@shipmail.org>

Am 02.06.21 um 11:16 schrieb Thomas Hellström (Intel):
>
> On 6/2/21 10:32 AM, Christian König wrote:
>> Uff I'm just waiting for feedback from Philip to merge a large patch 
>> set for TTM through drm-misc-next.
>>
>> I'm pretty sure we will run into merge conflicts if you try to push 
>> your changes through the Intel tree.
>>
>> Christian.
>
> OK, so what would be the best approach here?, Adding the TTM patches 
> to drm-misc-next when your set has landed?

I think I will send out out my set to Matthew once more for review, then 
push the common TTM stuff to drm-misc-next as much as possible.

Then you should be able to land your stuff to drm-misc-next and rebase 
on the end result.

Just need to note to David that drm-misc-next should be merged to 
drm-next before the Intel patches depending on that stuff land as well.

Christian.

>
> Thanks,
>
> Thomas
>

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

  reply	other threads:[~2021-06-02  9:48 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-02  8:26 Merging TTM branches through the Intel tree? Thomas Hellström
2021-06-02  8:26 ` [Intel-gfx] " Thomas Hellström
2021-06-02  8:32 ` Christian König
2021-06-02  8:32   ` [Intel-gfx] " Christian König
2021-06-02  9:16   ` Thomas Hellström (Intel)
2021-06-02  9:16     ` [Intel-gfx] " Thomas Hellström (Intel)
2021-06-02  9:48     ` Christian König [this message]
2021-06-02  9:48       ` Christian König
2021-06-02 18:40       ` Daniel Vetter
2021-06-02 18:40         ` Daniel Vetter
2021-06-03  6:50         ` Thomas Hellström
2021-06-03  6:50           ` Thomas Hellström
2021-06-03  7:36           ` Daniel Vetter
2021-06-03  7:36             ` Daniel Vetter
2021-06-04  7:51             ` Christian König
2021-06-04  7:51               ` Christian König
2021-06-04  9:01               ` Thomas Hellström
2021-06-04  9:01                 ` Thomas Hellström
2021-06-04  9:12                 ` Daniel Vetter
2021-06-04  9:12                   ` Daniel Vetter
2021-06-04 13:38                   ` Christian König
2021-06-04 13:38                     ` Christian König
2021-06-04 14:03                     ` Thomas Hellström
2021-06-04 14:03                       ` Thomas Hellström
2021-06-04 14:06                       ` Christian König
2021-06-04 14:06                         ` Christian König
2021-06-04 14:11                         ` Thomas Hellström
2021-06-04 14:11                           ` Thomas Hellström
2021-06-04 14:14                           ` Christian König
2021-06-04 14:14                             ` Christian König

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=baf4f828-76c8-6b47-5bba-9b9c8e7b307b@amd.com \
    --to=christian.koenig@amd.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=matthew.auld@intel.com \
    --cc=thomas.hellstrom@linux.intel.com \
    --cc=thomas_os@shipmail.org \
    /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.