From: Linus Torvalds <torvalds@linux-foundation.org>
To: Dave Airlie <airlied@gmail.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>,
dri-devel <dri-devel@lists.freedesktop.org>,
LKML <linux-kernel@vger.kernel.org>
Subject: Re: [git pull] drm for 5.8-rc1
Date: Tue, 2 Jun 2020 14:21:51 -0700 [thread overview]
Message-ID: <CAHk-=wjvVjei5d45D=GQMsFMssD8knSFWqxMbd4bH8qSgXk-Lg@mail.gmail.com> (raw)
In-Reply-To: <CAPM=9txGww+omvateOTizZRV9_wLdAbq6uAz3DRa_S6bn1jQuQ@mail.gmail.com>
On Mon, Jun 1, 2020 at 11:06 PM Dave Airlie <airlied@gmail.com> wrote:
>
> This tree is a bit conflicty, the i915 ones are probably the hairy
> ones, but amdgpu has a bunch as well, along with smattering of others.
Hmm. Some of them are due to your previous mis-merges.
Your commit 937eea297e26 ("Merge tag 'amd-drm-next-5.8-2020-04-24' of
git://people.freedesktop.org/~agd5f/linux into drm-next") seems to
have mis-merged the CONFIG_DEBUG_FS thing in
drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c.
I'm still working through the rest of the merge, so far that was the
only one that made me go "Whaa?".
Linus
next prev parent reply other threads:[~2020-06-02 21:22 UTC|newest]
Thread overview: 29+ 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 [this message]
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
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-04 8:13 ` Christoph Hellwig
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-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='CAHk-=wjvVjei5d45D=GQMsFMssD8knSFWqxMbd4bH8qSgXk-Lg@mail.gmail.com' \
--to=torvalds@linux-foundation.org \
--cc=airlied@gmail.com \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.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).