Re: linux-next: manual merge of the moduleh tree with the tree

From: Stephen Rothwell
Date: Wed Oct 26 2011 - 16:49:06 EST


Hi Paul,

On Wed, 26 Oct 2011 15:57:42 -0400 Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx> 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@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature