Comment 1 by Nikolaus Schaller, Jul 21, 2013

In Formulae:

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

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

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

So perhaps what you want is:

  git checkout neil-plus
  git checkout -b neil-3.10-plus
  git rebase --onto f4fee72a ea6d1b4e

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

Maybe we can do the same on the kernel.org 3.10.1

Comment 2 by Nikolaus Schaller, Jul 23, 2013

Work is in progress. git rebase (and fixing conflicts) has been 
done.

Currently I am fixing compile issues:
* HOSTCC may mix up #include <types.h> between Host and Linux 
- makes problems if they are not both Linux (or not the same 
version)
* it looks as if there are small changes in how the ISP clock is set 
up - Camera will not yet work
* a major change is the /proc API which is used by the PowerVR/SGX 
drivers
* minor changes in DSS panel drivers (there is only ACTIVE/DISABLED 
state; SUSPEND has been removed)
* __devinit and __devexit have finally gone (were still used in the 
Si47xx driver)
* build now requires make gta04_defconfig uImage LOADADDR=0x80008000 
modules

Unsolved are (are marked by FIXME and/or #warning):
* board file: how to correctly set the ISP XCLK - currently 
commented out
* board file: section mismatch error for decoding "mux=" 
boot argument - currently commented out
* PVR/SGX: the management of the /proc file system has been 
significantly changed from 3.9 to 3.10; this needs some rework (look 
for FIXME notes and #warning)
* PVR/SGX: the macros to detect the CPU variant (cpu_is_omap3530) 
have changed + #include <plat/cpu.h> missing; needs to be 
adapted

Nothing has been tested so far.

Comment 3 by Nikolaus Schaller, Jul 28, 2013