-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Somebody in the thread at some point said:
|> The lesson here seems like it might be to reduce the "impedence |> mismatch" for the incoming upstream code to zero before doing the rebase. | | Yeah, that's the little brother of the "we can let it diverge but then | it'll kill Andy when it comes back from upstream" scenario we discussed | a year ago. Good that we didn't get the full version :) Yes it wasn't nice. However I didn't find a better way to have it all, live rebasing, layered branched and now the full cycle of stuff teleporting back to master branch externally and coming back in mutated. ~ Hopefully this way of rebasing just of the upstream patch changes first before the whole upstream rebase will remove the giant painful sting. Ben mentioned he will update his branch more often, once per rc, so we won't get so much API breakage all at one time on top. | One small problem: arch/arm/plat-s3c24xx/neo1973_pm_gps.c wants to | include linux/mfd/pcf50606/core.h and linux/mfd/pcf50606/gpo.h, which | both don't exist. I get a successful compile with gta02-moredrivers | if I just comment out the includes, but that probably breaks GTA01. | Did these files perhaps just not get committed ? Thanks for letting me know ... I tested the build on GTA02 and 03 before pushing it, but then those files are in the tree here but missed an stg add. So I added a patch to add them to the tree instead under Balaji's name, since they're his files. - -Andy -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org iEYEARECAAYFAkl/Q/cACgkQOjLpvpq7dMp9FQCeIwScOCXQrBWs+qXQOp68x/DY hJwAnAu1ftu7Wke/HQfQ70Y7DVAOZQ5C =G70p -----END PGP SIGNATURE-----
