Re: [Dri-devel] Kernel back-merge ...

2003-09-26 Thread Eric Anholt
On Thu, 2003-09-25 at 22:58, Linus Torvalds wrote: > On Thu, 25 Sep 2003, Dave Airlie wrote: > > > > If Linus thinks your patch goes far enough for him.. > > I actually usually don't much like whitespace changes, and the one I sent > was purely in response to the fact that there already was a lo

Re: [Dri-devel] Kernel back-merge ...

2003-09-25 Thread Linus Torvalds
On Thu, 25 Sep 2003, Dave Airlie wrote: > > If Linus thinks your patch goes far enough for him.. I actually usually don't much like whitespace changes, and the one I sent was purely in response to the fact that there already was a lot of whitespace changes in the i810 driver. Don't worry too

Re: [Dri-devel] Kernel back-merge ...

2003-09-25 Thread Dave Airlie
> > I applied the radeon.h and the Kconfig patches (redone, since whitespace > got mangled in the email). I've posted a more agressive whitespace > cleanup of i810_dma.c. I don't want to commit such a big whitespace > diff without the i810 maintainer's approval. > > http://people.freebsd.org/~anh

Re: [Dri-devel] Kernel back-merge ...

2003-09-25 Thread Linus Torvalds
On Thu, 25 Sep 2003, Eric Anholt wrote: > > I applied the radeon.h and the Kconfig patches (redone, since whitespace > got mangled in the email). Hmm.. It's not mangled here - I just verified by applying the whole patch as it came in off the dri-devel list (as opposed to what I sent out) to the

Re: [Dri-devel] Kernel back-merge ...

2003-09-25 Thread Eric Anholt
On Thu, 2003-09-25 at 10:44, Linus Torvalds wrote: > Ok, I've merged the current DRI CVS tree from freedesktop.org into the > kernel, and as a result I now have another (pretty obvious) diff for > back-merging into DRI. I hope somebody with commit access will do this. > > The merge has three par

Re: [Dri-devel] Kernel back-merge ...

2003-09-25 Thread Linus Torvalds
[ Following up to myself. Damn, I hate when that happens. It's a sign of early senility when you start talking to yourself, and it happens all too often for me ; ] One chunk of the "whitespace" fixes wasn't whitespace, it was due to the 2.6.x tree not having some of the backwards compatibil

[Dri-devel] Kernel back-merge ...

2003-09-25 Thread Linus Torvalds
Ok, I've merged the current DRI CVS tree from freedesktop.org into the kernel, and as a result I now have another (pretty obvious) diff for back-merging into DRI. I hope somebody with commit access will do this. The merge has three parts: - a real fix for an i830_irq.c misfeature, where the D