ide patch + kernel 2.2.17-pre12

From: Wayne Pascoe (wayne@penguinpowered.org.uk)
Date: Sun Jul 16 2000 - 06:13:43 EST


Hi all,

I'm trying to build linux-2.2.17-pre12 with the unified IDE patch (I have an
HPT366 chipset IDE controller). When I try and apply the ide.2.2.16.patch
and the ide.2.2.16.20000619.patch I get the errors listed below...

Is this patch not ready for the 2.2.17-pre12 kernel yet? I know that it
applies fine against 2.2.17-pre4

Any help would be appreciated,

Thanks.

patching file `MAINTAINERS'
Hunk #1 succeeded at 438 (offset 22 lines).
patching file `arch/i386/kernel/smp.c'
patching file `arch/mips/lib/ide-no.c'
patching file `arch/mips/lib/ide-std.c'
patching file `arch/ppc/kernel/apus_setup.c'
patching file `arch/ppc/kernel/chrp_pci.c'
patching file `arch/ppc/kernel/chrp_setup.c'
Hunk #3 succeeded at 600 (offset 3 lines).
patching file `arch/ppc/kernel/mbx_setup.c'
patching file `arch/ppc/kernel/pmac_setup.c'
Hunk #2 succeeded at 56 with fuzz 1.
Hunk #3 FAILED at 404.

patching file `drivers/block/cmd640.c'
patching file `drivers/block/cmd646.c'
Reversed (or previously applied) patch detected! Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to drivers/block/cmd646.c.rej

patching file `drivers/block/ide-pci.c'
patching file `drivers/block/ide-pmac.c'
Hunk #1 succeeded at 23 (offset 2 lines).
Hunk #2 FAILED at 36.
Hunk #3 FAILED at 63.
Hunk #4 FAILED at 89.
Hunk #5 succeeded at 288 with fuzz 1 (offset 170 lines).
Hunk #6 FAILED at 377.

Hunk #25 FAILED at 899.
2 out of 25 hunks FAILED -- saving rejects to drivers/block/ide-probe.c.rej

-- 
/*  Wayne Pascoe <wayne@penguinpowered.org.uk>

For Perl scripts, help and glimpses into the meaning of life, surf over to http://www.penguinpowered.org.uk/ */

- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.rutgers.edu Please read the FAQ at http://www.tux.org/lkml/



This archive was generated by hypermail 2b29 : Sun Jul 23 2000 - 21:00:08 EST