On Thu, Oct 4, 2012 at 2:49 AM, David Howells wrote:
> Linus Torvalds wrote:
>
>> 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).
>
> Ther
On Thu, Oct 4, 2012 at 2:49 AM, David Howells wrote:
> Linus Torvalds wrote:
>
>> 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).
>
> Ther
David Howells wrote:
> Linus Torvalds wrote:
>
> > 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).
>
> There was a reason I asked you
Linus Torvalds wrote:
> 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).
There was a reason I asked you to pull the patches at the *end* of
Hi Linus,
So first of all my tree and uapi stuff has a conflict mess, its my fault
as the nouveau stuff didn't hit -next as were trying to rebase regressions
out of it before we merged.
So this pull is for my drm-next-merged branch which is my drm-next branch
merged with your tree, and some f
David Howells wrote:
> Linus Torvalds wrote:
>
> > 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).
>
> There was a reason I asked you
Linus Torvalds wrote:
> 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).
There was a reason I asked you to pull the patches at the *end* of
On Wed, Oct 3, 2012 at 9:08 PM, Dave Airlie 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 th
On Wed, Oct 3, 2012 at 9:08 PM, Dave Airlie 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 th
