linux-kernel - 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-next>] [day] [month] [year] [list]

Message-Id: <20120327141033.352dfd5cc4ee937ee7371860@canb.auug.org.au>
Date:	Tue, 27 Mar 2012 14:10:33 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Chris Ball <cjb@...top.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Kukjin Kim <kgene.kim@...sung.com>,
	Linus <torvalds@...ux-foundation.org>
Subject: linux-next: manual merge of the mmc tree with the s5p tree

Hi Chris,

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 ...

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.

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped