Re: [Intel-gfx] Merging TTM branches through the Intel tree?

[Daniel Vetter <daniel@ffwll.ch>]

On Wed, Jun 02, 2021 at 11:48:41AM +0200, Christian König wrote:
> 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.

Other option (because the backmerges tend to be slow) is a topic branch,
and we just eat/resolve the conflicts in both drm-misc-next and
drm-intel-gt-next in the merge commit. If it's not too bad (I haven't
looked at what exactly we need for the i915 side from ttm in detail).

But also often figuring out the topic branch logistics takes longer than
just merging to drm-misc-next as the patches get ready.
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch