Date: Thu, 30 Jul 2009 09:52:01 -0600 From: "Kenneth D. Merry" <ken@kdm.org> To: Andrey <dru@antora.ru> Cc: freebsd-scsi@freebsd.org Subject: Re: updated isp(4) driver available Message-ID: <20090730155201.GA8520@nargothrond.kdm.org> In-Reply-To: <4A715565.20102@antora.ru> References: <4A715565.20102@antora.ru>
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20090730155201.GA8520>