[prev in list] [next in list] [prev in thread] [next in thread] 

List:       freebsd-scsi
Subject:    Re: updated isp(4) driver available
From:       "Kenneth D. Merry" <ken () kdm ! org>
Date:       2009-07-30 15:52:01
Message-ID: 20090730155201.GA8520 () nargothrond ! kdm ! org
[Download RAW message or body]

On Thu, Jul 30, 2009 at 12:10:13 +0400, Andrey wrote:
> root@rock:/usr> uname -rms
> FreeBSD 7.2-RELEASE-p2 amd64
> 
> root@rock:/usr> patch -p0 < isp_diffs.releng7.20090629.out
> Hmm...  Looks like a new-style context diff to me...
> The text leading up to this was:
> --------------------------
> |*** src/sys/cam/cam_ccb.h.orig
> |--- src/sys/cam/cam_ccb.h
> --------------------------
> Patching file src/sys/cam/cam_ccb.h using Plan A...
> Hunk #1 failed at 169.
> Hunk #2 failed at 193.
> Hunk #3 failed at 532.
> Hunk #4 failed at 658.
> Hunk #5 succeeded at 711 with fuzz 2 (offset 36 lines).
> Hunk #6 succeeded at 860 (offset 44 lines).
> Hunk #7 failed at 928.
> Hunk #8 succeeded at 952 with fuzz 1 (offset 53 lines).
> Hunk #9 failed at 1042.
> Hunk #10 failed at 1052.
> 7 out of 10 hunks failed--saving rejects to src/sys/cam/cam_ccb.h.rej
[ ... ]

The patch is against RELENG_7 as of June 25th, not 7.2p2.

So you'll get portions that fail to apply to 7.2p2.

I would suggest updating to a newer version of RELENG_7.  If the patch
doesn't apply to that, I can regenerate another patch against the latest
RELENG_7.

Ken
-- 
Kenneth Merry
ken@kdm.org
_______________________________________________
freebsd-scsi@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-scsi
To unsubscribe, send any mail to "freebsd-scsi-unsubscribe@freebsd.org"
[prev in list] [next in list] [prev in thread] [next in thread]