gs10

Jean Delvare khali at linux-fr.org
Tue Oct 5 13:40:28 CEST 2004


On Mon, 4 Oct 2004 18:16:49 -0400, Paul Aviles wrote
> Hmm.. getting this..
> 
> [root at srv1 chips]# patch -p0 < pc87360.c.diff
> can't find file to patch at input line 8
> Perhaps you used the wrong -p or --strip option?
> The text leading up to this was:
> --------------------------
> |Index: kernel/chips/pc87360.c
> |===================================================================
> |RCS file: /home/cvs/lm_sensors2/kernel/chips/pc87360.c,v
> |retrieving revision 1.40
> |diff -u -r1.40 pc87360.c
> |--- kernel/chips/pc87360.c     3 Jul 2004 15:50:27 -0000       1.40
> |+++ kernel/chips/pc87360.c     4 Oct 2004 21:30:09 -0000
> --------------------------
> File to patch: pc87360.c
> patching file pc87360.c
> Hunk #1 succeeded at 77 (offset -1 lines).
> Hunk #3 succeeded at 233 (offset -5 lines).
> Hunk #4 succeeded at 460 (offset -11 lines).
> Hunk #5 succeeded at 475 (offset -5 lines).
> Hunk #6 succeeded at 481 (offset -11 lines).
> Hunk #7 FAILED at 489.
> Hunk #8 succeeded at 515 (offset -5 lines).
> Hunk #9 FAILED at 535.
> Hunk #10 succeeded at 540 (offset -17 lines).
> Hunk #11 succeeded at 1256 (offset -58 lines).
> 2 out of 11 hunks FAILED -- saving rejects to file pc87360.c.rej

Yeah, sorry. The patch was against CVS, not 2.8.7. (Great you could fix the
conflicts manually.)

BTW I'd invite you to upgrade to 2.8.8 as soon as it is released (within a few
days now) or CVS if you are impatient. There are significant improvements for
the pc87360 drivers (including VID support if your motherboard offers that).

-- 
Jean Delvare
http://khali.linux-fr.org/



More information about the lm-sensors mailing list