Merging TTM branches through the Intel tree?

Thomas Hellström (Intel) thomas_os at shipmail.org
Wed Jun 2 09:16:01 UTC 2021


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?

Thanks,

Thomas



More information about the dri-devel mailing list