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

[Neil Jerram]

"Dr. H. Nikolaus Schaller" <hns at goldelico.com> writes:

> 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.

The gitk is challenging to read, but I've had a try.

> 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

I think the git branch name for this, in your repository, is 'neil-plus',
right?  The 'hw-validation' branch is still the 2.6.32-based one - at
least from my point of view after a new 'git fetch goldelico'.

> 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?

First let's compare and check commit IDs.  I think:

[1] = e70712bb = remotes/goldelico/neil-plus
[2] = ea6d1b4e = (no branch name)
[3] = f4fee72a = remotes/neil.brown/mainline

So perhaps what you want is:

   git checkout e70712bb
   git checkout -b hw-mainline
   git rebase --onto f4fee72a ea6d1b4e

(The last arg of the 'git rebase' is the upstream point from which to
start rebasing.)

Regards,
        Neil