linux-kernel - linux-next: bad commits in the drivers-x86 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>] [day] [month] [year] [list]

Message-Id: <20130905173222.946719639b05b3b4b3f9b8fd@canb.auug.org.au>
Date:	Thu, 5 Sep 2013 17:32:22 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Matthew Garrett <mjg59@...f.ucam.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: linux-next: bad commits in the drivers-x86 tree

Hi Matthew,

Unfortunately, it looks like you cherry-picked (or somehow) managed to
get copies of quite a few commits from Linus' tree into your tree.  Maybe
a failed rebase?  This has been causing conflicts in linux-next for the
past couple of days and I am sure that Linus will not want to pull your
tree in its current state.

I suggest that you reset it to the state it was in the day before
yesterday (commit 41c8bd1c75ef8e85) and try again.

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

Content of type "application/pgp-signature" skipped