[Karmic SRU] [PATCH] UBUNTU: SAUCE: drm/i915, agp/intel: Add second set of PCI-IDs for B43

[Stefan Bader]

On 10/01/2010 12:20 PM, Ike Panhc wrote:
> On 09/28/2010 07:27 PM, Ike Panhc wrote:
>> We find there is another device id set for B43 chipset. After adding the device
>> id 4E90/4E92 beside 4E40/4E42, the machine works fine with the same
>> modification in xserver-xorg-video-intel.
>>
>> After reporting to freedesktop bugzilla[1], Chris Wilson said the patch is
>> queued for adding this id set and the patch is accepted in mainline kernel[2].
>>
>> Upstream codes has been modified for more easy maintaining. Cherry-pick from
>> upstream will cause line missing and conflicts. So I make the backport patches
>> for Karmic kernel.
>>
>> BugLink: http://launchpad.net/bugs/640214
>>
>> [1] https://bugs.freedesktop.org/show_bug.cgi?id=30221
>> [2] http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=41a51428916ab04587bacee2dda61c4a0c4fc02f
>>
> 
> Hi all,
> 
> I know it will be a little bit confused that this patch looks different
> from upstream ones.
> 
> Basically I just add id beside the original one, and let these two id sets
> act the same.
> 
> Please refer to the following links that the original id added into mainline
> kernel. The patch I post is like the following two and squash them into one.
> 
> http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=7839c5d5519b6d9e2ccf3cdbf1c39e3817ad0835
> http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=38d8a95621b20ed7868e232a35a26ee61bdcae6f
> 
> 
If that is the case I would prefer to have the two individual patches taken for
the SRU for Karmic. This way it is much simpler to know where the patches came
from and in reverse to look for a certain patch contained in Karmic.

Could you post the two changes applied to Karmic individually (in case this
requires some tweaking)?

Thanks,
Stefan