Messages in this thread | | | Date | Wed, 8 Feb 2006 22:14:34 -0800 | From | Paul Jackson <> | Subject | Re: 2.6.16-rc2-mm1 patches don't apply |
| |
> 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 - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |