Hi, On Sat, Mar 10, 2012 at 1:09 PM, Rafael J. Wysocki <rjw@xxxxxxx> wrote: > Hi, > > On Saturday, March 10, 2012, Olof Johansson wrote: >> Hi Rafael, >> >> The below series contains two patches that have been sent to you, and >> that are sitting in the pm-domains branch. >> >> Two questions before I pull this into arm-soc: >> >> 1) Are you 100% sure this will be submitted to 3.4? And if so, will >> you send it early during the merge window? > > Yes and yes. > >> 2) Are you 100% sure you will not rebase the branch into which you >> pulled the v3.4-for-rafael branch? > > Yes, I am. > >> I am asking because if we pull this in, and you rebase between now and >> when it's sent in, we're risking merge conflicts that will be painful >> to resolve. We've been bitten by that from other dependencies in the >> past so we're being careful. > > Sure, I understand that. > > As a general rule, topic braches in my tree whose names start with pm- are > never rebased (exactly for this reason). Excellent, thanks! I'll pull that in as a depends/ branch in arm-soc (since that's how we document it), and mark it in our notes so the Samsung branch gets merged after yours when going to Linus. -Olof -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
 |