Nouveau fixes from upstream

[Christopher James Halse Rogers]

On Tue, 2010-03-30 at 16:39 +0100, Andy Whitcroft wrote:
> On Fri, Mar 26, 2010 at 09:25:54AM +1100, Chris Halse Rogers wrote:
> > These are a couple of patches picked from the nouveau development tree at
> > http://cgit.freedesktop.org/nouveau/linux-2.6.  They're in the for-airlied
> > branch, so should also make it into 2.6.34.
> 
> Chris ... I had a look for both of these upstream and in the Nouveau tree
> you point to here and have as yet been able to find them in either tree.
> The first does not appear in either as far as I can tell and the second
> seems to have been fixed differently in the upstream code and so I wonder
> if we should be following that.
> 
> Perhaps you could point me to where you are finding these two.
> 
The first is here [1] and second is here[2] although that diff doesn't
quite apply cleanly to our kernel as we don't have this commit [3] which
is cosmetic.  The second patch just applies the changes to nv04_fbcon
from our kernel; the result is the same.

[1]:
http://cgit.freedesktop.org/nouveau/linux-2.6/commit/?h=for-airlied&id=e5ec882cfc18007c6076236ac33a713bcc1d35aa
[2]:
http://cgit.freedesktop.org/nouveau/linux-2.6/commit/?h=for-airlied&id=c82b88d578847909797945824851a6a9a84f9c20
[3]:
http://cgit.freedesktop.org/nouveau/linux-2.6/commit/?h=for-airlied&id=3bfc7d22d0400e85a93e835d4398dcbe0af68b0b
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 490 bytes
Desc: This is a digitally signed message part
URL: <https://lists.ubuntu.com/archives/kernel-team/attachments/20100331/7498b58e/attachment.sig>