Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 25 Mar 2008 23:22:18 GMT
From:      Sam Leffler <sam@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 138566 for review
Message-ID:  <200803252322.m2PNMI85028746@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 \



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200803252322.m2PNMI85028746>