[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Google
  Web www.spinics.net

[ogfs-users]2.4.22 patch on 2.4.24 kernel



Hi all,
attached there is the result I obtained patching 2.4.24 kernel with 2.4.22 patch.
I corrected only the failed hunk relative to arch/i386/kernel/irq.c editing this file, while the other errors (atm and x86_64 related) are not important for my purposes.
I hope this is useful for someone,
Angela
patching file Documentation/Configure.help
Hunk #1 succeeded at 1912 (offset 56 lines).
Hunk #2 succeeded at 21790 (offset 656 lines).
patching file Documentation/kdb/dump.txt
patching file Documentation/kdb/kdb.mm
patching file Documentation/kdb/kdb_bp.man
patching file Documentation/kdb/kdb_bt.man
patching file Documentation/kdb/kdb_env.man
patching file Documentation/kdb/kdb_ll.man
patching file Documentation/kdb/kdb_md.man
patching file Documentation/kdb/kdb_rd.man
patching file Documentation/kdb/kdb_sr.man
patching file Documentation/kdb/kdb_ss.man
patching file Documentation/kdb/slides
patching file MAINTAINERS
Hunk #1 succeeded at 570 (offset 16 lines).
patching file Makefile
Hunk #1 FAILED at 1.
Hunk #4 succeeded at 210 (offset 1 line).
Hunk #6 succeeded at 292 (offset 1 line).
1 out of 6 hunks FAILED -- saving rejects to file Makefile.rej
patching file arch/i386/Makefile
patching file arch/i386/config.in
Hunk #1 succeeded at 479 with fuzz 1 (offset 5 lines).
patching file arch/i386/kdb/ChangeLog
patching file arch/i386/kdb/Makefile
patching file arch/i386/kdb/ansidecl.h
patching file arch/i386/kdb/bfd.h
patching file arch/i386/kdb/i386-dis.c
patching file arch/i386/kdb/kdba_bp.c
patching file arch/i386/kdb/kdba_bt.c
patching file arch/i386/kdb/kdba_id.c
patching file arch/i386/kdb/kdba_io.c
patching file arch/i386/kdb/kdbasupport.c
patching file arch/i386/kernel/bluesmoke.c
patching file arch/i386/kernel/entry.S
patching file arch/i386/kernel/i8259.c
patching file arch/i386/kernel/io_apic.c
Hunk #2 succeeded at 610 (offset 8 lines).
patching file arch/i386/kernel/irq.c
Hunk #1 FAILED at 32.
Hunk #2 succeeded at 320 (offset 1 line).
1 out of 2 hunks FAILED -- saving rejects to file arch/i386/kernel/irq.c.rej
patching file arch/i386/kernel/nmi.c
patching file arch/i386/kernel/process.c
Hunk #2 succeeded at 403 with fuzz 2 (offset 2 lines).
patching file arch/i386/kernel/smp.c
patching file arch/i386/kernel/smpboot.c
patching file arch/i386/kernel/traps.c
patching file arch/i386/vmlinux.lds
patching file arch/mips64/kernel/ioctl32.c
patching file arch/parisc/kernel/ioctl32.c
patching file arch/ppc64/kernel/ioctl32.c
patching file arch/s390x/kernel/ioctl32.c
patching file arch/sparc64/kernel/ioctl32.c
patching file arch/x86_64/ia32/ia32_ioctl.c
Hunk #2 succeeded at 4052 (offset 4 lines).
patching file arch/x86_64/kernel/io_apic.c
Hunk #1 FAILED at 1762.
Hunk #2 FAILED at 1785.
2 out of 2 hunks FAILED -- saving rejects to file arch/x86_64/kernel/io_apic.c.rej
patching file arch/x86_64/kernel/mpparse.c
Hunk #1 FAILED at 923.
Hunk #2 FAILED at 939.
Hunk #3 FAILED at 951.
Hunk #4 FAILED at 988.
4 out of 4 hunks FAILED -- saving rejects to file arch/x86_64/kernel/mpparse.c.rej
patching file drivers/block/genhd.c
patching file drivers/char/amd76x_pm.c
Reversed (or previously applied) patch detected!  Assume -R? [n]
Apply anyway? [n]
Skipping patch.
2 out of 2 hunks ignored -- saving rejects to file drivers/char/amd76x_pm.c.rej
patching file drivers/char/keyboard.c
Hunk #2 succeeded at 266 (offset 12 lines).
patching file drivers/char/pcwd.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 drivers/char/pcwd.c.rej
patching file drivers/char/serial.c
Hunk #3 succeeded at 6028 (offset 5 lines).
patching file drivers/ieee1394/oui.c
patching file drivers/md/Config.in
patching file drivers/md/Makefile
patching file drivers/md/dm-daemon.c
patching file drivers/md/dm-daemon.h
patching file drivers/md/dm-exception-store.c
patching file drivers/md/dm-io.c
patching file drivers/md/dm-io.h
patching file drivers/md/dm-ioctl.c
patching file drivers/md/dm-linear.c
patching file drivers/md/dm-log.c
patching file drivers/md/dm-log.h
patching file drivers/md/dm-raid1.c
patching file drivers/md/dm-snapshot.c
patching file drivers/md/dm-snapshot.h
patching file drivers/md/dm-stripe.c
patching file drivers/md/dm-table.c
patching file drivers/md/dm-target.c
patching file drivers/md/dm.c
patching file drivers/md/dm.h
patching file drivers/md/kcopyd.c
patching file drivers/md/kcopyd.h
patching file drivers/md/lvm.c
Hunk #1 succeeded at 236 (offset 7 lines).
Hunk #2 succeeded at 2240 (offset 72 lines).
Hunk #3 succeeded at 2202 (offset 8 lines).
patching file drivers/sbus/char/sab82532.c
patching file drivers/sbus/char/su.c
patching file drivers/sbus/char/sunkbd.c
patching file drivers/sbus/char/sunkeymap.c
patching file drivers/scsi/Config.in
Hunk #1 succeeded at 187 (offset 1 line).
patching file drivers/scsi/Makefile
patching file drivers/scsi/isp/Config.in
patching file drivers/scsi/isp/Makefile
patching file drivers/scsi/isp/asm_1000.h
patching file drivers/scsi/isp/asm_1040.h
patching file drivers/scsi/isp/asm_1080.h
patching file drivers/scsi/isp/asm_12160.h
patching file drivers/scsi/isp/asm_2100.h
patching file drivers/scsi/isp/asm_2200.h
patching file drivers/scsi/isp/asm_2300.h
patching file drivers/scsi/isp/isp.c
patching file drivers/scsi/isp/isp_inline.h
patching file drivers/scsi/isp/isp_linux.c
patching file drivers/scsi/isp/isp_linux.h
patching file drivers/scsi/isp/isp_pci.c
patching file drivers/scsi/isp/isp_target.c
patching file drivers/scsi/isp/isp_target.h
patching file drivers/scsi/isp/isp_tpublic.h
patching file drivers/scsi/isp/ispmbox.h
patching file drivers/scsi/isp/ispreg.h
patching file drivers/scsi/isp/ispvar.h
patching file drivers/scsi/isp/scsi_target.c
patching file drivers/scsi/isp/scsi_target.h
patching file drivers/scsi/isp/scsi_target_ctl.c
patching file drivers/scsi/sd.c
patching file drivers/usb/hid-core.c
patching file drivers/usb/host/usb-uhci.c
patching file drivers/usb/usbkbd.c
patching file fs/buffer.c
Hunk #1 succeeded at 383 (offset 7 lines).
Hunk #3 succeeded at 795 (offset 7 lines).
Hunk #4 succeeded at 1197 (offset 8 lines).
patching file fs/inode.c
Hunk #1 succeeded at 729 (offset 33 lines).
patching file fs/jbd/journal.c
patching file fs/reiserfs/super.c
patching file fs/super.c
patching file include/asm-i386/hardirq.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-i386/hardirq.h.rej
patching file include/asm-i386/hw_irq.h
patching file include/asm-i386/kdb.h
patching file include/asm-i386/kdbprivate.h
patching file include/asm-i386/keyboard.h
patching file include/asm-i386/kmap_types.h
patching file include/asm-i386/ptrace.h
patching file include/asm-x86_64/io_apic.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-x86_64/io_apic.h.rej
patching file include/linux/dcache.h
patching file include/linux/device-mapper.h
patching file include/linux/dis-asm.h
patching file include/linux/dm-ioctl.h
patching file include/linux/fs.h
Hunk #3 succeeded at 1275 (offset 1 line).
Hunk #5 succeeded at 1488 (offset 4 lines).
patching file include/linux/jbd.h
patching file include/linux/kallsyms.h
patching file include/linux/kdb.h
patching file include/linux/kdbprivate.h
patching file include/linux/mempool.h
patching file include/linux/mm.h
Hunk #1 succeeded at 485 (offset 2 lines).
patching file include/linux/module.h
patching file include/linux/sysctl.h
patching file include/linux/vmalloc.h
patching file init/do_mounts.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 init/do_mounts.c.rej
patching file init/main.c
Hunk #1 succeeded at 74 (offset 1 line).
Hunk #3 succeeded at 426 (offset 1 line).
patching file kdb/ChangeLog
patching file kdb/Makefile
patching file kdb/kdb_bp.c
patching file kdb/kdb_bt.c
patching file kdb/kdb_cmds
patching file kdb/kdb_id.c
patching file kdb/kdb_io.c
patching file kdb/kdbmain.c
patching file kdb/kdbsupport.c
patching file kdb/modules/Makefile
patching file kdb/modules/kdbm_pg.c
patching file kdb/modules/kdbm_task.c
patching file kdb/modules/kdbm_vm.c
patching file kdb/modules/kdbm_x86.c
patching file kernel/Makefile
patching file kernel/kallsyms.c
patching file kernel/ksyms.c
Hunk #1 succeeded at 58 (offset 1 line).
Hunk #3 succeeded at 127 (offset 1 line).
Hunk #4 succeeded at 164 (offset 1 line).
Hunk #5 succeeded at 200 (offset 1 line).
Hunk #6 succeeded at 220 (offset 1 line).
Hunk #7 succeeded at 245 (offset 1 line).
Hunk #8 succeeded at 631 (offset 11 lines).
patching file kernel/module.c
patching file kernel/printk.c
Hunk #1 succeeded at 296 (offset 4 lines).
patching file kernel/sched.c
patching file kernel/sysctl.c
Hunk #1 succeeded at 28 with fuzz 1.
Hunk #2 succeeded at 278 (offset 6 lines).
patching file mm/Makefile
patching file mm/filemap.c
Hunk #1 succeeded at 316 (offset 2 lines).
Hunk #2 succeeded at 1778 (offset 9 lines).
Hunk #3 succeeded at 3150 (offset 2 lines).
Hunk #4 succeeded at 3326 (offset 9 lines).
Hunk #5 succeeded at 3333 (offset 2 lines).
patching file mm/memory.c
Hunk #1 succeeded at 1497 (offset 3 lines).
patching file mm/mempool.c
patching file mm/vmalloc.c
patching file net/atm/common.c
Hunk #1 FAILED at 672.
Hunk #2 FAILED at 688.
Hunk #3 FAILED at 703.
Hunk #4 FAILED at 715.
Hunk #5 FAILED at 727.
5 out of 5 hunks FAILED -- saving rejects to file net/atm/common.c.rej
patching file net/atm/proc.c
Hunk #1 FAILED at 358.
Hunk #2 FAILED at 367.
Hunk #3 FAILED at 458.
Hunk #4 FAILED at 467.
4 out of 4 hunks FAILED -- saving rejects to file net/atm/proc.c.rej

[Site Home]     [Kernel list]     [Security]     [Bugtraq]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [DVD Store]     [Linux Clusters]     [Linux RAID]     [Linux Resources]

Powered by Linux