* Koen Kooi <k.kooi@xxxxxxxxxxxxxxxxxx> [090114 16:01]: > > Op 14 jan 2009, om 14:41 heeft Tony Lindgren het volgende geschreven: > >> Hi all, >> >> I'll be merging in v2.6.29-rc1 soonish, and suggest that we make some >> changes to continue aligning our tree with the mainline tree. So >> I suggest: >> >> - We move the dspgateway code into a separate branch as discussed >> earlier. >> >> - We stop using source.mvista.com git tree, and only use the >> kernel.org git tree. There's no need for having two master trees, >> and kernel.org is the standard way to go. Big thanks to >> Monta Vista for hosting us for many years. >> >> - We reset arch/arm/mach-omap1 to be what's in the mainline and >> tag that patch again with "REMOVE OMAP LEGACY CODE" so it's easy >> to find later on. Naturally any code in that patch can be reworked >> so it can be integrated to the mainline kernel. >> >> - We add a clocks branch maintained by Paul Walmsley that's based >> off the mainline tree >> >> - We change the pm branch maintained by Kevin Hilman to be based >> on top of the mainline tree >> >> Comments and suggestions anybody? > > Will there be some official 'staging' tree that pulls in trees like > bridge, dss2, etc? I'm fine with pulling patches from this mailinglist, > but a single source for gathering them would be nice. We could have something like that that automatically merges those in. > Also, what's the medium and long term plan for the clocks and pm branch? The clocks branch patches we should start sending to Russell asap so we can get them into the mainline kernel hopefully for the next merge window. Then we should start feeding the pm branch patches after the dependencies to the clock patches are merged. > regards, > > Koen > > >> >> >> BTW, I've also re-cloned the omap tree on kernel.org as it had >> tons of old objects that we don't need. It should not affect >> local trees, but report problems here. It will take a while >> to get mirrored, and some branches might be missing until >> mirroring is done. >> >> I have also set up and empty for-next branch that will contain >> the reviewed patches for next merge window. This will also get >> pulled into Stephen Rothwell's linux next tree on daily basis. >> >> Regards, >> >> Tony -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
