linux-kernel - Re: linux-next: manual merge of the pinctrl tree with Linus' tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <CACRpkda5KGQi2AyorWTwQ-LXF-F+9YqyXffJ2-wiaqOJEvcjDw@mail.gmail.com>
Date:	Mon, 28 May 2012 23:24:00 +0800
From:	Linus Walleij <linus.walleij@...aro.org>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: linux-next: manual merge of the pinctrl tree with Linus' tree

On Mon, May 28, 2012 at 11:08 AM, Stephen Rothwell <sfr@...b.auug.org.au> 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@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/