On Tue, Jun 12, 2012 at 6:50 PM, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote: > Hi Bjorn, > > On Tue, 12 Jun 2012 09:31:49 -0600 Bjorn Helgaas <bhelgaas@xxxxxxxxxx> wrote: >> >> Thanks, I folded this typo fix into the relevant patch. I'll rebase >> "next" today. Sorry for the trouble. > > I am not sure what you have done, but now you have a set of duplicated > commits in your tree including both versions of the one that caused the > build failure. This is because of my inept git usage. I think my "next" branch ended up with the right bits in it, but the history looked strange because I fixed the typo in the Yinghai branch, but had a second branch that depended on the original unfixed branch. I rebuilt my "next" branch again and I think it's more straightforward. And I learned a tiny bit more about git, so thanks for pointing this out. Bjorn -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
