source-changes: CVS commit: src/sys/dist/pf

Subject: CVS commit: src/sys/dist/pf
To: None <source-changes@NetBSD.org>
From: Peter Postma <peter@netbsd.org>
List: source-changes
Date: 07/01/2005 12:27:47

Module Name:	src
Committed By:	peter
Date:		Fri Jul  1 12:27:47 UTC 2005

Update of /cvsroot/src/sys/dist/pf
In directory ivanova.netbsd.org:/tmp/cvs-serv14248

Log Message:
Import pf from OpenBSD 3.7 (kernel part).


Vendor Tag:	OPENBSD
Release Tags:	v3_7
		
U src/sys/dist/pf/net/if_pflog.c
U src/sys/dist/pf/net/if_pflog.h
C src/sys/dist/pf/net/if_pfsync.c
C src/sys/dist/pf/net/if_pfsync.h
C src/sys/dist/pf/net/pf.c
C src/sys/dist/pf/net/pf_if.c
C src/sys/dist/pf/net/pf_ioctl.c
C src/sys/dist/pf/net/pf_norm.c
U src/sys/dist/pf/net/pf_osfp.c
C src/sys/dist/pf/net/pf_table.c
C src/sys/dist/pf/net/pfvar.h

8 conflicts created by this import.
Use the following command to help the merge:

	cvs checkout -jOPENBSD:yesterday -jOPENBSD src/sys/dist/pf