On Tue, 19 May 2026 12:37:16 +0100 Mark Brown <[email protected]> wrote:
> On Mon, May 18, 2026 at 04:52:25PM +0200, Boris Brezillon wrote: > > +Mark for the silent conflict resolution needed to reconcile > > drm-misc-fixes and drm-next/drm-misc-next. > > This doesn't appear to be a drm-misc thing, I was seeing issues on the > DRM tree. The patch does seem to ahve resolved things though. Please > consider topic branches! I'm just following the dim guide for resolution of conflicts between drm trees[1], so that's probably something to discuss with the DRM/DRM-misc maintainers. As for the suggestion to use topic branches, I've never heard of it being used for -fixes vs -next conflict resolution, every time I've gone through this process it was for xxx-next vs yyy-next conflict (xxx and yyy being different subsystem trees). Maxime, Thomas, Maarteen, Sima and/or Dave, any suggestion/opinion? [1]https://drm.pages.freedesktop.org/maintainer-tools/committer/conflict-resolution.html
