From owner-svn-src-stable-7@FreeBSD.ORG Sun May 6 14:11:25 2012 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DB6E510656D1; Sun, 6 May 2012 14:11:25 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id C61588FC2C; Sun, 6 May 2012 14:11:25 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q46EBPDG017254; Sun, 6 May 2012 14:11:25 GMT (envelope-from eadler@svn.freebsd.org) Received: (from eadler@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q46EBP4J017251; Sun, 6 May 2012 14:11:25 GMT (envelope-from eadler@svn.freebsd.org) Message-Id: <201205061411.q46EBP4J017251@svn.freebsd.org> From: Eitan Adler Date: Sun, 6 May 2012 14:11:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r235083 - stable/7/lib/libc/gmon X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 May 2012 14:11:26 -0000 Author: eadler Date: Sun May 6 14:11:25 2012 New Revision: 235083 URL: http://svn.freebsd.org/changeset/base/235083 Log: MFC r234819: Allow users of gprof to get per run output files (using the pid) PR: bin/99800 Approved by: cperciva (implicit) Modified: stable/7/lib/libc/gmon/gmon.c stable/7/lib/libc/gmon/moncontrol.3 Directory Properties: stable/7/lib/libc/ (props changed) Modified: stable/7/lib/libc/gmon/gmon.c ============================================================================== --- stable/7/lib/libc/gmon/gmon.c Sun May 6 14:10:56 2012 (r235082) +++ stable/7/lib/libc/gmon/gmon.c Sun May 6 14:11:25 2012 (r235083) @@ -170,7 +170,12 @@ _mcleanup() } moncontrol(0); - snprintf(outname, sizeof(outname), "%s.gmon", _getprogname()); + if (getenv("PROFIL_USE_PID")) + snprintf(outname, sizeof(outname), "%s.%d.gmon", + _getprogname(), getpid()); + else + snprintf(outname, sizeof(outname), "%s.gmon", _getprogname()); + fd = _open(outname, O_CREAT|O_TRUNC|O_WRONLY, 0666); if (fd < 0) { _warn("_mcleanup: %s", outname); Modified: stable/7/lib/libc/gmon/moncontrol.3 ============================================================================== --- stable/7/lib/libc/gmon/moncontrol.3 Sun May 6 14:10:56 2012 (r235082) +++ stable/7/lib/libc/gmon/moncontrol.3 Sun May 6 14:11:25 2012 (r235083) @@ -98,6 +98,12 @@ however, all functions in that address r have their execution time measured. Profiling begins on return from .Fn monstartup . +.Sh ENVIRONMENT +The following environment variables affect the execution of +.Nm : +.Bl -tag -width ".Ev PROFIL_USE_PID" +.It PROFIL_USE_PID +If set, the pid of the process is inserted into the filename. .Sh FILES .Bl -tag -width progname.gmon -compact .It Pa progname.gmon From owner-svn-src-stable-7@FreeBSD.ORG Sun May 6 14:16:19 2012 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 074AB10656D9; Sun, 6 May 2012 14:16:19 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E67268FC12; Sun, 6 May 2012 14:16:18 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q46EGId4017551; Sun, 6 May 2012 14:16:18 GMT (envelope-from eadler@svn.freebsd.org) Received: (from eadler@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q46EGIom017549; Sun, 6 May 2012 14:16:18 GMT (envelope-from eadler@svn.freebsd.org) Message-Id: <201205061416.q46EGIom017549@svn.freebsd.org> From: Eitan Adler Date: Sun, 6 May 2012 14:16:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r235087 - stable/7/sys/cam/scsi X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 May 2012 14:16:19 -0000 Author: eadler Date: Sun May 6 14:16:18 2012 New Revision: 235087 URL: http://svn.freebsd.org/changeset/base/235087 Log: MFC r234821: Add support for: Olympus FE-210 camera LG UP3S MP3 player Laser MP3-2GA13 MP3 PR: usb/119201 Approved by: cperciva (implicit) Modified: stable/7/sys/cam/scsi/scsi_da.c Directory Properties: stable/7/sys/ (props changed) Modified: stable/7/sys/cam/scsi/scsi_da.c ============================================================================== --- stable/7/sys/cam/scsi/scsi_da.c Sun May 6 14:15:52 2012 (r235086) +++ stable/7/sys/cam/scsi/scsi_da.c Sun May 6 14:16:18 2012 (r235087) @@ -555,6 +555,27 @@ static struct da_quirk_entry da_quirk_ta {T_DIRECT, SIP_MEDIA_REMOVABLE, "Netac", "OnlyDisk*", "2000"}, /*quirks*/ DA_Q_NO_SYNC_CACHE } + { + /* + * Olympus FE-210 camera + */ + {T_DIRECT, SIP_MEDIA_REMOVABLE, "OLYMPUS", "FE210*", + "*"}, /*quirks*/ DA_Q_NO_SYNC_CACHE + }, + { + /* + * LG UP3S MP3 player + */ + {T_DIRECT, SIP_MEDIA_REMOVABLE, "LG", "UP3S", + "*"}, /*quirks*/ DA_Q_NO_SYNC_CACHE + }, + { + /* + * Laser MP3-2GA13 MP3 player + */ + {T_DIRECT, SIP_MEDIA_REMOVABLE, "USB 2.0", "(HS) Flash Disk", + "*"}, /*quirks*/ DA_Q_NO_SYNC_CACHE + }, }; static disk_strategy_t dastrategy; From owner-svn-src-stable-7@FreeBSD.ORG Sun May 6 14:23:19 2012 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B1389106564A; Sun, 6 May 2012 14:23:19 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 9C25F8FC0C; Sun, 6 May 2012 14:23:19 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q46ENJpS017887; Sun, 6 May 2012 14:23:19 GMT (envelope-from eadler@svn.freebsd.org) Received: (from eadler@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q46ENJbw017885; Sun, 6 May 2012 14:23:19 GMT (envelope-from eadler@svn.freebsd.org) Message-Id: <201205061423.q46ENJbw017885@svn.freebsd.org> From: Eitan Adler Date: Sun, 6 May 2012 14:23:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r235090 - stable/7/lib/libc/sys X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 May 2012 14:23:19 -0000 Author: eadler Date: Sun May 6 14:23:19 2012 New Revision: 235090 URL: http://svn.freebsd.org/changeset/base/235090 Log: MFC r234820: pread(2) might fail with EBUSY, so document it PR: docs/167201 Approved by: cperciva (implicit) Modified: stable/7/lib/libc/sys/read.2 Directory Properties: stable/7/lib/libc/ (props changed) Modified: stable/7/lib/libc/sys/read.2 ============================================================================== --- stable/7/lib/libc/sys/read.2 Sun May 6 14:23:01 2012 (r235089) +++ stable/7/lib/libc/sys/read.2 Sun May 6 14:23:19 2012 (r235090) @@ -164,6 +164,8 @@ argument points outside the allocated address space. .It Bq Er EIO An I/O error occurred while reading from the file system. +.It Bq Er EBUSY +Failed to read from a file, e.g. /proc//regs while is not stopped .It Bq Er EINTR A read from a slow device (i.e.\& one that might block for an arbitrary amount of time) From owner-svn-src-stable-7@FreeBSD.ORG Sun May 6 19:01:18 2012 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D32281065674; Sun, 6 May 2012 19:01:18 +0000 (UTC) (envelope-from pluknet@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id BE39B8FC0C; Sun, 6 May 2012 19:01:18 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q46J1I1b027102; Sun, 6 May 2012 19:01:18 GMT (envelope-from pluknet@svn.freebsd.org) Received: (from pluknet@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q46J1I4t027100; Sun, 6 May 2012 19:01:18 GMT (envelope-from pluknet@svn.freebsd.org) Message-Id: <201205061901.q46J1I4t027100@svn.freebsd.org> From: Sergey Kandaurov Date: Sun, 6 May 2012 19:01:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r235100 - stable/7/sys/cam/scsi X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 May 2012 19:01:18 -0000 Author: pluknet Date: Sun May 6 19:01:18 2012 New Revision: 235100 URL: http://svn.freebsd.org/changeset/base/235100 Log: Fix r234821 mis-merge. Modified: stable/7/sys/cam/scsi/scsi_da.c Modified: stable/7/sys/cam/scsi/scsi_da.c ============================================================================== --- stable/7/sys/cam/scsi/scsi_da.c Sun May 6 18:34:31 2012 (r235099) +++ stable/7/sys/cam/scsi/scsi_da.c Sun May 6 19:01:18 2012 (r235100) @@ -554,7 +554,7 @@ static struct da_quirk_entry da_quirk_ta { {T_DIRECT, SIP_MEDIA_REMOVABLE, "Netac", "OnlyDisk*", "2000"}, /*quirks*/ DA_Q_NO_SYNC_CACHE - } + }, { /* * Olympus FE-210 camera From owner-svn-src-stable-7@FreeBSD.ORG Mon May 7 12:33:18 2012 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7AC71106564A; Mon, 7 May 2012 12:33:18 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 65A828FC12; Mon, 7 May 2012 12:33:18 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q47CXIek065217; Mon, 7 May 2012 12:33:18 GMT (envelope-from eadler@svn.freebsd.org) Received: (from eadler@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q47CXIOO065214; Mon, 7 May 2012 12:33:18 GMT (envelope-from eadler@svn.freebsd.org) Message-Id: <201205071233.q47CXIOO065214@svn.freebsd.org> From: Eitan Adler Date: Mon, 7 May 2012 12:33:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r235127 - stable/7/lib/libc/sys X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 May 2012 12:33:18 -0000 Author: eadler Date: Mon May 7 12:33:17 2012 New Revision: 235127 URL: http://svn.freebsd.org/changeset/base/235127 Log: Undo MFC r234131: The kernel change can't be MFCed so undo the documentation MFC. PR: kern/164970 Approved by: cperciva (implicit) Modified: stable/7/lib/libc/sys/dup.2 stable/7/lib/libc/sys/fcntl.2 Directory Properties: stable/7/lib/libc/ (props changed) Modified: stable/7/lib/libc/sys/dup.2 ============================================================================== --- stable/7/lib/libc/sys/dup.2 Mon May 7 12:20:26 2012 (r235126) +++ stable/7/lib/libc/sys/dup.2 Mon May 7 12:33:17 2012 (r235127) @@ -123,27 +123,20 @@ indicates the cause of the error. .Sh ERRORS The .Fn dup -system call fails if: +and +.Fn dup2 +system calls fail if: .Bl -tag -width Er .It Bq Er EBADF The .Fa oldd +or +.Fa newd argument is not a valid active descriptor .It Bq Er EMFILE Too many descriptors are active. .El -The -.Fn dup2 -system call fails if: -.Bl -tag -width Er -.It Bq Er EBADF -The -.Fa oldd -argument is not a valid active descriptor or the -.Fa newd -argument is negative or exceeds the maximum allowable descriptor number -.El .Sh SEE ALSO .Xr accept 2 , .Xr close 2 , Modified: stable/7/lib/libc/sys/fcntl.2 ============================================================================== --- stable/7/lib/libc/sys/fcntl.2 Mon May 7 12:20:26 2012 (r235126) +++ stable/7/lib/libc/sys/fcntl.2 Mon May 7 12:33:17 2012 (r235127) @@ -523,6 +523,8 @@ The argument .Fa cmd is .Dv F_DUPFD +or +.Dv F_DUP2FD and the maximum number of file descriptors permitted for the process are already in use, or no file descriptors greater than or equal to From owner-svn-src-stable-7@FreeBSD.ORG Wed May 9 00:56:09 2012 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1633E106566C; Wed, 9 May 2012 00:56:09 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id EAE5B8FC14; Wed, 9 May 2012 00:56:08 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q490u8Xs058919; Wed, 9 May 2012 00:56:08 GMT (envelope-from eadler@svn.freebsd.org) Received: (from eadler@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q490u87A058917; Wed, 9 May 2012 00:56:08 GMT (envelope-from eadler@svn.freebsd.org) Message-Id: <201205090056.q490u87A058917@svn.freebsd.org> From: Eitan Adler Date: Wed, 9 May 2012 00:56:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r235146 - stable/7/share/man/man7 X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 May 2012 00:56:09 -0000 Author: eadler Date: Wed May 9 00:56:08 2012 New Revision: 235146 URL: http://svn.freebsd.org/changeset/base/235146 Log: Partial MFC r234935: Prefer the use of csup to cvsup when talking about the binary. PR: docs/167459 Approved by: cperciva (implicit) Modified: stable/7/share/man/man7/development.7 Directory Properties: stable/7/share/man/man7/ (props changed) Modified: stable/7/share/man/man7/development.7 ============================================================================== --- stable/7/share/man/man7/development.7 Tue May 8 22:38:46 2012 (r235145) +++ stable/7/share/man/man7/development.7 Wed May 9 00:56:08 2012 (r235146) @@ -23,7 +23,7 @@ .\" .\" $FreeBSD$ .\" -.Dd December 21, 2002 +.Dd May 02, 2012 .Dt DEVELOPMENT 7 .Os .Sh NAME @@ -89,7 +89,7 @@ I recommend a partition of at least 5GB. .Pp On the master server, use -.Xr cvsup 1 Pq Pa ports/net/cvsup +.Xr csup 1 to automatically pull down and maintain the .Fx @@ -108,23 +108,23 @@ The job should look something like this (please randomize the time of day!). Note that you can use the -.Xr cvsup 1 +.Xr csup 1 configuration file example directly from .Pa /usr/share/examples without modification by supplying appropriate arguments to -.Xr cvsup 1 . +.Xr csup 1 . .Bd -literal -offset 4n -33 6 * * * /usr/local/bin/cvsup -g -r 20 -L 2 -h cvsup.freebsd.org /usr/share/examples/cvsup/cvs-supfile +33 6 * * * /usr/bin/csup -r 20 -L 2 -h cvsup.freebsd.org /usr/share/examples/cvsup/cvs-supfile .Ed .Pp Run the -.Xr cvsup 1 +.Xr csup 1 manually the first time to pull down the archive. It could take all day depending on how fast your connection is! You will run all -.Xr cvsup 1 +.Xr csup 1 and .Xr cvs 1 operations as @@ -555,7 +555,7 @@ Since the main tree is based on CVS, the former is convenient. .Pp First, you need to modify your -.Xr cvsup 1 +.Xr csup 1 environment to avoid it modifying the local changes you have committed to the repository. It is important to remove the @@ -568,7 +568,7 @@ subdirectory to your .Pa refuse file. For more information, see -.Xr cvsup 1 . +.Xr csup 1 . .Pp The .Fx @@ -598,13 +598,13 @@ For more information on using CVS, see .Pp .Sy WARNING! The -.Xr cvsup 1 +.Xr csup 1 utility may blow away changes made on a local branch in some situations. This has been reported to occur when the master CVS repository is directly manipulated or an RCS file is changed. At this point, -.Xr cvsup 1 +.Xr csup 1 notices that the client and server have entirely different RCS files, so it does a full replace instead of trying to send just deltas. @@ -619,7 +619,7 @@ Bottom line is, if you value your local should back it up before every update. .Sh UPDATING VIA CVS The advantage of using -.Xr cvsup 1 +.Xr csup 1 to maintain an updated copy of the CVS repository instead of using it to maintain source trees directly is that you can then pick and choose when you bring your source tree (or pieces of your From owner-svn-src-stable-7@FreeBSD.ORG Sat May 12 00:44:18 2012 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D26CA1065673; Sat, 12 May 2012 00:44:18 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id BCC3C8FC12; Sat, 12 May 2012 00:44:18 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q4C0iIfd007830; Sat, 12 May 2012 00:44:18 GMT (envelope-from eadler@svn.freebsd.org) Received: (from eadler@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q4C0iIsa007828; Sat, 12 May 2012 00:44:18 GMT (envelope-from eadler@svn.freebsd.org) Message-Id: <201205120044.q4C0iIsa007828@svn.freebsd.org> From: Eitan Adler Date: Sat, 12 May 2012 00:44:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r235306 - stable/7/etc/mtree X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 May 2012 00:44:18 -0000 Author: eadler Date: Sat May 12 00:44:18 2012 New Revision: 235306 URL: http://svn.freebsd.org/changeset/base/235306 Log: MFC r235203: fix spacing in mtree file Approved by: cperciva (implicit) Modified: stable/7/etc/mtree/BSD.usr.dist Directory Properties: stable/7/etc/ (props changed) Modified: stable/7/etc/mtree/BSD.usr.dist ============================================================================== --- stable/7/etc/mtree/BSD.usr.dist Sat May 12 00:43:34 2012 (r235305) +++ stable/7/etc/mtree/BSD.usr.dist Sat May 12 00:44:18 2012 (r235306) @@ -193,8 +193,8 @@ .. bootforth .. - csh - .. + csh + .. cvs contrib .. From owner-svn-src-stable-7@FreeBSD.ORG Sat May 12 00:46:39 2012 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A0B40106566B; Sat, 12 May 2012 00:46:39 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 8B51C8FC08; Sat, 12 May 2012 00:46:39 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q4C0kdtZ007942; Sat, 12 May 2012 00:46:39 GMT (envelope-from eadler@svn.freebsd.org) Received: (from eadler@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q4C0kdxk007940; Sat, 12 May 2012 00:46:39 GMT (envelope-from eadler@svn.freebsd.org) Message-Id: <201205120046.q4C0kdxk007940@svn.freebsd.org> From: Eitan Adler Date: Sat, 12 May 2012 00:46:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r235307 - stable/7/sbin/md5 X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 May 2012 00:46:39 -0000 Author: eadler Date: Sat May 12 00:46:39 2012 New Revision: 235307 URL: http://svn.freebsd.org/changeset/base/235307 Log: MFC r235205: Document the -c option in --help output Approved by: cperciva (implicit) Modified: stable/7/sbin/md5/md5.c Directory Properties: stable/7/sbin/md5/ (props changed) Modified: stable/7/sbin/md5/md5.c ============================================================================== --- stable/7/sbin/md5/md5.c Sat May 12 00:44:18 2012 (r235306) +++ stable/7/sbin/md5/md5.c Sat May 12 00:46:39 2012 (r235307) @@ -372,6 +372,6 @@ static void usage(Algorithm_t *alg) { - fprintf(stderr, "usage: %s [-pqrtx] [-s string] [files ...]\n", alg->progname); + fprintf(stderr, "usage: %s [-pqrtx] [-c string] [-s string] [files ...]\n", alg->progname); exit(1); } From owner-svn-src-stable-7@FreeBSD.ORG Sat May 12 00:51:55 2012 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5AEEB10657BA; Sat, 12 May 2012 00:51:54 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B12828FC1C; Sat, 12 May 2012 00:51:54 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q4C0psgl008333; Sat, 12 May 2012 00:51:54 GMT (envelope-from eadler@svn.freebsd.org) Received: (from eadler@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q4C0psit008331; Sat, 12 May 2012 00:51:54 GMT (envelope-from eadler@svn.freebsd.org) Message-Id: <201205120051.q4C0psit008331@svn.freebsd.org> From: Eitan Adler Date: Sat, 12 May 2012 00:51:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r235312 - stable/7/usr.sbin/portsnap/portsnap X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 May 2012 00:51:55 -0000 Author: eadler Date: Sat May 12 00:51:54 2012 New Revision: 235312 URL: http://svn.freebsd.org/changeset/base/235312 Log: MFC r235208: make it easier for users used to a VCS that allows up to be a shortcut for update. Approved by: cperciva (implicit) Modified: stable/7/usr.sbin/portsnap/portsnap/portsnap.sh Directory Properties: stable/7/usr.sbin/portsnap/ (props changed) Modified: stable/7/usr.sbin/portsnap/portsnap/portsnap.sh ============================================================================== --- stable/7/usr.sbin/portsnap/portsnap/portsnap.sh Sat May 12 00:49:38 2012 (r235311) +++ stable/7/usr.sbin/portsnap/portsnap/portsnap.sh Sat May 12 00:51:54 2012 (r235312) @@ -143,6 +143,9 @@ parse_cmdline() { cron | extract | fetch | update) COMMANDS="${COMMANDS} $1" ;; + up) + COMMANDS="${COMMANDS} update" + ;; *) if [ $# -gt 1 ]; then usage; fi if echo ${COMMANDS} | grep -vq extract; then From owner-svn-src-stable-7@FreeBSD.ORG Sat May 12 00:55:50 2012 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8232E1065677; Sat, 12 May 2012 00:55:50 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 6C54A8FC14; Sat, 12 May 2012 00:55:50 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q4C0to12008565; Sat, 12 May 2012 00:55:50 GMT (envelope-from eadler@svn.freebsd.org) Received: (from eadler@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q4C0to7s008563; Sat, 12 May 2012 00:55:50 GMT (envelope-from eadler@svn.freebsd.org) Message-Id: <201205120055.q4C0to7s008563@svn.freebsd.org> From: Eitan Adler Date: Sat, 12 May 2012 00:55:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r235315 - stable/7/share/man/man4 X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 May 2012 00:55:50 -0000 Author: eadler Date: Sat May 12 00:55:49 2012 New Revision: 235315 URL: http://svn.freebsd.org/changeset/base/235315 Log: MFC r232496: Fix a variety of grammar nits and errors Approved by: cperciva (implicit) Modified: stable/7/share/man/man4/jme.4 Directory Properties: stable/7/share/man/man4/ (props changed) Modified: stable/7/share/man/man4/jme.4 ============================================================================== --- stable/7/share/man/man4/jme.4 Sat May 12 00:55:29 2012 (r235314) +++ stable/7/share/man/man4/jme.4 Sat May 12 00:55:49 2012 (r235315) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd June 29, 2011 +.Dd March 4, 2012 .Dt JME 4 .Os .Sh NAME @@ -130,23 +130,26 @@ variables and tunables: .Bl -tag -width "xxxxxx" .It Va dev.jme.%d.tx_coal_to -Maximum amount of time to delay for Tx completion interrupt in -units of 1us. -The accepted range is 1 to 65535, the default is 100 (100us). +This variable sets the maximum amount of time to delay +before sending a Tx completion interrupt, in microseconds. +The accepted range is 1 to 65535; the default is 100 (100us). .It Va dev.jme.%d.tx_coal_pkt -Maximum number of packets to fire Tx completion interrupt. -The accepted range is 1 to 255, the default is 8. +This variable sets the maximum number of outgoing packets which may be +coalesced together into a single Tx completion interrupt. +The accepted range is 1 to 255; the default is 8. .It Va dev.jme.%d.rx_coal_to -Maximum amount of time to delay for Rx completion interrupt in -units of 1us. -The accepted range is 1 to 65535, the default is 100 (100us). +This variable sets the maximum amount of time to wait for +additional packets to arrive (for possible packet coalescing) +before firing an Rx completion interrupt, in microseconds. +The accepted range is 1 to 65535; the default is 100 (100us). .It Va dev.jme.%d.rx_coal_pkt -Maximum number of packets to fire Rx completion interrupt. -The accepted range is 1 to 255, the default is 2. +This variable sets the maximum number of incoming packets which may be +coalesced into a single Rx completion interrupt. +The accepted range is 1 to 255; the default is 2. .It Va dev.jme.%d.process_limit -Maximum amount of Rx events to be processed in the event loop before -rescheduling a taskqueue. -The accepted range is 10 to 255, the default value is 128 events. +This variable sets the maximum number of events that will be processed +in a single batch before the handler is requeued into a taskqueue. +The accepted range is 10 to 255; the default value is 128 events. The interface does not need to be brought down and up again before a change takes effect. .El @@ -173,22 +176,22 @@ driver tries to avoid unnecessary statio controllers that use eFuse to store station address. The number of times that eFuse can be safely reprogrammed is 16 at most. -In addition, there is no way to restore factory default station -address once station address is reprogrammed via eFuse. -It is highly recommended not to reprogram station address and -it is responsibility of administrator to store original station -address into a safe place when station address should be changed. +In addition, there is no way to restore the factory default station +address once the station address has been reprogrammed via eFuse. +It is highly recommended not to reprogram the station address and +it is the responsibility of the administrator to store the original station +address in a safe place when station address is changed. .Pp There are two known 1000baseT link establishment issues with JMC25x. If the full mask revision number of JMC25x controller is less than -or equal to 4 and link partner enabled IEEE 802.3az Energy Efficient -Ethernet feature, the controller would not be able to establish a +or equal to 4 and the link partner enabled the IEEE 802.3az Energy Efficient +Ethernet feature, the controller will not be able to establish a 1000baseT link. -Also if the length of cable is longer than 120 meters, controller +Also, if the length of the cable is longer than 120 meters, the controller can not establish a 1000baseT link. -The known workaround for the issue is to force manual link +The known workaround for these issues is to force manual link configuration with 100baseTX instead of relying on auto-negotiation. -The full mask revision number of controller could be checked with +The full mask revision number of controller can be checked with the verbose kernel boot option. -Use lower nibble of chip revision number to get full mask revision of -the controller. +Use the lower nibble of the chip revision number to get the +full mask revision of the controller.