From owner-cvs-src@FreeBSD.ORG  Fri Dec 12 13:58:44 2003
Return-Path: <owner-cvs-src@FreeBSD.ORG>
Delivered-To: cvs-src@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 44D4C16A4CF; Fri, 12 Dec 2003 13:58:44 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 663EB43D09; Fri, 12 Dec 2003 13:58:43 -0800 (PST)
	(envelope-from ps@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hBCLwhXJ056478;
	Fri, 12 Dec 2003 13:58:43 -0800 (PST)
	(envelope-from ps@repoman.freebsd.org)
Received: (from ps@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hBCLwhRo056477;
	Fri, 12 Dec 2003 13:58:43 -0800 (PST)
	(envelope-from ps)
Message-Id: <200312122158.hBCLwhRo056477@repoman.freebsd.org>
From: Paul Saab <ps@FreeBSD.org>
Date: Fri, 12 Dec 2003 13:58:43 -0800 (PST)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: RELENG_4
Subject: cvs commit: src/sys/dev/ciss ciss.c
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 12 Dec 2003 21:58:44 -0000

ps          2003/12/12 13:58:43 PST

  FreeBSD src repository

  Modified files:        (Branch: RELENG_4)
    sys/dev/ciss         ciss.c 
  Log:
  Fix a mis-merge in ciss_unmap_request and actually unmap a request.
  Fir another mis-merge in ciss_cam_action_io when getting an error back
  from ciss_start, only REQUEUE the request if the error is not EINPROGRESS
  
  Pointy hat to:  me
  
  Revision  Changes    Path
  1.2.2.11  +1 -2      src/sys/dev/ciss/ciss.c