re... * Maciej Jan Broniarz <gausus@wpia.uw.edu.pl> [2004-10-20 12:05 +0200]: > On Wed, Oct 20, 2004 at 10:51:10AM +0200, Sebastian Henschel wrote: > > the patch against 2.6.9-rc4 applies: > > http://honk.physik.uni-konstanz.de/~agx/linux-ppc/kernel/swsusp-2.6.9-rc4.2.diff > > > hmmm - that's weird but i get: > > patching file kernel/power/swsusp.c > Hunk #1 FAILED at 854. > Hunk #2 FAILED at 873. > Hunk #3 succeeded at 1177 (offset 7 lines). > Hunk #4 succeeded at 1207 (offset 7 lines). > Hunk #5 succeeded at 1231 (offset 7 lines). > 2 out of 5 hunks FAILED -- saving rejects to file > kernel/power/swsusp.c.rej did you download linux-2.6.9.tar.bz2 or did you patch up from a previous version? when using the complete tarball, i get: patching file arch/ppc/Kconfig Hunk #1 succeeded at 983 (offset -4 lines). patching file arch/ppc/kernel/Makefile patching file arch/ppc/kernel/signal.c patching file arch/ppc/kernel/swsusp.S 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/therm_adt746x.c patching file drivers/macintosh/therm_pm72.c patching file drivers/macintosh/via-pmu.c patching file include/asm-ppc/suspend.h patching file include/linux/reboot.h patching file include/linux/suspend.h patching file kernel/power/disk.c patching file kernel/power/main.c patching file kernel/power/swsusp.c patching file kernel/sys.c patching file drivers/video/aty/radeon_pm.c perhaps you cd'ed into the directory "linux" which symlinks to the wrong kernel sources? bye, Sebastian -- ::: .O. ::: ..O ::: OOO ::: lynx -source http://www.kodeaffe.de/shensche.pub | gpg --import
Attachment:
signature.asc
Description: Digital signature