problem applying pmdisk patch

[Nirmal Govind <nirmalg@asu.edu>]

Hi.. I'm trying to patch the 2.6.6 kernel with the pmdisk patch that was sent out on this list. I am applying the patch to the kernel-source-2.6.6 tree after applying the Debian patches to it (both the kernel source and patches were obtained using apt-get). Here's the error I get:

# patch -p1 < pmdisk-2.6.7-rc2.diff
patching file arch/ppc/Kconfig
patching file arch/ppc/kernel/Makefile
Hunk #1 succeeded at 22 with fuzz 1.
patching file arch/ppc/kernel/pmdisk.S
patching file arch/ppc/kernel/signal.c
patching file arch/ppc/kernel/vmlinux.lds.S
patching file arch/ppc/platforms/pmac_setup.c
patching file drivers/ide/ppc/pmac.c
patching file drivers/macintosh/Kconfig
patching file drivers/macintosh/mediabay.c
patching file drivers/macintosh/via-pmu.c
patching file drivers/video/aty/radeon_pm.c
patching file include/asm-ppc/suspend.h
patching file include/linux/reboot.h
Hunk #1 succeeded at 40 (offset -2 lines).
patching file include/linux/suspend.h
Hunk #1 succeeded at 1 with fuzz 1.
patching file kernel/power/disk.c
patching file kernel/power/Kconfig
Hunk #1 FAILED at 20.
1 out of 2 hunks FAILED -- saving rejects to file kernel/power/Kconfig.rej
patching file kernel/power/main.c
patching file kernel/power/pmdisk.c
patching file kernel/sys.c
Hunk #1 succeeded at 85 (offset 1 line).


A look at the Kconfig.rej file:


  config SOFTWARE_SUSPEND
        bool "Software Suspend (EXPERIMENTAL)"
-       depends on EXPERIMENTAL && PM && SWAP
        ---help---
          Enable the possibilty of suspendig machine. It doesn't need APM.
          You may suspend your machine by 'swsusp' or 'shutdown -z <time>'

Any ideas on what's going wrong?

Thanks,
nirmal