linux-kernel - Re: linux-next: manual merge of the moduleh tree with the 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:	Thu, 27 Oct 2011 07:48:58 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Paul Gortmaker <paul.gortmaker@...driver.com>
Cc:	<linux-next@...r.kernel.org>, <linux-kernel@...r.kernel.org>
Subject: Re: linux-next: manual merge of the moduleh tree with the  tree

Hi Paul,

On Wed, 26 Oct 2011 15:57:42 -0400 Paul Gortmaker <paul.gortmaker@...driver.com> wrote:
>
> I'm surprised to see this, since I'd dropped this chunk based on
> the last linux-next build you did before leaving for vacation.
> You should see this commit in the merge fix repo.
> 
> ~$git ls-remote git://openlinux.windriver.com/people/paulg/modsplit-post-merge
> edaec64f302889b6f6eaf2d206782f46768d9922	HEAD
> edaec64f302889b6f6eaf2d206782f46768d9922	refs/heads/master
> ~$
> 
> Maybe the server fell over again when you were trying to update?

Sorry, I know what happened ... I fetched the new origin/master, but did
not pull it into master (the checked out branch).  It will be better next
time.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped