From owner-p4-projects@FreeBSD.ORG Tue Nov 24 13:56:34 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 01FC11065672; Tue, 24 Nov 2009 13:56:34 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BA131106566B for ; Tue, 24 Nov 2009 13:56:33 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9E6D38FC19 for ; Tue, 24 Nov 2009 13:56:33 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nAODuXSX089494 for ; Tue, 24 Nov 2009 13:56:33 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nAODuXN3089492 for perforce@freebsd.org; Tue, 24 Nov 2009 13:56:33 GMT (envelope-from mav@freebsd.org) Date: Tue, 24 Nov 2009 13:56:33 GMT Message-Id: <200911241356.nAODuXN3089492@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 170980 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Nov 2009 13:56:34 -0000 http://p4web.freebsd.org/chv.cgi?CH=170980 Change 170980 by mav@mav_mavbook on 2009/11/24 13:55:44 IFC Affected files ... .. //depot/projects/scottl-camlock/src/sbin/camcontrol/camcontrol.c#32 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/mfi.4#5 integrate .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.c#25 integrate .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.h#25 integrate .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_pmp.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#61 integrate .. //depot/projects/scottl-camlock/src/sys/cam/cam_ccb.h#34 integrate .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#132 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#85 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.h#30 integrate .. //depot/projects/scottl-camlock/src/sys/dev/siis/siis.c#23 integrate .. //depot/projects/scottl-camlock/src/sys/dev/siis/siis.h#8 integrate Differences ... ==== //depot/projects/scottl-camlock/src/sbin/camcontrol/camcontrol.c#32 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sbin/camcontrol/camcontrol.c,v 1.69 2009/11/09 19:47:46 mav Exp $"); +__FBSDID("$FreeBSD: src/sbin/camcontrol/camcontrol.c,v 1.70 2009/11/24 12:47:58 mav Exp $"); #include #include ==== //depot/projects/scottl-camlock/src/share/man/man4/mfi.4#5 (text) ==== @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/mfi.4,v 1.9 2009/08/31 16:19:06 trasz Exp $ +.\" $FreeBSD: src/share/man/man4/mfi.4,v 1.10 2009/11/24 08:14:22 brueffer Exp $ .\" -.Dd August 15, 2009 +.Dd November 24, 2009 .Dt MFI 4 .Os .Sh NAME @@ -79,11 +79,13 @@ .Pp .Bl -bullet -compact .It +LSI MegaRAID SAS 1078 +.It LSI MegaRAID SAS 8408E .It LSI MegaRAID SAS 8480E .It -LSI MegaRAID SAS 1078 +LSI MegaRAID SAS 9260 .It Dell PERC5 .It ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.c#25 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/ata/ata_all.c,v 1.7 2009/11/11 11:10:36 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/ata/ata_all.c,v 1.8 2009/11/24 12:47:58 mav Exp $"); #include ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.h#25 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/ata/ata_all.h,v 1.6 2009/11/11 11:10:36 mav Exp $ + * $FreeBSD: src/sys/cam/ata/ata_all.h,v 1.7 2009/11/24 12:47:58 mav Exp $ */ #ifndef CAM_ATA_ALL_H ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_pmp.c#21 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/ata/ata_pmp.c,v 1.3 2009/11/16 15:18:02 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/ata/ata_pmp.c,v 1.4 2009/11/24 12:47:58 mav Exp $"); #include ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#61 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/ata/ata_xpt.c,v 1.14 2009/11/14 08:08:49 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/ata/ata_xpt.c,v 1.15 2009/11/24 12:47:58 mav Exp $"); #include #include ==== //depot/projects/scottl-camlock/src/sys/cam/cam_ccb.h#34 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/cam_ccb.h,v 1.40 2009/11/11 11:10:36 mav Exp $ + * $FreeBSD: src/sys/cam/cam_ccb.h,v 1.41 2009/11/24 12:47:58 mav Exp $ */ #ifndef _CAM_CAM_CCB_H ==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#132 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.235 2009/11/14 20:23:20 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.236 2009/11/24 12:47:58 mav Exp $"); #include #include ==== //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#85 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ahci/ahci.c,v 1.16 2009/11/23 18:07:28 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ahci/ahci.c,v 1.17 2009/11/24 12:47:58 mav Exp $"); #include #include ==== //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.h#30 (text+ko) ==== @@ -24,7 +24,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ahci/ahci.h,v 1.5 2009/11/16 15:38:27 mav Exp $ + * $FreeBSD: src/sys/dev/ahci/ahci.h,v 1.6 2009/11/24 12:47:58 mav Exp $ */ /* ATA register defines */ ==== //depot/projects/scottl-camlock/src/sys/dev/siis/siis.c#23 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/siis/siis.c,v 1.11 2009/11/16 20:54:47 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/siis/siis.c,v 1.12 2009/11/24 12:47:58 mav Exp $"); #include #include ==== //depot/projects/scottl-camlock/src/sys/dev/siis/siis.h#8 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/siis/siis.h,v 1.3 2009/11/10 09:46:52 mav Exp $ + * $FreeBSD: src/sys/dev/siis/siis.h,v 1.4 2009/11/24 12:47:58 mav Exp $ */ /* ATA register defines */