Sergey Lapin <slapinid@xxxxxxxxx> writes: > On Tue, Nov 24, 2009 at 11:21 PM, Premi, Sanjeev <premi@xxxxxx> wrote: >> From: Kevin Hilman [khilman@xxxxxxxxxxxxxxxxxxx] >> Sent: Tuesday, November 24, 2009 11:57 PM >> To: Sergey Lapin; Premi, Sanjeev >> Cc: linux-omap@xxxxxxxxxxxxxxx >> Subject: Re: OMAP3: enabling CPU idle leads to panic >> >> Sergey Lapin <slapinid@xxxxxxxxx> writes: >> >>> I use PM branch merged with linux-omap branch. >> >> Not sure what this means. PM branch is already based at linux-omap >> master branch. You'll need to be more specific, ideally with commit >> IDs. > > I do git branch tmp origin/master > git checkout -f tmp > git merge origin/pm The pm branch is already based on l-o master, but perhaps not the very latest. Instead of the above can you just do git branch tmp origin/pm git checkout -f tmp > git merge origin/mybranch It might if you base your 'mybranch' at the same merge point that the pm branch is based at. You can find the merge point using: git merge-base origin/master origin/pm Kevin -- 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
