2000-11-06 23:38:05

by Dan Browning

[permalink] [raw]
Subject: 2.2.18pre19 + raid-2.2.18-AX?

I can't get raid-2.2.18-A2 to apply cleanly on 2.2.18pre19. Does
anyone know of a newer raid-2.2.18preX patch? (pre18 or pre19 would
be great).

Here's the output I get...

[root@server linux]# patch -p1 < raid-2.2.18-A2
patching file init/main.c
Hunk #4 succeeded at 1631 (offset 4 lines).
patching file include/linux/raid/hsm.h
patching file include/linux/raid/hsm_p.h
patching file include/linux/raid/linear.h
patching file include/linux/raid/md.h
patching file include/linux/raid/md_compatible.h
patching file include/linux/raid/md_k.h
patching file include/linux/raid/md_p.h
patching file include/linux/raid/md_u.h
patching file include/linux/raid/raid0.h
patching file include/linux/raid/raid1.h
patching file include/linux/raid/raid5.h
patching file include/linux/raid/translucent.h
patching file include/linux/raid/xor.h
patching file include/linux/blkdev.h
Hunk #1 succeeded at 91 (offset -2 lines).
patching file include/linux/fs.h
Hunk #2 succeeded at 781 (offset 9 lines).
Hunk #4 succeeded at 828 (offset 9 lines).
Hunk #6 succeeded at 938 (offset 9 lines).
patching file include/linux/md.h
patching file include/linux/raid0.h
patching file include/linux/raid1.h
patching file include/linux/raid5.h
patching file include/linux/sysctl.h
Hunk #1 succeeded at 433 (offset 2 lines).
patching file include/asm-i386/md.h
patching file include/asm-alpha/md.h
patching file include/asm-m68k/md.h
patching file include/asm-sparc/md.h
patching file include/asm-ppc/md.h
patching file include/asm-sparc64/md.h
patching file drivers/block/Config.in
patching file drivers/block/Makefile
patching file drivers/block/genhd.c
patching file drivers/block/hsm.c
patching file drivers/block/linear.c
patching file drivers/block/linear.h
patching file drivers/block/ll_rw_blk.c
Hunk #3 succeeded at 589 (offset -68 lines).
Hunk #4 succeeded at 908 (offset -2 lines).
Hunk #5 succeeded at 862 (offset -68 lines).
patching file drivers/block/md.c
patching file drivers/block/raid0.c
patching file drivers/block/raid1.c
Hunk #7 FAILED at 146.
Hunk #10 FAILED at 287.
2 out of 15 hunks FAILED -- saving rejects to file
drivers/block/raid1.c.rej
patching file drivers/block/raid5.c
patching file drivers/block/translucent.c
patching file drivers/block/xor.c
patching file arch/i386/defconfig
patching file arch/sparc/config.in
patching file arch/sparc/defconfig
Hunk #1 succeeded at 88 with fuzz 2.
patching file arch/sparc64/config.in
patching file arch/sparc64/defconfig
Hunk #1 succeeded at 107 with fuzz 2 (offset 1 line).
patching file Documentation/Configure.help
Hunk #1 succeeded at 1017 (offset 44 lines).
patching file Makefile
Hunk #1 FAILED at 1.
1 out of 1 hunk FAILED -- saving rejects to file Makefile.rej


Best regards,

Dan Browning
Network/DB Admin
Cyclone Computer Systems