[uClinux-dev] linux-2.6.15-uc0 patch set released

Greg Ungerer gerg at snapgear.com
Wed Jan 11 02:28:05 EST 2006


Hi Daniel,

Daniel Alomar wrote:
> With the new 2.6.15-uc0-patch release there is one patch (the last one
> concerning mm/bootmem.c) that doesn't match if we apply first the git patch.

Yes, I would expect that. David made some changes to bootmem.c in
the git updates from 2.6.15 as well. Although I haven't tested I expect
that you won't need the bootmem.c change.

(Linus has applied most of the patches I put in 2.5.16-uc0 already
to. So the next git updates from now will probably not need any
of 2.6.15-uc0 applied.)

Regards
Greg



> Remember we need the git patch to enable the threads under 2.6 kernel....
> There is another that fails, but is about the EXTRAVERSION.
> 
> 
> This is the log:
> 
> $patch -p1 < linux-2.6.15-uc0.patch
> patching file arch/m68knommu/Makefile
> patching file arch/h8300/kernel/h8300_ksyms.c
> patching file arch/h8300/mm/memory.c
> patching file arch/m68knommu/kernel/m68k_ksyms.c
> Reversed (or previously applied) patch detected!  Assume -R? [n]
> Apply anyway? [n]
> Skipping patch.
> 1 out of 1 hunk ignored -- saving rejects to file
> arch/m68knommu/kernel/m68k_ksyms.c.rej
> patching file arch/m68knommu/kernel/ptrace.c
> patching file arch/m68knommu/kernel/setup.c
> Reversed (or previously applied) patch detected!  Assume -R? [n]
> Apply anyway? [n]
> Skipping patch.
> 1 out of 1 hunk ignored -- saving rejects to file
> arch/m68knommu/kernel/setup.c.rej
> patching file arch/m68knommu/kernel/signal.c
> patching file arch/m68knommu/kernel/vmlinux.lds.S
> patching file drivers/net/Kconfig
> Hunk #1 succeeded at 1812 (offset 13 lines).
> patching file drivers/serial/mcfserial.c
> patching file fs/binfmt_flat.c
> patching file fs/namei.c
> patching file include/asm-m68knommu/bitops.h
> patching file include/asm-m68knommu/hardirq.h
> patching file include/asm-m68knommu/irq.h
> Reversed (or previously applied) patch detected!  Assume -R? [n]
> Apply anyway? [n]
> Skipping patch.
> 1 out of 1 hunk ignored -- saving rejects to file
> include/asm-m68knommu/irq.h.rej
> patching file include/asm-m68knommu/sigcontext.h
> patching file Makefile
> Hunk #1 FAILED at 1.
> 1 out of 1 hunk FAILED -- saving rejects to file Makefile.rej
> patching file mm/bootmem.c
> Hunk #1 FAILED at 307.
> 1 out of 1 hunk FAILED -- saving rejects to file mm/bootmem.c.rej
> daniel at PortatilLinux:~/Desktop/linux-2.6.15>
> 
> Regards,
> 
> Daniel Alomar
> 
> -----Mensaje original-----
> De: uclinux-dev-bounces at uclinux.org [mailto:uclinux-dev-bounces at uclinux.org]
> En nombre de Greg Ungerer
> Enviado el: martes, 10 de enero de 2006 8:14
> Para: uclinux-dev at uclinux.org
> Asunto: [uClinux-dev] linux-2.6.15-uc0 patch set released
> 
> 
> 
> Hi All,
> 
> An update of the uClinux (MMU-less) fixups against 2.6.15.
> 
> Just a few recent fixes, not much really.
> 
> http://www.uclinux.org/pub/uClinux/uClinux-2.6.x/linux-2.6.15-uc0.patch.gz
> 
> 
> Change log:
> 
> . import of 2.6.15                                 Greg Ungerer
> . adjust irq level/priority for coldfire serial    Greg Ungerer
> . remove m68knommu mach_irq_*                      Christoph Hellwig
> . save/restore a5 reg properly through signals     Stuart Hughes
> . delay trace output from binfmt_flat              Stuart Hughes
> . fix m68knommu find_next_zero_bit                 Sascha Smejkal
> . fix linker script ram length m5208evb            Milton Miller
> 
> 
> Regards
> Greg
> 
> 
> ------------------------------------------------------------------------
> Greg Ungerer  --  Chief Software Dude       EMAIL:     gerg at snapgear.com
> SnapGear -- a CyberGuard Company            PHONE:       +61 7 3435 2888
> 825 Stanley St,                             FAX:         +61 7 3891 3630
> Woolloongabba, QLD, 4102, Australia         WEB: http://www.SnapGear.com
> 
> 
> 
> 
> 
> 
> 
> _______________________________________________
> uClinux-dev mailing list
> uClinux-dev at uclinux.org
> http://mailman.uclinux.org/mailman/listinfo/uclinux-dev
> This message was resent by uclinux-dev at uclinux.org
> 
> _______________________________________________
> uClinux-dev mailing list
> uClinux-dev at uclinux.org
> http://mailman.uclinux.org/mailman/listinfo/uclinux-dev
> This message was resent by uclinux-dev at uclinux.org
> 

-- 
------------------------------------------------------------------------
Greg Ungerer  --  Chief Software Dude       EMAIL:     gerg at snapgear.com
SnapGear -- a CyberGuard Company            PHONE:       +61 7 3435 2888
825 Stanley St,                             FAX:         +61 7 3891 3630
Woolloongabba, QLD, 4102, Australia         WEB: http://www.SnapGear.com



More information about the uClinux-dev mailing list