4 Oct
2012
4 Oct
'12
6:51 a.m.
On Wed, Oct 3, 2012 at 9:08 PM, Dave Airlie airlied@linux.ie wrote:
So this pull is for my drm-next-merged branch which is my drm-next branch merged with your tree, and some fixups applied to the merge.
Ok, as usual I actually wanted to do the merge myself despite the annoying conflicts (this *really* is the last time I will ever accept any header file "cleanups" - they simply aren't worth the pain).
My resolution was largely the same as yours, and I used your pre-merged branch to check the end result. I do like being able to double-check, and see the non-data-conflicting semantics conflicts too.
Pushed out,
Linus