* Aguirre, Sergio <saagui...@ti.com> [100315 14:47]: > > > From: Tony Lindgren [mailto:t...@atomide.com] > Sent: Monday, March 15, 2010 4:15 PM > > * Aguirre, Sergio <saagui...@ti.com> [100315 13:33]: > > > Tony, > > > > > > Please find attached pull request for your convenience. > > > > <snip> > > > > > The following changes since commit > > a842b5f9ce70e1b738eabb4d719860070180ed1c: > > > Tony Lindgren (1): > > > Revert "omap: Add DSI regulator supply to OMAP3EVM board file" > > > > > > are available in the git repository at: > > > > > > git://dev.omapzoom.org/pub/scm/saaguirre/linux-omap-camera.git omap- > > fixes > > > > Please base all the branches against the recent tag in Linus' tree, > > in this case against v2.6.34-rc1. What we have in the linux-omap master > > branch is a merge of various development branches, and we don't want > > to merge that history to the mainline tree. > > > > If the recent mainline tag won't work as the base, then please > > rebase it on omap-fixes-for-linus or omap-for-linus. In this case, > > omap-fixes-for-linus at commit 29b2ee5af5f3a02846bd38a1e2121d62ee5f6aca. > > The omap-for-linus branch will contain things going into the next > > merge window, currently it's empty. > > > > In general, the commits ins omap-fixes-for-linus and omap-for-linus > > should stay around unless something goes wrong. But please use > > the recent mainline tag where possible, that's the most flexible > > option for merging. > > Understood, > > Please find updated pull request, rebased on omap-fixes-for-linux. > > I tried it on master, but they don't apply clean, since "OMAP2: serial.c: Fix > number of uarts in early_init" is not upstream, and there's a small cleanup > change in it, which makes patch 0002 don't apply (printk to dev_* patch).
OK, thanks. One more thing: Please repost your fixes one more time with LAKML Cc'd for review. Then assuming no more comments, I'll merge them into omap-fixes-for-linus. Meanwhile, I'll merge it into l-o master branch for testing. Tony -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
