Status of the linaro-2.6.38 kernel
loic.minier at linaro.org
Mon Mar 28 19:35:23 UTC 2011
On Mon, Mar 28, 2011, Arnd Bergmann wrote:
> If you worry about the users of the Android tree more than the
> git history of it, there may be another option: Take the diff between
> the old and the new linaro-2.6.38 and apply that on the Android
> tree. After you have fixed up all conflicts you get from that,
> do a pull from the new tree and solve ignore all conflicts by reverting
> them in the merge.
> That way, you have a tree that your downstream can pull.
It feels kind of hackish to do this in the downstream Android tree
rather than in linux-linaro; the latter would also avoid the issue in
other trees outside of Linaro if any.
More information about the linaro-dev