(Not) Merging fixes into next

Posted Jan 19, 2025 10:29 UTC (Sun) by geert (subscriber, #98403)
In reply to: (Not) Merging fixes into next by sima
Parent article: The many names of commit 55039832f98c

> This is another issue we've solved almost a decade ago with drm-tip: https://drm.pages.freedesktop.org/maintainer-tools/drm-ti... it both contains the merged tree of a pile of drm branches, and separate branches with fixups patches and git rerere solutions.

Thanks a lot!

I had heard DRM committers have access to shared rerere-resolutions, but didn't know the details (and didn't find it appropriate to ask for DRM commit access just for that ;-) How do you make git consider that branch for resolutions? Is having it as a remote sufficiently, or do you need extra setup or magic? The drm-tip and dim documentation do not describe how it works (not using dim).

I didn't know about drm-tip.
Will give it a try for next renesas-drivers release.

> At a ks years ago I think I was discussing with Stephen whether there's any interesting in sharing these in a standardized format, but there was no interest apparently.

Not everybody is at the Kernel Summit. And even if they are, they might miss that session/information...

(Not) Merging fixes into next

Posted Jan 20, 2025 9:00 UTC (Mon) by sima (subscriber, #160698) [Link]

I think dim does some normalization of branch names (which git puts into the stored resolutions) in the rerere branch to make sure they transfer better. But we've had issues in the past where different git versions aren't entirely compatible due to changes in the merge and diff algorithms iirc. We put in minimal git version checks when we discovered these, but I think hasn't happened in years. So it's not perfect and needed some hacks to make it work reasonably well.

(Not) Merging fixes into next

Posted Jan 20, 2025 9:09 UTC (Mon) by sima (subscriber, #160698) [Link]

Oh and forgot to add for the setup, dim setup adjusts .git/rr-cache to be a symlink to a checkout of that branch for the git tree that does the drm-tip rebuilding.