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

> The git->hg conversion script may be borked right now. 

Ok - since you have suspicions, I will dump what I have found so far,
and pass the baton to your good hands.

The following "facts" are not to be trusted too much, just what I
think I have now.

The following 34 files seem to come up differently in the hg side than
the git side, for 2.6.16-rc2, with the hg side having patches showing
up as already in 2.6.16-rc2, that the git side things showed up later,
after Linus tagged 2.6.16-rc2.

./arch/arm/mach-s3c2410/Makefile
./arch/arm/mm/proc-xscale.S
./arch/cris/Makefile
./arch/ia64/Kconfig
./arch/ia64/kernel/sal.c
./arch/ia64/sn/Makefile
./arch/ia64/sn/kernel/Makefile
./arch/ia64/sn/kernel/bte.c
./arch/ia64/sn/kernel/klconflib.c
./arch/ia64/sn/kernel/setup.c
./arch/ia64/sn/kernel/sn2/Makefile
./arch/ia64/sn/kernel/sn2/sn2_smp.c
./arch/ia64/sn/pci/Makefile
./arch/ia64/sn/pci/pcibr/Makefile
./arch/parisc/Kconfig.debug
./arch/parisc/hpux/entry_hpux.S
./arch/parisc/kernel/parisc_ksyms.c
./arch/parisc/kernel/perf_images.h
./arch/parisc/kernel/signal32.c
./arch/parisc/kernel/signal32.h
./arch/parisc/math-emu/decode_exc.c
./drivers/media/dvb/b2c2/Kconfig
./drivers/media/dvb/b2c2/flexcop-dma.c
./drivers/media/dvb/b2c2/flexcop-misc.c
./drivers/media/dvb/b2c2/flexcop-pci.c
./drivers/media/dvb/bt8xx/bt878.h
./drivers/net/wan/dscc4.c
./include/asm-arm/checksum.h
./include/asm-ia64/sal.h
./include/asm-ia64/sn/bte.h
./include/asm-ia64/system.h
./include/asm-parisc/compat_ucontext.h
./include/asm-parisc/pgalloc.h
./include/asm-parisc/rt_sigframe.h

The linus.patch of 2.6.16-rc2-mm1 won't apply to the git variant
of 2.6.16-rc2, because that *-mm1 tries to apply the changes on the
above files that are already present.

Good luck with it.

Thanks, Matt.

-- 
                  I won't rest till it's the best ...
                  Programmer, Linux Scalability
                  Paul Jackson <pj@sgi.com> 1.925.600.0401

  reply	other threads:[~2006-02-09  6:14 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
2006-02-09  6:14       ` Paul Jackson [this message]
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=20060208221434.f48618d1.pj@sgi.com \
    --to=pj@sgi.com \
    --cc=akpm@osdl.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mpm@selenic.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