From: Rodrigo Vivi <rodrigo.vivi@intel.com>
To: Daniel Vetter <daniel@ffwll.ch>
Cc: "Christian König" <christian.koenig@amd.com>,
"dri-devel@lists.freedesktop.org"
<dri-devel@lists.freedesktop.org>
Subject: Re: Dim blowing up in my face
Date: Tue, 1 Dec 2020 17:26:07 -0800 [thread overview]
Message-ID: <20201202012607.GA1383659@intel.com> (raw)
In-Reply-To: <CAKMK7uG7xt7N265oi+HnWJkKU=B3TWfW4CWs-PAPVhiEqwnBUg@mail.gmail.com>
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@ffwll.ch> wrote:
> >
> > On Tue, Dec 1, 2020 at 5:58 PM Christian König <christian.koenig@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.
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@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
prev parent reply other threads:[~2020-12-02 1:26 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-01 16:58 Dim blowing up in my face Christian König
2020-12-01 17:22 ` Daniel Vetter
2020-12-01 17:24 ` Daniel Vetter
2020-12-02 1:26 ` Rodrigo Vivi [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201202012607.GA1383659@intel.com \
--to=rodrigo.vivi@intel.com \
--cc=christian.koenig@amd.com \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).