linux-kernel - Re: linux-next: manual merge of the mmc tree with the s5p 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: Windows password security audit tool. GUI, reports in PDF.

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

Message-ID: <87haxayb4k.fsf@laptop.org>
Date:	Mon, 26 Mar 2012 23:29:47 -0400
From:	Chris Ball <cjb@...top.org>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Kukjin Kim <kgene.kim@...sung.com>,
	Linus <torvalds@...ux-foundation.org>
Subject: Re: linux-next: manual merge of the mmc tree with the s5p tree

Hi,

On Mon, Mar 26 2012, Stephen Rothwell wrote:
> This conflict has been caused in part because you rebased your tree and
> copied some commits that used to be merged into your tree from a shared
> branch.   Do *not* do that ... BTW, when you rebased those commits into
> your tree, you did not sign them either.  This is exactly what Linus has
> just berated one of the other maintainers for ...

Ugh, I'm sorry for screwing this up.

> I am not fixing this conflict, I am just using the version of your tree
> that I have from next-20120326.  Please fix your tree up properly.

I've reverted to the version in next-20120326 too, and will avoid rebasing.

Thanks,

- Chris.
-- 
Chris Ball   <cjb@...top.org>   <http://printf.net/>
One Laptop Per Child
--
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/