On Wed Jul 1, 2026 at 5:56 PM CEST, Thomas Hellström wrote: > Hi Danilo, > > On Tue, 2026-06-30 at 16:33 +0200, Danilo Krummrich wrote: >> On Tue Jun 30, 2026 at 4:26 PM CEST, Matthew Brost wrote: >> > If we merge the patches in drm-xe-next and pick them up via a >> > rebase in the >> > AMD trees, that works. >> >> IIUC what your are proposing this will create duplicate commits, >> which should be >> avoided. >> >> If the series is needed in multiple trees it is better to pick a >> common base and >> share via a tag that can be merged in all relevant trees. > > Our standard workflow if we need commits merged elsewhere in the DRM > tree is to wait for it to appear in drm-next and then backmerge drm- > next into our branch. It sounds like that's what Matthew is proposing > here? And it wouldn't create duplicate commits?
Sure, that works. But "merge in tree A and pick up via rebase in tree B" would create duplicate commits, which we should avoid.
