From: Daniel Vetter <daniel@ffwll.ch>
To: sedat.dilek@gmail.com
Cc: daniel.vetter@ffwll.ch, DRI <dri-devel@lists.freedesktop.org>
Subject: Re: [PATCH 0/9] make struct drm_mm_node embeddable
Date: Sun, 14 Nov 2010 17:13:46 +0100 [thread overview]
Message-ID: <20101114161346.GA4497@viiv.ffwll.ch> (raw)
In-Reply-To: <AANLkTikbS0=zARPm+RaXz_FUVDBb-183+mfJygoWv5Ef@mail.gmail.com>
On Sun, Nov 14, 2010 at 04:52:43PM +0100, Sedat Dilek wrote:
> Pulling/Merging Daniel's GIT branch into drm-next (or linux-next) or
> Linus-tree is causing conflicts.
I've just retested merging with drm-core-next / drm-next and the core
drm_mm parts merge without conflict. The i915 parts fail all over due to
conflicts with other ongoing stuff. As I've said, these patches are just
proof-of-concept, I need to redo them (and coordinate merging with Chris
Wilson). So either test my embed-gtt-space branch to also enjoy the i915
patches. Or only test the drm core changes.
-Daniel
> [1] http://cgit.freedesktop.org/~danvet/drm/log/?h=embed-gtt-space
--
Daniel Vetter
Mail: daniel@ffwll.ch
Mobile: +41 (0)79 365 57 48
next prev parent reply other threads:[~2010-11-14 16:10 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-14 14:03 [PATCH 0/9] make struct drm_mm_node embeddable Sedat Dilek
2010-11-14 14:38 ` Chris Wilson
2010-11-14 15:52 ` Sedat Dilek
2010-11-14 16:13 ` Daniel Vetter [this message]
2010-11-14 16:56 ` Sedat Dilek
2010-11-14 17:14 ` Daniel Vetter
2010-11-14 17:27 ` Sedat Dilek
2010-11-14 17:52 ` Sedat Dilek
2010-11-14 18:14 ` Daniel Vetter
2010-11-14 18:19 ` Sedat Dilek
2010-11-14 18:31 ` Sedat Dilek
2010-11-14 18:54 ` Daniel Vetter
2010-11-14 19:55 ` Sedat Dilek
-- strict thread matches above, loose matches on Subject: below --
2010-11-15 10:31 Sedat Dilek
2010-11-12 17:36 Daniel Vetter
2010-11-12 17:56 ` Chris Wilson
2010-11-15 7:58 ` Thomas Hellstrom
2010-11-15 19:45 ` Daniel Vetter
2010-11-15 20:40 ` Thomas Hellstrom
2010-11-15 20:54 ` Daniel Vetter
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=20101114161346.GA4497@viiv.ffwll.ch \
--to=daniel@ffwll.ch \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=sedat.dilek@gmail.com \
/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).