[lkml]   [2010]   [Feb]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread

On Sun, Jan 31, 2010 at 08:05:54PM -0800, Justin Madru wrote:
> Well, it's good that the driver might easily be updated to the latest 2.4.
> I did a diff of the source code that was provided against 2.6.30.
> Unfortunately, it looks like there's been more changes to the code than
> simply adding drivers. Updates all across the tree have been made, some
> minor that would be an easy merge. But some seem to be more involved
> changes. Any suggestions on merging the code?

Then I'd suggest that you progressively apply all 2.4 versions one by
one on top of their code. You should have less changes that way and
since you'll have changelogs, you'll be able to tell what the changes
want to do and whether you have to merge them or you can ignore them.
Once you reach 2.4.32, you can even choose to apply all patches one
at a time because the kernel migrated to use GIT. There are "only"
608 patches. Those are quickly reviewed to eliminate the arch-specific
ones you don't care about and only keep generic fixes.

Well that's just an idea. Also, keep a copy of intermediate versions
(or ideally put them into a git tree starting at plain 2.4.30).

Hoping this helps,

 \ /
  Last update: 2010-02-01 07:28    [W:0.043 / U:38.156 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site