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

Subject: CVS commit: src/sys/dist/pf
To: None <source-changes@NetBSD.org>
From: YAMAMOTO Takashi <yamt@netbsd.org>
List: source-changes
Date: 11/14/2004 11:07:29

Module Name:	src
Committed By:	yamt
Date:		Sun Nov 14 11:07:28 UTC 2004

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

Log Message:
import pf from OpenBSD 3.6. (kernel part)


Vendor Tag:	OPENBSD
Release Tags:	v3_6
		
C src/sys/dist/pf/net/if_pflog.c
C src/sys/dist/pf/net/if_pflog.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
C 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
C src/sys/dist/pf/net/if_pfsync.c
C src/sys/dist/pf/net/if_pfsync.h

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

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