[Merge] lp:~vanvugt/ubuntu/lucid/nvidia-graphics-drivers-96/fix-627022 into lp:ubuntu/lucid/nvidia-graphics-drivers-96

[Daniel van Vugt]

Daniel van Vugt has proposed merging lp:~vanvugt/ubuntu/lucid/nvidia-graphics-drivers-96/fix-627022 into lp:ubuntu/lucid/nvidia-graphics-drivers-96.

Requested reviews:
  Ubuntu Development Team (ubuntu-dev)
Related bugs:
  Bug #627022 in nvidia-graphics-drivers-96 (Ubuntu Lucid): "package nvidia-current 195.36.24-0ubuntu1~10.04 failed to install/upgrade: nvidia-current kernel module failed to build (nv.c:417: error: unknown field ‘ioctl’ specified in initializer)"
  https://bugs.launchpad.net/ubuntu/lucid/+source/nvidia-graphics-drivers-96/+bug/627022

For more details, see:
https://code.launchpad.net/~vanvugt/ubuntu/lucid/nvidia-graphics-drivers-96/fix-627022/+merge/70983

Fix nv.c build failure with kernels >= 2.6.36 (LP: #627022)

NVIDIA have already implemented a similar fix upstream, apparently in driver version 260.19.06 or so onward. The offending kernel change was commit b19dd42faf413b4705d4adb38521e82d73fa4249 in 2.6.36 stable.

This is the nvidia-96 version of the fix. The proposal for nvidia current is:
https://code.launchpad.net/~vanvugt/ubuntu/lucid/nvidia-graphics-drivers/fix-627022/+merge/66255
-- 
https://code.launchpad.net/~vanvugt/ubuntu/lucid/nvidia-graphics-drivers-96/fix-627022/+merge/70983
Your team Ubuntu Development Team is requested to review the proposed merge of lp:~vanvugt/ubuntu/lucid/nvidia-graphics-drivers-96/fix-627022 into lp:ubuntu/lucid/nvidia-graphics-drivers-96.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 2661 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/ubuntu-reviews/attachments/20110810/55e53f2b/attachment.diff>