Re: linux-next: manual merge of the pinctrl tree with Linus' tree
From: Linus Walleij
Date: Mon May 28 2012 - 11:24:01 EST
On Mon, May 28, 2012 at 11:08 AM, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> <rant>So, if your tree/branch is merged into other trees, DO NOT REBASE
> IT.</rant>
Yeah gr, stupid me. I think I've fixed it up by basing the new stuff on
Torvalds' HEAD FTM, I dunno how I was thinking :-P
Yours,
Linus Walleij
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/