linux-kernel - Re: linux-next: strange 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>] [<thread-prev] [day] [month] [year] [list]

Date:	Fri, 4 May 2012 01:28:30 +0100
From:	Matthew Garrett <mjg59@...f.ucam.org>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	linux-next@...r.kernel.org, LKML <linux-kernel@...r.kernel.org>
Subject: Re: linux-next: strange commits in the drivers-x86 tree

On Fri, May 04, 2012 at 10:14:39AM +1000, Stephen Rothwell wrote:
> Hi Matthew,
> 
> I have no idea what you have done to your tree, but it now contains scsi,
> nfs and arm commits (at least) that don't appear to be at all relevant to
> x86 drivers ... it looks like you may have rebased part of Linus' tree
> onto yours.
> 
> I will use the drivers-x86 tree from next-20120503 for today.

Well that's somewhat bizarre - I did a rebase onto master, git am on a 
maildir, then a rebase -i to drop a conflicting commit. I think we're 
equally confused here.

-- 
Matthew Garrett | mjg59@...f.ucam.org
--
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/