2.6.29-rc2 rebase in git

Andy Green andy at openmoko.com
Tue Jan 27 16:55:44 CET 2009


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi -

andy-tracking is now on 2.6.29-rc2 via Ben Dooks' tree.

The rebase was significantly complicated by Balaji's pcf50633 stuff
getting into the Linus tree... I had it off on one side in
pending-tracking branch, but the version that went upstream had changes
compared to that.  So simply removing the old version before the changes
didn't pan out.

The lesson here seems like it might be to reduce the "impedence
mismatch" for the incoming upstream code to zero before doing the rebase.

In the end I solved the mismatch by bringing over the affected
gtaxx-specific files wholesale from balaji-tracking, which is based on
2.6.28 andy-tracking but has the latest pcf506xx code in it already; it
won't have been affected by the upstream update because it's not upstream.

There were also scary-looking changes in 2.6.29-rc2 code breaking
Android, AR6000 wireless, and GTA02 Alsa in several ways, but when I
chewed through them they weren't too deep in each case.

http://git.openmoko.org/?p=kernel.git;a=commitdiff;h=d5119bd8f7a606c9e05b022a703b9df7dcc14730
http://git.openmoko.org/?p=kernel.git;a=commitdiff;h=1fd95680ce4ea3be87f5ef969d36150644b4ccd7
http://git.openmoko.org/?p=kernel.git;a=commitdiff;h=bd7b7778d3b714f5f5070f02620b0ffc614b2dd8
http://git.openmoko.org/?p=kernel.git;a=commitdiff;h=17f0a0280589d1237dc495e2df6508ce1d5744d4
http://git.openmoko.org/?p=kernel.git;a=commitdiff;h=b68e19ab0a3704aeb9eefdff1bbe0692a5c248b2

Nelson had already fixed one while doing something else so I was able to
use his patch

http://git.openmoko.org/?p=kernel.git;a=commitdiff;h=b23d50393d1817cd082e0b2d91b7467026800faf

There was a bug in the recent l1k002 GTA03 LCM driver

http://git.openmoko.org/?p=kernel.git;a=commitdiff;h=f549760bc88e5b1fa76a791d8389f03a439ccfd9

In the Android-related change, the code previously touched a euid member
in the task struct, this has now split into two struct cred -s each of
which has an euid.  I chose the "real" euid but it's possible the
alternate new "effective" one is actually needed.  Here is my patch for
reference:

http://git.openmoko.org/?p=kernel.git;a=commitdiff;h=4d91e0b5eb559594e4201e60b3cf4eb4c6127859

I uplevelled the GTA02 and 03 configs accordingly as well.


If we can find out and fix any breakage from this big update, and
incorporate Balaji's GTA01 config, we should soon be ready to fork
andy-tracking to be a new stable branch for a while.

- -Andy
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org

iEYEARECAAYFAkl/LoAACgkQOjLpvpq7dMrXdACdGB165uzEMVDLa5X1vakTiV+z
1BEAn1un+a0KFSWjwgf4UcPA5JDZHy5k
=0ciA
-----END PGP SIGNATURE-----



More information about the openmoko-kernel mailing list