From: Dave Airlie <airlied@gmail.com>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>,
LKML <linux-kernel@vger.kernel.org>,
dri-devel <dri-devel@lists.freedesktop.org>
Subject: Re: [git pull] drm for 5.8-rc1
Date: Wed, 3 Jun 2020 09:03:53 +1000 [thread overview]
Message-ID: <CAPM=9txAkrg7KiJu4V32Gf4h04ku_Lez8dZFFG3u1JcTm-4Tmg@mail.gmail.com> (raw)
In-Reply-To: <CAHk-=winp5YQv7rFmUe2z=xYSuzF9t1mMt+_C_1iFwxjoqG6gw@mail.gmail.com>
On Wed, 3 Jun 2020 at 08:14, Linus Torvalds
<torvalds@linux-foundation.org> wrote:
>
> On Mon, Jun 1, 2020 at 11:06 PM Dave Airlie <airlied@gmail.com> wrote:
> >
> > I've pushed a merged by me tree here, which I think gets them all
> > correct, but please let me know if you think different.
> > https://cgit.freedesktop.org/~airlied/linux/log/?h=drm-5.8-merged
>
> Ok, I get the same result, except my resolution to the simple encoder
> issue was slightly different. I removed the simple helper header
> include too as part of basically undoing the whole simple encoder
> conversion.
Yes sounds like my experience.
I spent time on the tides and it was a revert pretty much of the
commit in next, I just missed the header include line.
I also realised I'd likely mismerged earlier when fixing this up, I'm
going to have to put more time into merge fixing up, I'm still not
always happy with my methods of figuring out what the correct answer
is.
> But other than that we're identical, which is a good sign. Apparently
> the drm mis-merge in the middle got fixed up.
Cool, thanks for redoing it, since this was definitely one of the more
conflicty ones I've had in a while.
Dave.
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2020-06-02 23:04 UTC|newest]
Thread overview: 74+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-02 6:06 [git pull] drm for 5.8-rc1 Dave Airlie
2020-06-02 21:21 ` Linus Torvalds
2020-06-02 21:22 ` Linus Torvalds
2020-06-02 21:56 ` Linus Torvalds
2020-06-03 7:18 ` Thomas Zimmermann
2020-06-03 7:43 ` Daniel Vetter
2020-06-02 22:14 ` Linus Torvalds
2020-06-02 23:03 ` Dave Airlie [this message]
2020-06-02 22:20 ` pr-tracker-bot
2020-06-03 20:13 ` Jason Gunthorpe
2020-06-04 8:10 ` Christian König
2020-06-30 23:08 ` Kirill A. Shutemov
2020-07-01 4:40 ` James Jones
2020-07-01 7:57 ` Kirill A. Shutemov
2020-07-01 7:59 ` Kirill A. Shutemov
2020-07-01 19:45 ` James Jones
2020-07-02 7:36 ` Daniel Vetter
2020-07-02 7:59 ` Pekka Paalanen
2020-07-02 8:22 ` Daniel Stone
2020-07-02 21:14 ` James Jones
2020-07-03 6:01 ` James Jones
2020-07-03 7:16 ` Daniel Vetter
2020-07-13 1:37 ` Dave Airlie
2020-07-14 14:31 ` James Jones
2020-08-04 8:58 ` Karol Herbst
2020-08-12 0:19 ` James Jones
2020-08-12 10:27 ` Karol Herbst
2020-08-12 10:43 ` Karol Herbst
2020-08-12 12:24 ` Karol Herbst
2020-08-12 12:37 ` Ilia Mirkin
2020-08-12 17:03 ` James Jones
2020-08-12 17:10 ` Karol Herbst
2020-08-12 17:19 ` James Jones
2020-08-12 17:40 ` Alyssa Rosenzweig
2020-08-12 18:24 ` James Jones
2020-08-12 18:51 ` Karol Herbst
2020-08-13 13:00 ` Karol Herbst
2020-08-13 15:39 ` Karol Herbst
2020-08-13 17:19 ` Karol Herbst
2020-08-13 17:45 ` James Jones
2020-08-13 17:48 ` Karol Herbst
2020-08-14 13:57 ` Thierry Reding
2020-08-14 13:59 ` Karol Herbst
2020-08-14 14:10 ` Thierry Reding
2020-08-14 14:05 ` Thierry Reding
2020-08-14 14:44 ` Karol Herbst
2020-08-14 15:34 ` Thierry Reding
2020-08-14 15:40 ` Karol Herbst
2020-08-14 16:06 ` Thierry Reding
2020-08-14 16:12 ` Karol Herbst
2020-08-14 16:22 ` Thierry Reding
2020-08-14 17:17 ` Daniel Stone
2020-08-14 17:25 ` Daniel Vetter
2020-08-18 14:37 ` Thierry Reding
2020-09-01 7:13 ` Daniel Vetter
2020-09-01 10:42 ` Daniel Stone
2020-09-01 10:59 ` Karol Herbst
2020-09-01 14:42 ` James Jones
2020-08-14 14:08 ` Thierry Reding
2020-08-14 14:45 ` Karol Herbst
2020-08-14 15:24 ` Thierry Reding
2020-08-14 15:43 ` Karol Herbst
2020-08-14 13:54 ` Thierry Reding
2020-08-14 13:40 ` Thierry Reding
2020-08-14 13:56 ` Karol Herbst
2020-08-12 15:05 ` Thierry Reding
2020-08-12 15:20 ` Karol Herbst
2020-08-12 15:49 ` Karol Herbst
2020-07-01 11:24 ` Karol Herbst
2020-07-01 15:51 ` James Jones
2020-07-01 16:01 ` Daniel Vetter
2020-07-01 17:04 ` Karol Herbst
2020-07-01 17:37 ` James Jones
2020-07-01 18:08 ` Karol Herbst
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='CAPM=9txAkrg7KiJu4V32Gf4h04ku_Lez8dZFFG3u1JcTm-4Tmg@mail.gmail.com' \
--to=airlied@gmail.com \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@linux-foundation.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).