From owner-p4-projects@FreeBSD.ORG Wed Nov 11 12:38:35 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DDECC106568F; Wed, 11 Nov 2009 12:38: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 9BBE51065670 for ; Wed, 11 Nov 2009 12:38: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 880D48FC14 for ; Wed, 11 Nov 2009 12:38: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 nABCcXDP056053 for ; Wed, 11 Nov 2009 12:38:33 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nABCcXe4056051 for perforce@freebsd.org; Wed, 11 Nov 2009 12:38:33 GMT (envelope-from mav@freebsd.org) Date: Wed, 11 Nov 2009 12:38:33 GMT Message-Id: <200911111238.nABCcXe4056051@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 170478 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: Wed, 11 Nov 2009 12:38:35 -0000 http://p4web.freebsd.org/chv.cgi?CH=170478 Change 170478 by mav@mav_mavbook on 2009/11/11 12:37:58 IFC Affected files ... .. //depot/projects/scottl-camlock/src/lib/libc/locale/isblank.3#4 integrate .. //depot/projects/scottl-camlock/src/share/timedef/ja_JP.SJIS.src#4 integrate .. //depot/projects/scottl-camlock/src/share/timedef/ja_JP.UTF-8.src#4 integrate .. //depot/projects/scottl-camlock/src/share/timedef/ja_JP.eucJP.src#4 integrate .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.c#22 integrate .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.h#22 integrate .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_da.c#43 integrate .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#56 integrate .. //depot/projects/scottl-camlock/src/sys/cam/cam.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/cam/cam_ccb.h#31 integrate .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#125 integrate .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt_internal.h#15 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_xpt.c#25 integrate .. //depot/projects/scottl-camlock/src/sys/conf/NOTES#42 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files#54 integrate .. //depot/projects/scottl-camlock/src/sys/conf/options#36 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#78 integrate .. //depot/projects/scottl-camlock/src/sys/dev/siis/siis.c#19 integrate Differences ... ==== //depot/projects/scottl-camlock/src/lib/libc/locale/isblank.3#4 (text+ko) ==== @@ -26,7 +26,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)isblank.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/locale/isblank.3,v 1.25 2009/09/04 07:44:58 des Exp $ +.\" $FreeBSD: src/lib/libc/locale/isblank.3,v 1.26 2009/11/11 11:31:02 roam Exp $ .\" .Dd July 17, 2005 .Dt ISBLANK 3 @@ -50,9 +50,9 @@ .It "\&``\et''\t`` ''" .El .Pp -In the "C" locale +In the "C" locale, a successful .Fn isblank -successful test is limited to this characters only. +test is limited to these characters only. The value of the argument must be representable as an .Vt "unsigned char" or the value of ==== //depot/projects/scottl-camlock/src/share/timedef/ja_JP.SJIS.src#4 (text+ko) ==== @@ -1,22 +1,22 @@ -# $FreeBSD: src/share/timedef/ja_JP.SJIS.src,v 1.15 2009/06/09 22:33:34 edwin Exp $ +# $FreeBSD: src/share/timedef/ja_JP.SJIS.src,v 1.16 2009/11/11 11:24:02 ume Exp $ # # WARNING: spaces may be essential at the end of lines # WARNING: empty lines are essential too # # Short month names # - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 -10 -11 -12 + 1ŒŽ + 2ŒŽ + 3ŒŽ + 4ŒŽ + 5ŒŽ + 6ŒŽ + 7ŒŽ + 8ŒŽ + 9ŒŽ +10ŒŽ +11ŒŽ +12ŒŽ # # Long month names (as in a date) # ==== //depot/projects/scottl-camlock/src/share/timedef/ja_JP.UTF-8.src#4 (text+ko) ==== @@ -1,21 +1,21 @@ -# $FreeBSD: src/share/timedef/ja_JP.UTF-8.src,v 1.4 2009/08/30 10:47:00 ume Exp $ +# $FreeBSD: src/share/timedef/ja_JP.UTF-8.src,v 1.5 2009/11/11 11:24:02 ume Exp $ # # WARNING: spaces may be essential at the end of lines # WARNING: empty lines are essential too # # Short month names - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 -10 -11 -12 + 1月 + 2月 + 3月 + 4月 + 5月 + 6月 + 7月 + 8月 + 9月 +10月 +11月 +12月 # # Long month names (as in a date) # ==== //depot/projects/scottl-camlock/src/share/timedef/ja_JP.eucJP.src#4 (text+ko) ==== @@ -1,21 +1,21 @@ -# $FreeBSD: src/share/timedef/ja_JP.eucJP.src,v 1.13 2009/06/09 22:33:34 edwin Exp $ +# $FreeBSD: src/share/timedef/ja_JP.eucJP.src,v 1.14 2009/11/11 11:24:02 ume Exp $ # # WARNING: spaces may be essential at the end of lines # WARNING: empty lines are essential too # # Short month names - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 -10 -11 -12 + 1·î + 2·î + 3·î + 4·î + 5·î + 6·î + 7·î + 8·î + 9·î +10·î +11·î +12·î # # Long month names (as in a date) # ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.c#22 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/ata/ata_all.c,v 1.6 2009/11/04 16:16:50 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/ata/ata_all.c,v 1.7 2009/11/11 11:10:36 mav Exp $"); #include ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.h#22 (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.5 2009/11/04 16:37:13 mav Exp $ + * $FreeBSD: src/sys/cam/ata/ata_all.h,v 1.6 2009/11/11 11:10:36 mav Exp $ */ #ifndef CAM_ATA_ALL_H ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_da.c#43 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/ata/ata_da.c,v 1.10 2009/11/04 15:40:19 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/ata/ata_da.c,v 1.11 2009/11/11 11:10:36 mav Exp $"); #include ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#56 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/ata/ata_xpt.c,v 1.12 2009/11/04 15:24:32 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/ata/ata_xpt.c,v 1.13 2009/11/11 11:10:36 mav Exp $"); #include #include ==== //depot/projects/scottl-camlock/src/sys/cam/cam.c#14 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam.c,v 1.14 2009/11/03 11:19:05 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam.c,v 1.15 2009/11/11 11:10:36 mav Exp $"); #include #ifdef _KERNEL ==== //depot/projects/scottl-camlock/src/sys/cam/cam_ccb.h#31 (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.39 2009/10/31 10:43:38 mav Exp $ + * $FreeBSD: src/sys/cam/cam_ccb.h,v 1.40 2009/11/11 11:10:36 mav Exp $ */ #ifndef _CAM_CAM_CCB_H ==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#125 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.233 2009/11/04 15:40:19 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.234 2009/11/11 11:10:36 mav Exp $"); #include #include ==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt_internal.h#15 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/cam_xpt_internal.h,v 1.4 2009/11/01 11:31:06 mav Exp $ + * $FreeBSD: src/sys/cam/cam_xpt_internal.h,v 1.5 2009/11/11 11:10:36 mav Exp $ */ #ifndef _CAM_CAM_XPT_INTERNAL_H ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_xpt.c#25 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_xpt.c,v 1.6 2009/11/01 11:31:06 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_xpt.c,v 1.7 2009/11/11 11:10:36 mav Exp $"); #include #include ==== //depot/projects/scottl-camlock/src/sys/conf/NOTES#42 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1562 2009/11/10 22:07:37 jhb Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1563 2009/11/11 11:07:30 ru Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -706,6 +706,7 @@ options NETGRAPH_TEE options NETGRAPH_UI options NETGRAPH_VJC +options NETGRAPH_VLAN # NgATM - Netgraph ATM options NGATM_ATM ==== //depot/projects/scottl-camlock/src/sys/conf/files#54 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1481 2009/11/09 15:59:09 rpaulo Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1482 2009/11/11 11:07:30 ru Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -2399,6 +2399,7 @@ netgraph/ng_tee.c optional netgraph_tee netgraph/ng_tty.c optional netgraph_tty netgraph/ng_vjc.c optional netgraph_vjc +netgraph/ng_vlan.c optional netgraph_vlan netinet/accf_data.c optional accept_filter_data inet netinet/accf_dns.c optional accept_filter_dns inet netinet/accf_http.c optional accept_filter_http inet ==== //depot/projects/scottl-camlock/src/sys/conf/options#36 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.694 2009/11/08 14:33:19 mav Exp $ +# $FreeBSD: src/sys/conf/options,v 1.695 2009/11/11 11:07:30 ru Exp $ # # On the handling of kernel options # @@ -498,6 +498,7 @@ NETGRAPH_TTY opt_netgraph.h NETGRAPH_UI opt_netgraph.h NETGRAPH_VJC opt_netgraph.h +NETGRAPH_VLAN opt_netgraph.h # NgATM options NGATM_ATM opt_netgraph.h ==== //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#78 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ahci/ahci.c,v 1.11 2009/11/03 11:47:07 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ahci/ahci.c,v 1.13 2009/11/11 11:10:36 mav Exp $"); #include #include ==== //depot/projects/scottl-camlock/src/sys/dev/siis/siis.c#19 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/siis/siis.c,v 1.9 2009/11/10 09:46:52 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/siis/siis.c,v 1.10 2009/11/11 11:10:36 mav Exp $"); #include #include