From owner-freebsd-scsi@FreeBSD.ORG Thu Jul 30 15:52:21 2009 Return-Path: Delivered-To: freebsd-scsi@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5A2E5106564A for ; Thu, 30 Jul 2009 15:52:21 +0000 (UTC) (envelope-from ken@nargothrond.kdm.org) Received: from nargothrond.kdm.org (nargothrond.kdm.org [70.56.43.81]) by mx1.freebsd.org (Postfix) with ESMTP id 10DA28FC15 for ; Thu, 30 Jul 2009 15:52:20 +0000 (UTC) (envelope-from ken@nargothrond.kdm.org) Received: from nargothrond.kdm.org (localhost [127.0.0.1]) by nargothrond.kdm.org (8.14.2/8.13.6) with ESMTP id n6UFq2cJ008683; Thu, 30 Jul 2009 09:52:02 -0600 (MDT) (envelope-from ken@nargothrond.kdm.org) Received: (from ken@localhost) by nargothrond.kdm.org (8.14.2/8.14.2/Submit) id n6UFq1mJ008682; Thu, 30 Jul 2009 09:52:01 -0600 (MDT) (envelope-from ken) Date: Thu, 30 Jul 2009 09:52:01 -0600 From: "Kenneth D. Merry" To: Andrey Message-ID: <20090730155201.GA8520@nargothrond.kdm.org> References: <4A715565.20102@antora.ru> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <4A715565.20102@antora.ru> User-Agent: Mutt/1.4.2i X-Virus-Scanned: ClamAV 0.92.1/9634/Wed Jul 29 21:03:31 2009 on nargothrond.kdm.org X-Virus-Status: Clean Cc: freebsd-scsi@freebsd.org Subject: Re: updated isp(4) driver available X-BeenThere: freebsd-scsi@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SCSI subsystem List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 30 Jul 2009 15:52:21 -0000 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