On Tue, Jan 07, 2014 at 09:07:10AM +0100, Daniel Vetter wrote: > > - Quick! Merge patch 3 before it conflicts and someone needs to review > > that giant thing again! > > As long as topic/ppgtt is still hanging out there and not yet merged into > dinq that can't happen due to conflict galore. And since there are still > some regressions pending that'll take a while. > > Please don't blame me for this mess, I never really liked this approach of > merging ppgtt ... I don't mind rebasing those patches and be second to ppggt in the queue, that makes quite a bit of sense priority wise. They are also quite easy to rebase. We may still be able to merge patches 01,02,06 and 12 so I only have to rebase the remaining ones. -- Damien _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx