From owner-cvs-all@FreeBSD.ORG  Fri Jan  7 15:15:20 2005
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 9E7C416A4CE; Fri,  7 Jan 2005 15:15:20 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 7715243D49; Fri,  7 Jan 2005 15:15:20 +0000 (GMT)
	(envelope-from marius@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j07FFKp2039844;
	Fri, 7 Jan 2005 15:15:20 GMT
	(envelope-from marius@repoman.freebsd.org)
Received: (from marius@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j07FFKrZ039843;
	Fri, 7 Jan 2005 15:15:20 GMT
	(envelope-from marius)
Message-Id: <200501071515.j07FFKrZ039843@repoman.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Fri, 7 Jan 2005 15:15:20 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: RELENG_4_11
Subject: cvs commit: src/sys/dev/asr asr.c
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 07 Jan 2005 15:15:20 -0000

marius      2005-01-07 15:15:20 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_4_11)
    sys/dev/asr          asr.c 
  Log:
  Merge from RELENG_4: 1.3.2.4
  
  Fix a mis-merge in the MFC of rev. 1.64 in rev. 1.3.2.3; the following
  change wasn't included:
  - Set the CAM status to CAM_SCSI_STATUS_ERROR rather than CAM_REQ_CMP
    in case of a CHECK CONDITION.
  
  Approved by:    re (kensmith)
  
  Revision     Changes    Path
  1.3.2.3.2.1  +2 -1      src/sys/dev/asr/asr.c