Dim blowing up in my face

[Daniel Vetter]

On Tue, Dec 1, 2020 at 6:22 PM Daniel Vetter <daniel at ffwll.ch> wrote:
>
> On Tue, Dec 1, 2020 at 5:58 PM Christian König <christian.koenig at amd.com> 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.
-Daniel

> -Daniel
>
> >
> > Thanks,
> > Christian.
>
>
>
> --
> Daniel Vetter
> Software Engineer, Intel Corporation
> http://blog.ffwll.ch



-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch