From: Dave Airlie <airlied@gmail.com>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: dri-devel <dri-devel@lists.freedesktop.org>,
LKML <linux-kernel@vger.kernel.org>
Subject: Re: [git pull] drm for v4.13
Date: Mon, 10 Jul 2017 13:01:12 +1000 [thread overview]
Message-ID: <CAPM=9ty_OoW+Oqmi0CDCB9r6OVj=FydCyrh+5sUdiVGHid9cEQ@mail.gmail.com> (raw)
In-Reply-To: <CAPM=9tyDC6S0xn_Axb2aoMo6cRhzG5gs+ob5_OCDYEE0hNqvRg@mail.gmail.com>
On 10 July 2017 at 10:43, Dave Airlie <airlied@gmail.com> wrote:
> Hi Linus,
>
> Sorry this is a bit late, I was on holidays start of last week and now
> I've got a post holiday illness.
> I had nearly all this ready pre holidays, just had one set of fixes
> and a cleanup on top, but I hadn't
> written the summary.
>
> This is the main pull request for the drm, I think I've got one later
> driver pull for mediatek SoC driver,
> I'm undecided on if it needs to go to you yet.
Forgot to add, because I just checked now, there are 2 conflicts,
the drm one with patches from Al, and one in i915_gem_execbuffer.c
which I think resolves best by just taking the code from the pull in place
of code in your tree.
Dave.
next prev parent reply other threads:[~2017-07-10 3:01 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-10 0:43 [git pull] drm for v4.13 Dave Airlie
2017-07-10 3:01 ` Dave Airlie [this message]
2017-07-10 3:02 ` Linus Torvalds
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=9ty_OoW+Oqmi0CDCB9r6OVj=FydCyrh+5sUdiVGHid9cEQ@mail.gmail.com' \
--to=airlied@gmail.com \
--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).