From owner-p4-projects@FreeBSD.ORG  Sun Feb 17 20:42:38 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6A35516A468; Sun, 17 Feb 2008 20:42:38 +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 EBB1716A478
	for <perforce@freebsd.org>; Sun, 17 Feb 2008 20:42:37 +0000 (UTC)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id D6FBC13C469
	for <perforce@freebsd.org>; Sun, 17 Feb 2008 20:42:37 +0000 (UTC)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1HKgb8H077633
	for <perforce@freebsd.org>; Sun, 17 Feb 2008 20:42:37 GMT
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1HKgbfX077629
	for perforce@freebsd.org; Sun, 17 Feb 2008 20:42:37 GMT
	(envelope-from marcel@freebsd.org)
Date: Sun, 17 Feb 2008 20:42:37 GMT
Message-Id: <200802172042.m1HKgbfX077629@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	marcel@freebsd.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 135591 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 17 Feb 2008 20:42:38 -0000

http://perforce.freebsd.org/chv.cgi?CH=135591

Change 135591 by marcel@marcel_xcllnt on 2008/02/17 20:42:36

	IFC @135590

Affected files ...

.. //depot/projects/e500/sbin/mount/getmntopts.3#2 integrate
.. //depot/projects/e500/sys/boot/powerpc/uboot/start.S#6 integrate

Differences ...

==== //depot/projects/e500/sbin/mount/getmntopts.3#2 (text+ko) ====

@@ -26,9 +26,9 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)getmntopts.3	8.3 (Berkeley) 3/30/95
-.\" $FreeBSD: src/sbin/mount/getmntopts.3,v 1.14 2005/11/24 14:27:53 ru Exp $
+.\" $FreeBSD: src/sbin/mount/getmntopts.3,v 1.15 2008/02/17 20:25:25 yar Exp $
 .\"
-.Dd March 30, 1995
+.Dd February 17, 2008
 .Dt GETMNTOPTS 3
 .Os
 .Sh NAME
@@ -163,10 +163,11 @@
 .Sh DIAGNOSTICS
 If the external integer variable
 .Va getmnt_silent
-is non-zero then the
+is zero, then the
 .Fn getmntopts
 function displays an error message and exits if an
 unrecognized option is encountered.
+Otherwise unrecognized options are silently ignored.
 By default
 .Va getmnt_silent
 is zero.

==== //depot/projects/e500/sys/boot/powerpc/uboot/start.S#6 (text+ko) ====

@@ -22,11 +22,10 @@
  * LIABILITY, OR TORT (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/boot/powerpc/uboot/start.S,v 1.2 2008/02/17 20:38:22 marcel Exp $
  */
 
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/boot/powerpc/uboot/start.S,v 1.1 2008/02/16 22:40:55 marcel Exp $");
-
 #include <machine/asm.h>
 
 #define STACK_SIZE 8192