From: "Christian König" <christian.koenig@amd.com>
To: "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 10:32:07 +0200 [thread overview]
Message-ID: <a6965639-acf6-b5f5-482c-2715e7fa69d4@amd.com> (raw)
In-Reply-To: <a29eaef9-2457-1393-6757-40956811daf8@linux.intel.com>
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.
Am 02.06.21 um 10:26 schrieb Thomas Hellström:
> Christian, Are you OK with merging the TTM brances from the i915 TTM
> enablement series through the intel tree?
>
> Thanks,
> Thomas
>
>
WARNING: multiple messages have this Message-ID (diff)
From: "Christian König" <christian.koenig@amd.com>
To: "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 10:32:07 +0200 [thread overview]
Message-ID: <a6965639-acf6-b5f5-482c-2715e7fa69d4@amd.com> (raw)
In-Reply-To: <a29eaef9-2457-1393-6757-40956811daf8@linux.intel.com>
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.
Am 02.06.21 um 10:26 schrieb Thomas Hellström:
> Christian, Are you OK with merging the TTM brances from the i915 TTM
> enablement series through the intel tree?
>
> Thanks,
> Thomas
>
>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2021-06-02 8:32 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 [this message]
2021-06-02 8:32 ` 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
2021-06-02 9:48 ` [Intel-gfx] " 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=a6965639-acf6-b5f5-482c-2715e7fa69d4@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 \
/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.