public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Matt Mackall <mpm@selenic.com>
To: Paul Jackson <pj@sgi.com>
Cc: Andrew Morton <akpm@osdl.org>, linux-kernel@vger.kernel.org
Subject: Re: 2.6.16-rc2-mm1 patches don't apply
Date: Wed, 8 Feb 2006 23:56:39 -0600	[thread overview]
Message-ID: <20060209055638.GV13729@waste.org> (raw)
In-Reply-To: <20060208213025.ef61a679.pj@sgi.com>

On Wed, Feb 08, 2006 at 09:30:25PM -0800, Paul Jackson wrote:
> Andrew wrote:
> > ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.16-rc2/2.6.16-rc2-mm1/broken-out/linus.patch
> > applies cleanly to
> > ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/linux-2.6.16-rc2.tar.bz2
> 
> Indeed.  That combination does work.
> 
> And that's the same linus.patch as I extracted from:
> 
>   ~akpm/patches/2.6/2.6.16-rc2//2.6.16-rc2-mm1/2.6.16-rc2-mm1-broken-out.tar.bz2
> 
> So no problem with you linus.patch.
> 
> The difference -might- be a different linux-2.6.16-rc2 with the above
> than with hg's http://www.kernel.org/hg/linux-2.6, with the command "hg
> co 19933", which is the release tagged v2.6.16-rc2:
> 
>     changeset:   19933:6a79f5a2de38
>     tag:         v2.6.16-rc2
>     user:        Linus Torvalds <torvalds@g5.osdl.org>
>     date:        Fri Feb  3 14:03:08 2006 +0800
>     summary:     Linux v2.6.16-rc2
> 
> My current suspicions ... a combination of:
> 
>  1) a congenital mental defect that causes me to find git difficult to use,
>     and led to me thinking something had failed when it had not, and
>  2) further fallout from some apparent burp in the production of the hg
>     (mercurial) linux trees that Matt fixed today.

The git->hg conversion script may be borked right now. The upgrade of
master.kernel.org to AMD64 happened to coincide with a new Mercurial
release with a new convert-repo script which may have introduced a
bug. I'll try to sort it out tomorrow.

-- 
Mathematics is the supreme nostalgia of our time.

  reply	other threads:[~2006-02-09  5:56 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-02-09  3:43 2.6.16-rc2-mm1 patches don't apply Paul Jackson
2006-02-09  4:16 ` Andrew Morton
2006-02-09  5:30   ` Paul Jackson
2006-02-09  5:56     ` Matt Mackall [this message]
2006-02-09  6:14       ` Paul Jackson
2006-02-11 20:37       ` HG kernel repo (was: Re: 2.6.16-rc2-mm1 patches don't apply) Stelian Pop
2006-02-12 17:13         ` Matt Mackall
2006-02-18  2:26           ` Paul Jackson
2006-02-18  8:33             ` Matt Mackall
2006-02-18  8:50               ` Paul Jackson
  -- strict thread matches above, loose matches on Subject: below --
2006-02-11 18:46 2.6.16-rc2-mm1 patches don't apply Chuck Ebbert

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20060209055638.GV13729@waste.org \
    --to=mpm@selenic.com \
    --cc=akpm@osdl.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=pj@sgi.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox