On Sun, Nov 14, 2010 at 5:13 PM, Daniel Vetter <daniel@xxxxxxxx> wrote: > 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. > If you could geneate a patchset w/o i915 parts for testing would be cool. Thanks in advance. - Sedat - _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/dri-devel
