On Tue, Dec 01, 2020 at 06:24:56PM +0100, Daniel Vetter wrote: > On Tue, Dec 1, 2020 at 6:22 PM Daniel Vetter <daniel@xxxxxxxx> wrote: > > > > On Tue, Dec 1, 2020 at 5:58 PM Christian König <christian.koenig@xxxxxxx> wrote: > > > > > > Hi Daniel, > > > > > > I've just pushed a minor TTM cleanup and dim is complaining that > > > drm-intel/drm-intel-gt-next merge into drm-tip failed. > > > > > > Investigating that looks like something completely unrelated and I don't > > > know the Intel code well enough to fix it myself. > > > > > > How to we proceed? > > > > Probably just someone concurrently pushing and hasn't resolved their > > conflicts yet. Best is to ask on #intel-gfx who did it to make sure it > > gets fixed. > > btw gitk --merge (and not --merges, that's a totally different knob) > in the conflicting branch is really good to figure out what's > conflicting with what and whom to blame for the mess. Looks like it > was Rodrigo and already resolved. yeap, caused by the drm-intel-fixes' cherry-picks from drm-intel-gt-next. All of them solved by simply going with the drm-intel-gt-next side. (Well, plus a silent conflict which left a duplication and broken the compilation) Sorry for any temporary inconvenience. > -Daniel > > > -Daniel > > > > > > > > Thanks, > > > Christian. > > > > > > > > -- > > Daniel Vetter > > Software Engineer, Intel Corporation > > http://blog.ffwll.ch > > > > -- > Daniel Vetter > Software Engineer, Intel Corporation > http://blog.ffwll.ch > _______________________________________________ > dri-devel mailing list > dri-devel@xxxxxxxxxxxxxxxxxxxxx > https://lists.freedesktop.org/mailman/listinfo/dri-devel _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel
