[Gta04-owner] Strategy to upgrade neil-plus kernel to 3.10

[Dr. H. Nikolaus Schaller]

Hi,
after all the recent discussions about the best kernel for Replicant I think we should
focus on getting all the latest kernel developments of mainline into the neil-plus kernel.

I.e. rebase it to 3.10.1.

So I tried the following:
1. get fetch/pull the mainline branch from neil's repository [3] (I think this is the new 3.10 kernel)
2. make a new branch hw-mainline starting from hw-validation [1] (i.e. the 3.7 neil-plus kernel)
3. git rebase mainline

Unfortunately every second file has a CONFLICT.

Well, there are certainly things to fix, but I'd expect them only in those parts we have added
from the Neil's 3.7-gta04 branch (i.e. what makes the difference of the 'plus' part of neil-plus).

In Formulae:

hw-validation[1] = neil/3.7-gta04[2] + plus
delta = neil/mainline[3] - neil/3.7-gta04[2]
hw-mainline = neil/mainline[3] + plus = hw-validation[1] + delta + plus

I had expected that delta would be free of conflicts.

So what is the best strategy to work on this with git without having to work on conflicts that
are not related to the 'plus' part?

BR,
Nikolaus


[1]: http://git.goldelico.com/?p=gta04-kernel.git;a=shortlog;h=refs/heads/neil-plus
[2]: http://git.neil.brown.name/?p=gta04.git;a=shortlog;h=refs/heads/3.7-gta04
[3]: http://git.neil.brown.name/?p=gta04.git;a=shortlog;h=refs/heads/mainline