From owner-p4-projects@FreeBSD.ORG  Sun Oct 15 15:25:04 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0C00F16A4C2; Sun, 15 Oct 2006 15:25:04 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id D656F16A4A7
	for <perforce@freebsd.org>; Sun, 15 Oct 2006 15:25:03 +0000 (UTC)
	(envelope-from netchild@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 8E24F43DA0
	for <perforce@freebsd.org>; Sun, 15 Oct 2006 15:25:03 +0000 (GMT)
	(envelope-from netchild@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9FFOwH2094680
	for <perforce@freebsd.org>; Sun, 15 Oct 2006 15:24:58 GMT
	(envelope-from netchild@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9FFOw7D094676
	for perforce@freebsd.org; Sun, 15 Oct 2006 15:24:58 GMT
	(envelope-from netchild@freebsd.org)
Date: Sun, 15 Oct 2006 15:24:58 GMT
Message-Id: <200610151524.k9FFOw7D094676@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	netchild@freebsd.org using -f
From: Alexander Leidinger <netchild@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 107955 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, 15 Oct 2006 15:25:04 -0000

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

Change 107955 by netchild@netchild_magellan on 2006/10/15 15:24:48

	Merge some small changes by hand (the automatic resolve is not always
	ok...) and fix a small nit (whitespace in a string).

Affected files ...

.. //depot/projects/linuxolator/src/sys/compat/linux/linux_aio.c#9 edit
.. //depot/projects/linuxolator/src/sys/compat/linux/linux_aio.h#4 edit

Differences ...

==== //depot/projects/linuxolator/src/sys/compat/linux/linux_aio.c#9 (text+ko) ====

@@ -23,7 +23,8 @@
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/linuxaio/linux_aio.c,v 1.91 2006/09/25 19:12:31 admin Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_aio.c,v 1.1 2006/10/15 14:22:13
+netchild Exp $");
 
 #include "opt_compat.h"
 
@@ -454,7 +455,7 @@
 		native_aio_module_handle = NULL;
 		
 		printf(LMSG("Unable to link to the native module \""
-				NATIVE_AIO_MODULE_NAME "\" correctly."));
+				NATIVE_AIO_MODULE_NAME "\"."));
 		
 		return (nerr);
 	}
@@ -464,8 +465,8 @@
 
 #define	LINK_TO_NATIVE_AIO_MODULE()					\
 	if (link_to_native_aio_module(td)) {				\
-		printf(LMSG("Please load the correct module \""		\
-			NATIVE_AIO_MODULE_NAME "\" correctly "		\
+		printf(LMSG("Please load the module \""			\
+			NATIVE_AIO_MODULE_NAME "\" "			\
 			"to provide FreeBSD "				\
 			"native Asynchronous I/O support."));		\
 		return (ENOSYS);						\

==== //depot/projects/linuxolator/src/sys/compat/linux/linux_aio.h#4 (text+ko) ====

@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/linuxaio/linux_aio.h,v 1.8 2006/09/25 19:12:31 admin Exp $
+ * $FreeBSD: src/sys/compat/linux/linux_aio.h,v 1.1 2006/10/15 14:22:13 netchild Exp $
  */
 
 /*