From owner-p4-projects@FreeBSD.ORG  Tue Mar 25 23:22:19 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6B7DA1065675; Tue, 25 Mar 2008 23:22:19 +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 2A104106566C
	for <perforce@freebsd.org>; Tue, 25 Mar 2008 23:22:19 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id D64C58FC18
	for <perforce@freebsd.org>; Tue, 25 Mar 2008 23:22:18 +0000 (UTC)
	(envelope-from sam@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 m2PNMI0x028748
	for <perforce@freebsd.org>; Tue, 25 Mar 2008 23:22:18 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2PNMI85028746
	for perforce@freebsd.org; Tue, 25 Mar 2008 23:22:18 GMT
	(envelope-from sam@freebsd.org)
Date: Tue, 25 Mar 2008 23:22:18 GMT
Message-Id: <200803252322.m2PNMI85028746@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 138566 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: Tue, 25 Mar 2008 23:22:19 -0000

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

Change 138566 by sam@sam_ebb on 2008/03/25 23:21:23

	fix mismerge

Affected files ...

.. //depot/projects/vap/sys/sys/mbuf.h#11 edit

Differences ...

==== //depot/projects/vap/sys/sys/mbuf.h#11 (text+ko) ====

@@ -201,6 +201,7 @@
 #define	M_PROTOFLAGS \
     (M_PROTO1|M_PROTO2|M_PROTO3|M_PROTO4|M_PROTO5|M_PROTO6|M_PROTO7|M_PROTO8)
 
+/*
  * Flags preserved when copying m_pkthdr.
  */
 #define	M_COPYFLAGS \