CVS commit: src/regress/sys/kern/ipf

["Darren Reed" <darrenr%netbsd.org@localhost>]

Module Name:    src
Committed By:   darrenr
Date:           Mon Jan 30 16:06:52 UTC 2012

Update of /cvsroot/src/regress/sys/kern/ipf
In directory ivanova.netbsd.org:/tmp/cvs-serv20794

Log Message:
Import IPFilter 5.1.1

Status:

Vendor Tag:     DARRENR
Release Tags:   v5-1-1
                
C src/regress/sys/kern/ipf/iptest
C src/regress/sys/kern/ipf/bpftest
C src/regress/sys/kern/ipf/itest
C src/regress/sys/kern/ipf/nattest
C src/regress/sys/kern/ipf/test.format
C src/regress/sys/kern/ipf/vfycksum.pl
N src/regress/sys/kern/ipf/ipflib.sh
C src/regress/sys/kern/ipf/natipftest
C src/regress/sys/kern/ipf/intest
C src/regress/sys/kern/ipf/dotest
U src/regress/sys/kern/ipf/dotest6
C src/regress/sys/kern/ipf/ptest
U src/regress/sys/kern/ipf/README.TXT
C src/regress/sys/kern/ipf/logtest
C src/regress/sys/kern/ipf/mtest
N src/regress/sys/kern/ipf/expected/n2_6
C src/regress/sys/kern/ipf/expected/ni23
N src/regress/sys/kern/ipf/expected/p4
C src/regress/sys/kern/ipf/expected/f13
N src/regress/sys/kern/ipf/expected/in102
N src/regress/sys/kern/ipf/expected/ip3
N src/regress/sys/kern/ipf/expected/n14_6
U src/regress/sys/kern/ipf/expected/f19
C src/regress/sys/kern/ipf/expected/ni11
U src/regress/sys/kern/ipf/expected/f7
N src/regress/sys/kern/ipf/expected/f21
N src/regress/sys/kern/ipf/expected/n8_6
N src/regress/sys/kern/ipf/expected/p10
C src/regress/sys/kern/ipf/expected/n17
C src/regress/sys/kern/ipf/expected/ni6
U src/regress/sys/kern/ipf/expected/i16
C src/regress/sys/kern/ipf/expected/n7
U src/regress/sys/kern/ipf/expected/ipv6.5
C src/regress/sys/kern/ipf/expected/i7
N src/regress/sys/kern/ipf/expected/n100
U src/regress/sys/kern/ipf/expected/ipv6.2
U src/regress/sys/kern/ipf/expected/in7
C src/regress/sys/kern/ipf/expected/i11
C src/regress/sys/kern/ipf/expected/i19.dist
C src/regress/sys/kern/ipf/expected/n10
U src/regress/sys/kern/ipf/expected/ni1
N src/regress/sys/kern/ipf/expected/n9_6
U src/regress/sys/kern/ipf/expected/i23
N src/regress/sys/kern/ipf/expected/f26
U src/regress/sys/kern/ipf/expected/ni16
U src/regress/sys/kern/ipf/expected/f14
N src/regress/sys/kern/ipf/expected/n15_6
C src/regress/sys/kern/ipf/expected/l1
N src/regress/sys/kern/ipf/expected/p9
C src/regress/sys/kern/ipf/expected/p3
N src/regress/sys/kern/ipf/expected/n1_6
N src/regress/sys/kern/ipf/expected/in101
U src/regress/sys/kern/ipf/expected/f10
N src/regress/sys/kern/ipf/expected/p7
C src/regress/sys/kern/ipf/expected/ni20
N src/regress/sys/kern/ipf/expected/f28
N src/regress/sys/kern/ipf/expected/f22
U src/regress/sys/kern/ipf/expected/f4
C src/regress/sys/kern/ipf/expected/ni12
N src/regress/sys/kern/ipf/expected/ni18
C src/regress/sys/kern/ipf/expected/ni5
C src/regress/sys/kern/ipf/expected/n14
N src/regress/sys/kern/ipf/expected/p13
C src/regress/sys/kern/ipf/expected/i9
C src/regress/sys/kern/ipf/expected/ipv6.6
N src/regress/sys/kern/ipf/expected/n104
C src/regress/sys/kern/ipf/expected/n4
C src/regress/sys/kern/ipf/expected/i3
U src/regress/sys/kern/ipf/expected/i15
C src/regress/sys/kern/ipf/expected/in3
C src/regress/sys/kern/ipf/expected/i12
N src/regress/sys/kern/ipf/expected/n200
U src/regress/sys/kern/ipf/expected/in4
U src/regress/sys/kern/ipf/expected/i18
U src/regress/sys/kern/ipf/expected/ipv6.1
C src/regress/sys/kern/ipf/expected/n9
N src/regress/sys/kern/ipf/expected/n103
C src/regress/sys/kern/ipf/expected/i4
C src/regress/sys/kern/ipf/expected/n3
C src/regress/sys/kern/ipf/expected/i20
C src/regress/sys/kern/ipf/expected/ni2
C src/regress/sys/kern/ipf/expected/n13
U src/regress/sys/kern/ipf/expected/ni8
U src/regress/sys/kern/ipf/expected/ni15
U src/regress/sys/kern/ipf/expected/f9
N src/regress/sys/kern/ipf/expected/f25
U src/regress/sys/kern/ipf/expected/f3
U src/regress/sys/kern/ipf/expected/f17
N src/regress/sys/kern/ipf/expected/f27
N src/regress/sys/kern/ipf/expected/n4_6
U src/regress/sys/kern/ipf/expected/f1
N src/regress/sys/kern/ipf/expected/n12_6
N src/regress/sys/kern/ipf/expected/ni17
U src/regress/sys/kern/ipf/expected/f15
C src/regress/sys/kern/ipf/expected/p2
U src/regress/sys/kern/ipf/expected/bpf1
N src/regress/sys/kern/ipf/expected/n101
U src/regress/sys/kern/ipf/expected/ipv6.3
C src/regress/sys/kern/ipf/expected/i6
C src/regress/sys/kern/ipf/expected/n1
C src/regress/sys/kern/ipf/expected/i10
C src/regress/sys/kern/ipf/expected/in6
N src/regress/sys/kern/ipf/expected/n202
C src/regress/sys/kern/ipf/expected/n11
N src/regress/sys/kern/ipf/expected/i22
U src/regress/sys/kern/ipf/expected/ni7
C src/regress/sys/kern/ipf/expected/n16
N src/regress/sys/kern/ipf/expected/p11
C src/regress/sys/kern/ipf/expected/i17
C src/regress/sys/kern/ipf/expected/in1
N src/regress/sys/kern/ipf/expected/n106
N src/regress/sys/kern/ipf/expected/ipv6.4
C src/regress/sys/kern/ipf/expected/l1.b
C src/regress/sys/kern/ipf/expected/n6
C src/regress/sys/kern/ipf/expected/i1
C src/regress/sys/kern/ipf/expected/p5
C src/regress/sys/kern/ipf/expected/f18
C src/regress/sys/kern/ipf/expected/ip2
U src/regress/sys/kern/ipf/expected/f12
C src/regress/sys/kern/ipf/expected/ni10
N src/regress/sys/kern/ipf/expected/n13_6
N src/regress/sys/kern/ipf/expected/n5_6
U src/regress/sys/kern/ipf/expected/f20
U src/regress/sys/kern/ipf/expected/f6
U src/regress/sys/kern/ipf/expected/ni14
N src/regress/sys/kern/ipf/expected/n7_6
U src/regress/sys/kern/ipf/expected/f2
U src/regress/sys/kern/ipf/expected/f24
N src/regress/sys/kern/ipf/expected/n11_6
U src/regress/sys/kern/ipf/expected/f8
C src/regress/sys/kern/ipf/expected/p1
U src/regress/sys/kern/ipf/expected/f16
U src/regress/sys/kern/ipf/expected/bpf-f1
N src/regress/sys/kern/ipf/expected/n201
C src/regress/sys/kern/ipf/expected/in5
U src/regress/sys/kern/ipf/expected/i13
C src/regress/sys/kern/ipf/expected/n2
C src/regress/sys/kern/ipf/expected/i5
C src/regress/sys/kern/ipf/expected/n8
N src/regress/sys/kern/ipf/expected/n102
U src/regress/sys/kern/ipf/expected/i21
U src/regress/sys/kern/ipf/expected/ni9
C src/regress/sys/kern/ipf/expected/n12
U src/regress/sys/kern/ipf/expected/n18
U src/regress/sys/kern/ipf/expected/ni3
N src/regress/sys/kern/ipf/expected/p12
N src/regress/sys/kern/ipf/expected/n15
U src/regress/sys/kern/ipf/expected/ni4
C src/regress/sys/kern/ipf/expected/i2
C src/regress/sys/kern/ipf/expected/n5
N src/regress/sys/kern/ipf/expected/f30
C src/regress/sys/kern/ipf/expected/i8
N src/regress/sys/kern/ipf/expected/n105
C src/regress/sys/kern/ipf/expected/in2
C src/regress/sys/kern/ipf/expected/i14
C src/regress/sys/kern/ipf/expected/f11
N src/regress/sys/kern/ipf/expected/in100
C src/regress/sys/kern/ipf/expected/ip1
N src/regress/sys/kern/ipf/expected/p6
C src/regress/sys/kern/ipf/expected/ni21
U src/regress/sys/kern/ipf/expected/f5
N src/regress/sys/kern/ipf/expected/f29
N src/regress/sys/kern/ipf/expected/n6_6
C src/regress/sys/kern/ipf/expected/ni19
U src/regress/sys/kern/ipf/expected/ni13
U src/regress/sys/kern/ipf/regress/bpf1
U src/regress/sys/kern/ipf/regress/ni3.ipf
N src/regress/sys/kern/ipf/regress/f22
C src/regress/sys/kern/ipf/regress/i7
U src/regress/sys/kern/ipf/regress/ni4.ipf
U src/regress/sys/kern/ipf/regress/f10
N src/regress/sys/kern/ipf/regress/p10.pool
N src/regress/sys/kern/ipf/regress/n4_6
U src/regress/sys/kern/ipf/regress/i15
U src/regress/sys/kern/ipf/regress/in3
N src/regress/sys/kern/ipf/regress/n15_6
N src/regress/sys/kern/ipf/regress/n202
U src/regress/sys/kern/ipf/regress/n14
U src/regress/sys/kern/ipf/regress/ni5.nat
U src/regress/sys/kern/ipf/regress/ni2.nat
U src/regress/sys/kern/ipf/regress/l1
N src/regress/sys/kern/ipf/regress/n101
U src/regress/sys/kern/ipf/regress/i20
U src/regress/sys/kern/ipf/regress/ni12.ipf
N src/regress/sys/kern/ipf/regress/n106
N src/regress/sys/kern/ipf/regress/p7.pool
U src/regress/sys/kern/ipf/regress/n13
U src/regress/sys/kern/ipf/regress/ni15.ipf
U src/regress/sys/kern/ipf/regress/ni21.nat
U src/regress/sys/kern/ipf/regress/f7
N src/regress/sys/kern/ipf/regress/n14_6
C src/regress/sys/kern/ipf/regress/i12
U src/regress/sys/kern/ipf/regress/in4
N src/regress/sys/kern/ipf/regress/in102
C src/regress/sys/kern/ipf/regress/i18
N src/regress/sys/kern/ipf/regress/f28.ipf
U src/regress/sys/kern/ipf/regress/p3.pool
N src/regress/sys/kern/ipf/regress/n5_6
U src/regress/sys/kern/ipf/regress/bpf-f1
U src/regress/sys/kern/ipf/regress/f17
U src/regress/sys/kern/ipf/regress/n7
C src/regress/sys/kern/ipf/regress/ni14.nat
U src/regress/sys/kern/ipf/regress/ni20.ipf
C src/regress/sys/kern/ipf/regress/ni13.nat
N src/regress/sys/kern/ipf/regress/f25
U src/regress/sys/kern/ipf/regress/n9
U src/regress/sys/kern/ipf/regress/ni3.nat
N src/regress/sys/kern/ipf/regress/p9.nat
U src/regress/sys/kern/ipf/regress/n3
U src/regress/sys/kern/ipf/regress/i4
N src/regress/sys/kern/ipf/regress/p6.pool
N src/regress/sys/kern/ipf/regress/f21
U src/regress/sys/kern/ipf/regress/ni4.nat
C src/regress/sys/kern/ipf/regress/f13
N src/regress/sys/kern/ipf/regress/n7_6
N src/regress/sys/kern/ipf/regress/ip3
N src/regress/sys/kern/ipf/regress/p7.nat
U src/regress/sys/kern/ipf/regress/f19
U src/regress/sys/kern/ipf/regress/f9
N src/regress/sys/kern/ipf/regress/ipv6.4
N src/regress/sys/kern/ipf/regress/p6.ipf
U src/regress/sys/kern/ipf/regress/i16
U src/regress/sys/kern/ipf/regress/f3
U src/regress/sys/kern/ipf/regress/p1.ipf
N src/regress/sys/kern/ipf/regress/n16_6
N src/regress/sys/kern/ipf/regress/n102
U src/regress/sys/kern/ipf/regress/ni5.ipf
U src/regress/sys/kern/ipf/regress/n17
U src/regress/sys/kern/ipf/regress/ni2.ipf
N src/regress/sys/kern/ipf/regress/n201
U src/regress/sys/kern/ipf/regress/ni12.nat
U src/regress/sys/kern/ipf/regress/n10
N src/regress/sys/kern/ipf/regress/n105
U src/regress/sys/kern/ipf/regress/i23
U src/regress/sys/kern/ipf/regress/ni15.nat
U src/regress/sys/kern/ipf/regress/ni21.ipf
N src/regress/sys/kern/ipf/regress/n17_6
N src/regress/sys/kern/ipf/regress/p12.nat
N src/regress/sys/kern/ipf/regress/in101
N src/regress/sys/kern/ipf/regress/f29.ipf
U src/regress/sys/kern/ipf/regress/in7
N src/regress/sys/kern/ipf/regress/p11.pool
U src/regress/sys/kern/ipf/regress/ipv6.3
C src/regress/sys/kern/ipf/regress/i11
U src/regress/sys/kern/ipf/regress/f4
U src/regress/sys/kern/ipf/regress/f14
N src/regress/sys/kern/ipf/regress/n6_6
N src/regress/sys/kern/ipf/regress/p13.ipf
N src/regress/sys/kern/ipf/regress/f26
U src/regress/sys/kern/ipf/regress/ni14.ipf
U src/regress/sys/kern/ipf/regress/ni20.nat
U src/regress/sys/kern/ipf/regress/i9
U src/regress/sys/kern/ipf/regress/ni13.ipf
U src/regress/sys/kern/ipf/regress/i3
U src/regress/sys/kern/ipf/regress/n4
U src/regress/sys/kern/ipf/regress/ni16.nat
U src/regress/sys/kern/ipf/regress/f16
U src/regress/sys/kern/ipf/regress/ni11.nat
N src/regress/sys/kern/ipf/regress/f28.pool
N src/regress/sys/kern/ipf/regress/p4.pool
U src/regress/sys/kern/ipf/regress/i1
U src/regress/sys/kern/ipf/regress/n6
U src/regress/sys/kern/ipf/regress/f24
N src/regress/sys/kern/ipf/regress/ni18.nat
N src/regress/sys/kern/ipf/regress/p11.nat
N src/regress/sys/kern/ipf/regress/n2_6
N src/regress/sys/kern/ipf/regress/p6.whois
C src/regress/sys/kern/ipf/regress/i21
U src/regress/sys/kern/ipf/regress/ni19.ipf
N src/regress/sys/kern/ipf/regress/n13_6
U src/regress/sys/kern/ipf/regress/n12
U src/regress/sys/kern/ipf/regress/n18
U src/regress/sys/kern/ipf/regress/i19
U src/regress/sys/kern/ipf/regress/in5
U src/regress/sys/kern/ipf/regress/ni10.ipf
U src/regress/sys/kern/ipf/regress/ipv6.1
N src/regress/sys/kern/ipf/regress/n8_6
U src/regress/sys/kern/ipf/regress/f6
U src/regress/sys/kern/ipf/regress/i13
U src/regress/sys/kern/ipf/regress/ni23.nat
N src/regress/sys/kern/ipf/regress/ni17.ipf
N src/regress/sys/kern/ipf/regress/f30
U src/regress/sys/kern/ipf/regress/ni7.nat
N src/regress/sys/kern/ipf/regress/n9_6
C src/regress/sys/kern/ipf/regress/in2
U src/regress/sys/kern/ipf/regress/ipv6.6
U src/regress/sys/kern/ipf/regress/f1
C src/regress/sys/kern/ipf/regress/i14
N src/regress/sys/kern/ipf/regress/n15
N src/regress/sys/kern/ipf/regress/p4.nat
N src/regress/sys/kern/ipf/regress/n12_6
N src/regress/sys/kern/ipf/regress/n100
N src/regress/sys/kern/ipf/regress/p13.pool
U src/regress/sys/kern/ipf/regress/ni9.nat
U src/regress/sys/kern/ipf/regress/p2.ipf
U src/regress/sys/kern/ipf/regress/ni8.ipf
U src/regress/sys/kern/ipf/regress/p5.ipf
U src/regress/sys/kern/ipf/regress/n1
U src/regress/sys/kern/ipf/regress/i6
U src/regress/sys/kern/ipf/regress/f11
U src/regress/sys/kern/ipf/regress/ni1.ipf
U src/regress/sys/kern/ipf/regress/ip1
U src/regress/sys/kern/ipf/regress/ni6.ipf
U src/regress/sys/kern/ipf/regress/f15
U src/regress/sys/kern/ipf/regress/ni16.ipf
U src/regress/sys/kern/ipf/regress/ni11.ipf
N src/regress/sys/kern/ipf/regress/f27
U src/regress/sys/kern/ipf/regress/n5
C src/regress/sys/kern/ipf/regress/i2
N src/regress/sys/kern/ipf/regress/n1_6
C src/regress/sys/kern/ipf/regress/i8
N src/regress/sys/kern/ipf/regress/p12.pool
N src/regress/sys/kern/ipf/regress/ni18.ipf
U src/regress/sys/kern/ipf/regress/n11
U src/regress/sys/kern/ipf/regress/ni19.nat
N src/regress/sys/kern/ipf/regress/p10.nat
N src/regress/sys/kern/ipf/regress/n10_6
N src/regress/sys/kern/ipf/regress/i22
N src/regress/sys/kern/ipf/regress/n104
U src/regress/sys/kern/ipf/regress/ni10.nat
N src/regress/sys/kern/ipf/regress/p9.pool
U src/regress/sys/kern/ipf/regress/i10
U src/regress/sys/kern/ipf/regress/f5
U src/regress/sys/kern/ipf/regress/ipv6.2
U src/regress/sys/kern/ipf/regress/in6
N src/regress/sys/kern/ipf/regress/in100
U src/regress/sys/kern/ipf/regress/ni23.ipf
U src/regress/sys/kern/ipf/regress/ni17.nat
C src/regress/sys/kern/ipf/regress/i17
U src/regress/sys/kern/ipf/regress/f2
C src/regress/sys/kern/ipf/regress/ipv6.5
U src/regress/sys/kern/ipf/regress/in1
U src/regress/sys/kern/ipf/regress/ni7.ipf
U src/regress/sys/kern/ipf/regress/f8
N src/regress/sys/kern/ipf/regress/f29.pool
U src/regress/sys/kern/ipf/regress/p5.pool
N src/regress/sys/kern/ipf/regress/n11_6
N src/regress/sys/kern/ipf/regress/n103
C src/regress/sys/kern/ipf/regress/p3.ipf
N src/regress/sys/kern/ipf/regress/n200
U src/regress/sys/kern/ipf/regress/n16
U src/regress/sys/kern/ipf/regress/ni9.ipf
U src/regress/sys/kern/ipf/regress/i5
U src/regress/sys/kern/ipf/regress/n2
C src/regress/sys/kern/ipf/regress/p1.pool
U src/regress/sys/kern/ipf/regress/n8
U src/regress/sys/kern/ipf/regress/ni8.nat
U src/regress/sys/kern/ipf/regress/f20
U src/regress/sys/kern/ipf/regress/ni1.nat
U src/regress/sys/kern/ipf/regress/f18
U src/regress/sys/kern/ipf/regress/ip2
U src/regress/sys/kern/ipf/regress/f12
U src/regress/sys/kern/ipf/regress/ni6.nat
C src/regress/sys/kern/ipf/input/ni13
N src/regress/sys/kern/ipf/input/p12
N src/regress/sys/kern/ipf/input/n15
N src/regress/sys/kern/ipf/input/n6_6
C src/regress/sys/kern/ipf/input/ni4
C src/regress/sys/kern/ipf/input/ni19
U src/regress/sys/kern/ipf/input/l1
U src/regress/sys/kern/ipf/input/ni21
N src/regress/sys/kern/ipf/input/f30
U src/regress/sys/kern/ipf/input/p3
N src/regress/sys/kern/ipf/input/p9
U src/regress/sys/kern/ipf/input/f11
N src/regress/sys/kern/ipf/input/n105
U src/regress/sys/kern/ipf/input/ipv6.1
N src/regress/sys/kern/ipf/input/f29
N src/regress/sys/kern/ipf/input/n13_6
N src/regress/sys/kern/ipf/input/n12_6
C src/regress/sys/kern/ipf/input/ipv6.6
U src/regress/sys/kern/ipf/input/f24
N src/regress/sys/kern/ipf/input/n102
U src/regress/sys/kern/ipf/input/f16
N src/regress/sys/kern/ipf/input/n201
U src/regress/sys/kern/ipf/input/n7
N src/regress/sys/kern/ipf/input/p4
C src/regress/sys/kern/ipf/input/ni9
C src/regress/sys/kern/ipf/input/ni14
N src/regress/sys/kern/ipf/input/n7_6
C src/regress/sys/kern/ipf/input/n12
U src/regress/sys/kern/ipf/input/n18
C src/regress/sys/kern/ipf/input/ni3
U src/regress/sys/kern/ipf/input/f7
N src/regress/sys/kern/ipf/input/n5_6
U src/regress/sys/kern/ipf/input/f3
C src/regress/sys/kern/ipf/input/ni7
C src/regress/sys/kern/ipf/input/n16
U src/regress/sys/kern/ipf/input/f9
N src/regress/sys/kern/ipf/input/p11
C src/regress/sys/kern/ipf/input/ni10
N src/regress/sys/kern/ipf/input/n106
U src/regress/sys/kern/ipf/input/n3
U src/regress/sys/kern/ipf/input/f18
C src/regress/sys/kern/ipf/input/n9
U src/regress/sys/kern/ipf/input/f12
N src/regress/sys/kern/ipf/input/n10_6
U src/regress/sys/kern/ipf/input/f20
U src/regress/sys/kern/ipf/input/ipv6.2
N src/regress/sys/kern/ipf/input/f27
U src/regress/sys/kern/ipf/input/ipv6.5
N src/regress/sys/kern/ipf/input/n11_6
N src/regress/sys/kern/ipf/input/n202
U src/regress/sys/kern/ipf/input/n4
U src/regress/sys/kern/ipf/input/f15
U src/regress/sys/kern/ipf/input/ip2.data
N src/regress/sys/kern/ipf/input/n101
N src/regress/sys/kern/ipf/input/p7
U src/regress/sys/kern/ipf/input/f4
U src/regress/sys/kern/ipf/input/n11
U src/regress/sys/kern/ipf/input/ni17
N src/regress/sys/kern/ipf/input/n4_6
U src/regress/sys/kern/ipf/input/p5
C src/regress/sys/kern/ipf/input/ni2
U src/regress/sys/kern/ipf/input/f6
U src/regress/sys/kern/ipf/input/n13
C src/regress/sys/kern/ipf/input/ni8
C src/regress/sys/kern/ipf/input/ni15
N src/regress/sys/kern/ipf/input/f25
N src/regress/sys/kern/ipf/input/n103
N src/regress/sys/kern/ipf/input/n200
U src/regress/sys/kern/ipf/input/n6
U src/regress/sys/kern/ipf/input/f17
N src/regress/sys/kern/ipf/input/n15_6
N src/regress/sys/kern/ipf/input/n14_6
U src/regress/sys/kern/ipf/input/n1
U src/regress/sys/kern/ipf/input/f10
N src/regress/sys/kern/ipf/input/n104
N src/regress/sys/kern/ipf/input/f28
N src/regress/sys/kern/ipf/input/f22
C src/regress/sys/kern/ipf/input/ni5
U src/regress/sys/kern/ipf/input/f1
N src/regress/sys/kern/ipf/input/ni18
U src/regress/sys/kern/ipf/input/n14
N src/regress/sys/kern/ipf/input/p13
C src/regress/sys/kern/ipf/input/ni12
C src/regress/sys/kern/ipf/input/ni20
N src/regress/sys/kern/ipf/input/n1_6
U src/regress/sys/kern/ipf/input/p2
N src/regress/sys/kern/ipf/input/p6
C src/regress/sys/kern/ipf/input/ni16
C src/regress/sys/kern/ipf/input/n10
U src/regress/sys/kern/ipf/input/f5
C src/regress/sys/kern/ipf/input/ni1
N src/regress/sys/kern/ipf/input/f26
N src/regress/sys/kern/ipf/input/ipv6.4
N src/regress/sys/kern/ipf/input/n9_6
U src/regress/sys/kern/ipf/input/f14
U src/regress/sys/kern/ipf/input/n5
N src/regress/sys/kern/ipf/input/n100
N src/regress/sys/kern/ipf/input/n17_6
C src/regress/sys/kern/ipf/input/n8
C src/regress/sys/kern/ipf/input/f13
U src/regress/sys/kern/ipf/input/n2
U src/regress/sys/kern/ipf/input/f19
N src/regress/sys/kern/ipf/input/n8_6
N src/regress/sys/kern/ipf/input/f21
U src/regress/sys/kern/ipf/input/ipv6.3
U src/regress/sys/kern/ipf/input/f8
C src/regress/sys/kern/ipf/input/ni11
N src/regress/sys/kern/ipf/input/p10
C src/regress/sys/kern/ipf/input/n17
U src/regress/sys/kern/ipf/input/f2
U src/regress/sys/kern/ipf/input/ni6
U src/regress/sys/kern/ipf/input/p1
U src/regress/sys/kern/ipf/input/ni23
N src/regress/sys/kern/ipf/input/n2_6

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

        cvs checkout -jDARRENR:yesterday -jDARRENR src/regress/sys/kern/ipf