[PATCH 0/9] make struct drm_mm_node embeddable

Daniel Vetter daniel at ffwll.ch
Sun Nov 14 08:13:46 PST 2010

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.


> [1] http://cgit.freedesktop.org/~danvet/drm/log/?h=embed-gtt-space

Daniel Vetter
Mail: daniel at ffwll.ch
Mobile: +41 (0)79 365 57 48

More information about the dri-devel mailing list