Hi all, As there are quite a few omap patches going upstream this coming merge window, here are some notes on where we should go after 2.6.29 gets released. The goal of course is still to get all the important omap code merged into the mainline kernel, and then just keep linux-omap around to queue up patches for the upcoming merge windows. After 2.6.29, we'll have to make few changes to rebase more branches against the mainline. So I suggest following: - We'll branch 2.6.29-omap to have something stable for next few weeks - We'll merge with mainline to start using the mainline clock code, and Paul will maintain omap-clocks branch against the mainline where we'll add the further patches needed. The omap-clocks branch will get merged to linux-omap master branch on regular basis. - We'll reset the PM code to mainline, and Kevin will maintain the pm branch against the mainline. The pm branch will get merged to l-o master branch on regular basis. This way we will have the remaining clock patches and PM patches ready to go to mainline without any extra effort needed. And Paul and Kevin can rebase the omap-clocks and pm branches as needed. Also, after 2.6.29, mach-omap1 should be completely in sync with the mainline. For mach-omap2, we still need to get some more board-*.c files merged after the clock and PM code. And there's still some code under plat-omap that needs to be cleaned up. And the drivers should keep getting integrated via the appropriate driver mailings lists. Luckily lots of patches patches should already apply against the mainline kernel. So please everybody, try to make patches against the mainline where possible. This should cover almost all the board-*.c files and device drivers. I'll keep adding the core omap patches to the various omap-upstream* queues so they're ready to go to mainline kernel too. Cheers, 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
