CVS commit: [prg-localcount2] src

["Paul Goyette" <pgoyette%netbsd.org@localhost>]

Module Name:    src
Committed By:   pgoyette
Date:           Fri May 19 00:23:00 UTC 2017

Modified Files:
        src/bin/sh [prg-localcount2]: Makefile builtins.def eval.c exec.c
            jobs.c main.c miscbltin.c options.c options.h output.c parser.c
            redir.c sh.1 shell.h show.c show.h syntax.h var.c
        src/distrib/amd64/installimage [prg-localcount2]: Makefile
        src/distrib/amd64/uefi-installimage [prg-localcount2]: Makefile
        src/distrib/arc/ramdisk [prg-localcount2]: Makefile
        src/distrib/notes/common [prg-localcount2]: main
        src/distrib/sets/lists/base [prg-localcount2]: shl.mi
        src/distrib/sets/lists/debug [prg-localcount2]: shl.mi
        src/distrib/sets/lists/man [prg-localcount2]: mi
        src/distrib/sets/lists/tests [prg-localcount2]: mi
        src/distrib/utils/embedded/conf [prg-localcount2]: evbarm.conf
        src/doc [prg-localcount2]: CHANGES
        src/etc/mtree [prg-localcount2]: NetBSD.dist.tests
        src/external/bsd/atf/dist/atf-sh [prg-localcount2]: atf-sh-api.3
        src/external/bsd/bind/lib/libdns [prg-localcount2]: Makefile
        src/external/cddl/osnet/dist/cmd/dtrace [prg-localcount2]: dtrace.1
        src/external/gpl3/gcc/dist/gcc [prg-localcount2]: auto-profile.c
            graphite-isl-ast-to-gimple.c system.h
        src/lib/libc/gen [prg-localcount2]: assert.c signalname.3
        src/lib/libc/sys [prg-localcount2]: execve.2 getdents.2 intro.2
            lfs_markv.2 lfs_segclean.2 lfs_segwait.2 mmap.2 mount.2 mprotect.2
            open.2 statvfs.2 sync.2 truncate.2 undelete.2
        src/lib/libcurses [prg-localcount2]: curses.3
        src/lib/libm [prg-localcount2]: shlib_version
        src/lib/libm/compat [prg-localcount2]: compat_cabs.c compat_cabsf.c
        src/lib/librumpclient [prg-localcount2]: Makefile rumpclient.h
        src/lib/librumphijack [prg-localcount2]: Makefile
        src/lib/librumpuser [prg-localcount2]: Makefile rumpuser_port.h
        src/lib/libterminfo [prg-localcount2]: term.c
        src/regress [prg-localcount2]: Makefile
        src/regress/sys [prg-localcount2]: Makefile
        src/regress/sys/fs [prg-localcount2]: Makefile
        src/share/man/man4 [prg-localcount2]: Makefile virtio.4
        src/share/man/man9 [prg-localcount2]: uvm_map.9
        src/share/misc [prg-localcount2]: acronyms.comp airport
        src/sys/arch/amd64/conf [prg-localcount2]: XEN3_DOMU
        src/sys/arch/arm/arm [prg-localcount2]: ast.c
        src/sys/arch/evbmips/conf [prg-localcount2]: LOONGSON
        src/sys/arch/mips/mips [prg-localcount2]: cache.c mipsX_subr.S
            pmap_machdep.c vm_machdep.c
        src/sys/arch/pmax/ibus [prg-localcount2]: dz_ibus.c
        src/sys/arch/pmax/pmax [prg-localcount2]: bus.c bus_dma.c
        src/sys/arch/x86/include [prg-localcount2]: cpu.h specialreg.h
        src/sys/arch/x86/x86 [prg-localcount2]: procfs_machdep.c
        src/sys/dev [prg-localcount2]: audio.c
        src/sys/dev/i2c [prg-localcount2]: axp20x.c
        src/sys/dev/ic [prg-localcount2]: rtl8169.c
        src/sys/dev/pci [prg-localcount2]: if_re_pci.c if_rtwn.c if_vioif.c
            vioscsi.c
        src/sys/dev/pci/ixgbe [prg-localcount2]: ix_txrx.c ixgbe.c ixgbe_type.h
        src/sys/dev/rasops [prg-localcount2]: rasops.c
        src/sys/dev/usb [prg-localcount2]: uaudio.c uts.c
        src/sys/external/bsd/ipf/netinet [prg-localcount2]: ip_fil_netbsd.c
        src/sys/kern [prg-localcount2]: kern_descrip.c kern_event.c vfs_mount.c
            vfs_vnode.c
        src/sys/modules/lua [prg-localcount2]: lua.c
        src/sys/net/npf [prg-localcount2]: npf_ctl.c
        src/sys/netinet [prg-localcount2]: if_arp.c in.c in_var.h ip_carp.c
            ip_output.c
        src/sys/netinet6 [prg-localcount2]: mld6.c
        src/sys/netipsec [prg-localcount2]: ipsec.c ipsec.h ipsec_input.c
            ipsec_output.c key.c key.h keydb.h keysock.c xform_ah.c xform_esp.c
            xform_ipcomp.c xform_ipip.c
        src/sys/opencrypto [prg-localcount2]: crypto.c cryptodev.c cryptodev.h
            cryptosoft.c deflate.c ocryptodev.c
        src/sys/rump/include/rump [prg-localcount2]: rump.h
        src/sys/rump/librump/rumpkern [prg-localcount2]: vm.c
        src/sys/uvm [prg-localcount2]: uvm_extern.h uvm_map.h
        src/sys/uvm/pmap [prg-localcount2]: pmap.c pmap_segtab.c
        src/tests/bin/sh [prg-localcount2]: t_expand.sh t_redircloexec.sh
        src/tests/net [prg-localcount2]: net_common.sh
        src/tests/net/carp [prg-localcount2]: t_basic.sh
        src/tests/net/ipsec [prg-localcount2]: Makefile algorithms.sh common.sh
            t_ipsec_gif.sh t_ipsec_l2tp.sh t_ipsec_transport.sh
            t_ipsec_tunnel.sh t_ipsec_tunnel_odd.sh
        src/tests/usr.bin [prg-localcount2]: Makefile
        src/tests/usr.bin/cc [prg-localcount2]: t_hello.sh
        src/usr.bin/infocmp [prg-localcount2]: infocmp.c
        src/usr.bin/rump_allserver [prg-localcount2]: Makefile
        src/usr.bin/rump_dhcpclient [prg-localcount2]: Makefile
        src/usr.bin/rump_halt [prg-localcount2]: Makefile
        src/usr.bin/rump_server [prg-localcount2]: Makefile
        src/usr.bin/su [prg-localcount2]: su.1
        src/usr.sbin/npf/npfctl [prg-localcount2]: npf_show.c
        src/usr.sbin/npf/npftest [prg-localcount2]: npftest.c
Added Files:
        src/share/man/man4 [prg-localcount2]: vioscsi.4
        src/tests/net/ipsec [prg-localcount2]: t_ipsec_misc.sh
        src/tests/usr.bin/c++ [prg-localcount2]: Makefile t_cxxruntime.sh
            t_hello.sh t_static_destructor.sh
Removed Files:
        src/regress/sys/crypto [prg-localcount2]: Makefile Makefile.inc
        src/regress/sys/crypto/blowfish [prg-localcount2]: Makefile bftest.c
        src/regress/sys/crypto/blowfish_asm [prg-localcount2]: Makefile
        src/regress/sys/crypto/cast128 [prg-localcount2]: Makefile casttest.c
        src/regress/sys/crypto/des [prg-localcount2]: Makefile destest.c
        src/regress/sys/crypto/des_asm [prg-localcount2]: Makefile
        src/regress/sys/crypto/rijndael [prg-localcount2]: Makefile
            rijndaeltest.c
        src/regress/sys/fs/getdents [prg-localcount2]: Makefile getdents.c
        src/regress/sys/fs/lseek [prg-localcount2]: Makefile lseek.c
        src/regress/sys/kern/callout1 [prg-localcount2]: Makefile
            test_callout1.c
        src/regress/sys/kern/mutex1 [prg-localcount2]: Makefile test_mutex1.c
        src/regress/sys/kern/mutex2 [prg-localcount2]: Makefile test_mutex2.c
        src/regress/sys/kern/priority_inheritance1 [prg-localcount2]: Makefile
            test_priority_inheritance1.c
        src/regress/sys/kern/rwlock1 [prg-localcount2]: Makefile test_rwlock1.c
        src/regress/sys/net [prg-localcount2]: Makefile
        src/regress/sys/net/bpf [prg-localcount2]: Makefile
        src/regress/sys/net/bpf/interface [prg-localcount2]: Makefile
            interface.c
        src/regress/sys/net/bpf/out-of-bounds [prg-localcount2]: Makefile
            out-of-bounds.sh
        src/regress/sys/uvm [prg-localcount2]: Makefile Makefile.inc
        src/regress/sys/uvm/stack_exec [prg-localcount2]: Makefile tramptest.c
        src/regress/sys/uvm/stack_noexec [prg-localcount2]: Makefile
            tramptest.c
        src/regress/usr.bin [prg-localcount2]: Makefile
        src/regress/usr.bin/c++ [prg-localcount2]: Makefile
        src/regress/usr.bin/c++/static_destructor [prg-localcount2]: Makefile
            expected static_destructor.cc
        src/regress/usr.bin/rtld [prg-localcount2]: Makefile
        src/regress/usr.bin/rtld/testlib [prg-localcount2]: Makefile ccexc.cc
            construct.cc virt.cc

Log Message:
Resolve conflicts from previous merge (all resulting from $NetBSD
keywork expansion)


To generate a diff of this commit:
cvs rdiff -u -r1.104 -r1.104.2.1 src/bin/sh/Makefile
cvs rdiff -u -r1.24 -r1.24.2.1 src/bin/sh/builtins.def
cvs rdiff -u -r1.131.2.1 -r1.131.2.2 src/bin/sh/eval.c
cvs rdiff -u -r1.46 -r1.46.6.1 src/bin/sh/exec.c src/bin/sh/options.c
cvs rdiff -u -r1.79.6.2 -r1.79.6.3 src/bin/sh/jobs.c
cvs rdiff -u -r1.68 -r1.68.2.1 src/bin/sh/main.c
cvs rdiff -u -r1.43 -r1.43.6.1 src/bin/sh/miscbltin.c
cvs rdiff -u -r1.25 -r1.25.6.1 src/bin/sh/options.h
cvs rdiff -u -r1.35 -r1.35.6.1 src/bin/sh/output.c
cvs rdiff -u -r1.120.6.1 -r1.120.6.2 src/bin/sh/parser.c
cvs rdiff -u -r1.53.2.1 -r1.53.2.2 src/bin/sh/redir.c
cvs rdiff -u -r1.131.2.2 -r1.131.2.3 src/bin/sh/sh.1
cvs rdiff -u -r1.20 -r1.20.2.1 src/bin/sh/shell.h
cvs rdiff -u -r1.36.2.1 -r1.36.2.2 src/bin/sh/show.c
cvs rdiff -u -r1.9 -r1.9.2.1 src/bin/sh/show.h
cvs rdiff -u -r1.6 -r1.6.6.1 src/bin/sh/syntax.h
cvs rdiff -u -r1.49.6.2 -r1.49.6.3 src/bin/sh/var.c
cvs rdiff -u -r1.6 -r1.6.6.1 src/distrib/amd64/installimage/Makefile
cvs rdiff -u -r1.1 -r1.1.6.1 src/distrib/amd64/uefi-installimage/Makefile
cvs rdiff -u -r1.25 -r1.25.2.1 src/distrib/arc/ramdisk/Makefile
cvs rdiff -u -r1.534 -r1.534.2.1 src/distrib/notes/common/main
cvs rdiff -u -r1.811.2.1 -r1.811.2.2 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.170.2.1 -r1.170.2.2 src/distrib/sets/lists/debug/shl.mi
cvs rdiff -u -r1.1554 -r1.1554.2.1 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.735.2.2 -r1.735.2.3 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.26 -r1.26.2.1 src/distrib/utils/embedded/conf/evbarm.conf
cvs rdiff -u -r1.2277.2.2 -r1.2277.2.3 src/doc/CHANGES
cvs rdiff -u -r1.145 -r1.145.2.1 src/etc/mtree/NetBSD.dist.tests
cvs rdiff -u -r1.1.1.7 -r1.1.1.7.16.1 \
    src/external/bsd/atf/dist/atf-sh/atf-sh-api.3
cvs rdiff -u -r1.13 -r1.13.16.1 src/external/bsd/bind/lib/libdns/Makefile
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.36.1 \
    src/external/cddl/osnet/dist/cmd/dtrace/dtrace.1
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.6.1 \
    src/external/gpl3/gcc/dist/gcc/auto-profile.c \
    src/external/gpl3/gcc/dist/gcc/graphite-isl-ast-to-gimple.c
cvs rdiff -u -r1.4 -r1.4.6.1 src/external/gpl3/gcc/dist/gcc/system.h
cvs rdiff -u -r1.17 -r1.17.22.1 src/lib/libc/gen/assert.c
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/lib/libc/gen/signalname.3
cvs rdiff -u -r1.40 -r1.40.36.1 src/lib/libc/sys/execve.2
cvs rdiff -u -r1.24 -r1.24.6.1 src/lib/libc/sys/getdents.2
cvs rdiff -u -r1.58 -r1.58.4.1 src/lib/libc/sys/intro.2
cvs rdiff -u -r1.11 -r1.11.54.1 src/lib/libc/sys/lfs_markv.2
cvs rdiff -u -r1.8 -r1.8.54.1 src/lib/libc/sys/lfs_segclean.2 \
    src/lib/libc/sys/lfs_segwait.2
cvs rdiff -u -r1.48.6.1 -r1.48.6.2 src/lib/libc/sys/mmap.2
cvs rdiff -u -r1.49 -r1.49.30.1 src/lib/libc/sys/mount.2
cvs rdiff -u -r1.24.34.1 -r1.24.34.2 src/lib/libc/sys/mprotect.2
cvs rdiff -u -r1.56 -r1.56.16.1 src/lib/libc/sys/open.2
cvs rdiff -u -r1.5 -r1.5.36.1 src/lib/libc/sys/statvfs.2
cvs rdiff -u -r1.17 -r1.17.36.1 src/lib/libc/sys/sync.2
cvs rdiff -u -r1.30 -r1.30.14.1 src/lib/libc/sys/truncate.2
cvs rdiff -u -r1.16 -r1.16.6.1 src/lib/libc/sys/undelete.2
cvs rdiff -u -r1.71 -r1.71.2.1 src/lib/libcurses/curses.3
cvs rdiff -u -r1.15 -r1.15.2.1 src/lib/libm/shlib_version
cvs rdiff -u -r1.2 -r1.2.62.1 src/lib/libm/compat/compat_cabs.c \
    src/lib/libm/compat/compat_cabsf.c
cvs rdiff -u -r1.11.6.1 -r1.11.6.2 src/lib/librumpclient/Makefile
cvs rdiff -u -r1.15 -r1.15.20.1 src/lib/librumpclient/rumpclient.h
cvs rdiff -u -r1.17.6.1 -r1.17.6.2 src/lib/librumphijack/Makefile
cvs rdiff -u -r1.24.6.1 -r1.24.6.2 src/lib/librumpuser/Makefile
cvs rdiff -u -r1.48 -r1.48.4.1 src/lib/librumpuser/rumpuser_port.h
cvs rdiff -u -r1.21.2.1 -r1.21.2.2 src/lib/libterminfo/term.c
cvs rdiff -u -r1.19 -r1.19.36.1 src/regress/Makefile
cvs rdiff -u -r1.12 -r1.12.74.1 src/regress/sys/Makefile
cvs rdiff -u -r1.3 -r0 src/regress/sys/crypto/Makefile
cvs rdiff -u -r1.8 -r0 src/regress/sys/crypto/Makefile.inc
cvs rdiff -u -r1.5 -r0 src/regress/sys/crypto/blowfish/Makefile
cvs rdiff -u -r1.6 -r0 src/regress/sys/crypto/blowfish/bftest.c
cvs rdiff -u -r1.3 -r0 src/regress/sys/crypto/blowfish_asm/Makefile
cvs rdiff -u -r1.5 -r0 src/regress/sys/crypto/cast128/Makefile
cvs rdiff -u -r1.6 -r0 src/regress/sys/crypto/cast128/casttest.c
cvs rdiff -u -r1.6 -r0 src/regress/sys/crypto/des/Makefile
cvs rdiff -u -r1.3 -r0 src/regress/sys/crypto/des/destest.c
cvs rdiff -u -r1.4 -r0 src/regress/sys/crypto/des_asm/Makefile
cvs rdiff -u -r1.6 -r0 src/regress/sys/crypto/rijndael/Makefile
cvs rdiff -u -r1.8 -r0 src/regress/sys/crypto/rijndael/rijndaeltest.c
cvs rdiff -u -r1.8 -r1.8.36.1 src/regress/sys/fs/Makefile
cvs rdiff -u -r1.1 -r0 src/regress/sys/fs/getdents/Makefile
cvs rdiff -u -r1.9 -r0 src/regress/sys/fs/getdents/getdents.c
cvs rdiff -u -r1.3 -r0 src/regress/sys/fs/lseek/Makefile
cvs rdiff -u -r1.8 -r0 src/regress/sys/fs/lseek/lseek.c
cvs rdiff -u -r1.1 -r0 src/regress/sys/kern/callout1/Makefile
cvs rdiff -u -r1.3 -r0 src/regress/sys/kern/callout1/test_callout1.c
cvs rdiff -u -r1.3 -r0 src/regress/sys/kern/mutex1/Makefile
cvs rdiff -u -r1.5 -r0 src/regress/sys/kern/mutex1/test_mutex1.c
cvs rdiff -u -r1.2 -r0 src/regress/sys/kern/mutex2/Makefile
cvs rdiff -u -r1.5 -r0 src/regress/sys/kern/mutex2/test_mutex2.c
cvs rdiff -u -r1.1 -r0 src/regress/sys/kern/priority_inheritance1/Makefile
cvs rdiff -u -r1.2 -r0 \
    src/regress/sys/kern/priority_inheritance1/test_priority_inheritance1.c
cvs rdiff -u -r1.2 -r0 src/regress/sys/kern/rwlock1/Makefile
cvs rdiff -u -r1.6 -r0 src/regress/sys/kern/rwlock1/test_rwlock1.c
cvs rdiff -u -r1.3 -r0 src/regress/sys/net/Makefile
cvs rdiff -u -r1.3 -r0 src/regress/sys/net/bpf/Makefile
cvs rdiff -u -r1.1 -r0 src/regress/sys/net/bpf/interface/Makefile
cvs rdiff -u -r1.2 -r0 src/regress/sys/net/bpf/interface/interface.c
cvs rdiff -u -r1.1 -r0 src/regress/sys/net/bpf/out-of-bounds/Makefile \
    src/regress/sys/net/bpf/out-of-bounds/out-of-bounds.sh
cvs rdiff -u -r1.10 -r0 src/regress/sys/uvm/Makefile
cvs rdiff -u -r1.1 -r0 src/regress/sys/uvm/Makefile.inc
cvs rdiff -u -r1.3 -r0 src/regress/sys/uvm/stack_exec/Makefile
cvs rdiff -u -r1.1 -r0 src/regress/sys/uvm/stack_exec/tramptest.c
cvs rdiff -u -r1.4 -r0 src/regress/sys/uvm/stack_noexec/Makefile
cvs rdiff -u -r1.2 -r0 src/regress/sys/uvm/stack_noexec/tramptest.c
cvs rdiff -u -r1.19 -r0 src/regress/usr.bin/Makefile
cvs rdiff -u -r1.1 -r0 src/regress/usr.bin/c++/Makefile
cvs rdiff -u -r1.1 -r0 src/regress/usr.bin/c++/static_destructor/Makefile \
    src/regress/usr.bin/c++/static_destructor/expected \
    src/regress/usr.bin/c++/static_destructor/static_destructor.cc
cvs rdiff -u -r1.4 -r0 src/regress/usr.bin/rtld/Makefile
cvs rdiff -u -r1.10 -r0 src/regress/usr.bin/rtld/testlib/Makefile
cvs rdiff -u -r1.1 -r0 src/regress/usr.bin/rtld/testlib/ccexc.cc \
    src/regress/usr.bin/rtld/testlib/virt.cc
cvs rdiff -u -r1.2 -r0 src/regress/usr.bin/rtld/testlib/construct.cc
cvs rdiff -u -r1.635 -r1.635.2.1 src/share/man/man4/Makefile
cvs rdiff -u -r0 -r1.2.2.2 src/share/man/man4/vioscsi.4
cvs rdiff -u -r1.7 -r1.7.2.1 src/share/man/man4/virtio.4
cvs rdiff -u -r1.6.6.1 -r1.6.6.2 src/share/man/man9/uvm_map.9
cvs rdiff -u -r1.179.2.1 -r1.179.2.2 src/share/misc/acronyms.comp
cvs rdiff -u -r1.64 -r1.64.2.1 src/share/misc/airport
cvs rdiff -u -r1.73 -r1.73.4.1 src/sys/arch/amd64/conf/XEN3_DOMU
cvs rdiff -u -r1.28 -r1.28.8.1 src/sys/arch/arm/arm/ast.c
cvs rdiff -u -r1.30 -r1.30.4.1 src/sys/arch/evbmips/conf/LOONGSON
cvs rdiff -u -r1.55 -r1.55.2.1 src/sys/arch/mips/mips/cache.c
cvs rdiff -u -r1.96.6.1 -r1.96.6.2 src/sys/arch/mips/mips/mipsX_subr.S
cvs rdiff -u -r1.12.6.1 -r1.12.6.2 src/sys/arch/mips/mips/pmap_machdep.c
cvs rdiff -u -r1.153.6.1 -r1.153.6.2 src/sys/arch/mips/mips/vm_machdep.c
cvs rdiff -u -r1.11 -r1.11.44.1 src/sys/arch/pmax/ibus/dz_ibus.c
cvs rdiff -u -r1.1 -r1.1.10.1 src/sys/arch/pmax/pmax/bus.c
cvs rdiff -u -r1.58 -r1.58.8.1 src/sys/arch/pmax/pmax/bus_dma.c
cvs rdiff -u -r1.69 -r1.69.2.1 src/sys/arch/x86/include/cpu.h
cvs rdiff -u -r1.97 -r1.97.2.1 src/sys/arch/x86/include/specialreg.h
cvs rdiff -u -r1.14 -r1.14.6.1 src/sys/arch/x86/x86/procfs_machdep.c
cvs rdiff -u -r1.327.2.4 -r1.327.2.5 src/sys/dev/audio.c
cvs rdiff -u -r1.4 -r1.4.8.1 src/sys/dev/i2c/axp20x.c
cvs rdiff -u -r1.150 -r1.150.2.1 src/sys/dev/ic/rtl8169.c
cvs rdiff -u -r1.46.2.1 -r1.46.2.2 src/sys/dev/pci/if_re_pci.c
cvs rdiff -u -r1.11 -r1.11.4.1 src/sys/dev/pci/if_rtwn.c
cvs rdiff -u -r1.34 -r1.34.4.1 src/sys/dev/pci/if_vioif.c
cvs rdiff -u -r1.16 -r1.16.4.1 src/sys/dev/pci/vioscsi.c
cvs rdiff -u -r1.22.4.1 -r1.22.4.2 src/sys/dev/pci/ixgbe/ix_txrx.c
cvs rdiff -u -r1.80.4.1 -r1.80.4.2 src/sys/dev/pci/ixgbe/ixgbe.c
cvs rdiff -u -r1.19 -r1.19.4.1 src/sys/dev/pci/ixgbe/ixgbe_type.h
cvs rdiff -u -r1.75 -r1.75.2.1 src/sys/dev/rasops/rasops.c
cvs rdiff -u -r1.147 -r1.147.8.1 src/sys/dev/usb/uaudio.c
cvs rdiff -u -r1.6 -r1.6.4.1 src/sys/dev/usb/uts.c
cvs rdiff -u -r1.22.4.5 -r1.22.4.6 \
    src/sys/external/bsd/ipf/netinet/ip_fil_netbsd.c
cvs rdiff -u -r1.229 -r1.229.8.1 src/sys/kern/kern_descrip.c
cvs rdiff -u -r1.88.8.3 -r1.88.8.4 src/sys/kern/kern_event.c
cvs rdiff -u -r1.58.2.2 -r1.58.2.3 src/sys/kern/vfs_mount.c
cvs rdiff -u -r1.87 -r1.87.2.1 src/sys/kern/vfs_vnode.c
cvs rdiff -u -r1.20.2.3 -r1.20.2.4 src/sys/modules/lua/lua.c
cvs rdiff -u -r1.47 -r1.47.4.1 src/sys/net/npf/npf_ctl.c
cvs rdiff -u -r1.248 -r1.248.4.1 src/sys/netinet/if_arp.c
cvs rdiff -u -r1.199.4.1 -r1.199.4.2 src/sys/netinet/in.c
cvs rdiff -u -r1.94 -r1.94.4.1 src/sys/netinet/in_var.h
cvs rdiff -u -r1.87 -r1.87.2.1 src/sys/netinet/ip_carp.c
cvs rdiff -u -r1.276.4.1 -r1.276.4.2 src/sys/netinet/ip_output.c
cvs rdiff -u -r1.88 -r1.88.4.1 src/sys/netinet6/mld6.c
cvs rdiff -u -r1.84.2.2 -r1.84.2.3 src/sys/netipsec/ipsec.c
cvs rdiff -u -r1.44.2.1 -r1.44.2.2 src/sys/netipsec/ipsec.h
cvs rdiff -u -r1.41 -r1.41.2.1 src/sys/netipsec/ipsec_input.c
cvs rdiff -u -r1.45.2.1 -r1.45.2.2 src/sys/netipsec/ipsec_output.c
cvs rdiff -u -r1.118.2.1 -r1.118.2.2 src/sys/netipsec/key.c
cvs rdiff -u -r1.14 -r1.14.8.1 src/sys/netipsec/key.h \
    src/sys/netipsec/keydb.h
cvs rdiff -u -r1.53.2.1 -r1.53.2.2 src/sys/netipsec/keysock.c
cvs rdiff -u -r1.53 -r1.53.2.1 src/sys/netipsec/xform_ah.c
cvs rdiff -u -r1.54 -r1.54.2.1 src/sys/netipsec/xform_esp.c
cvs rdiff -u -r1.37 -r1.37.2.1 src/sys/netipsec/xform_ipcomp.c
cvs rdiff -u -r1.48 -r1.48.2.1 src/sys/netipsec/xform_ipip.c
cvs rdiff -u -r1.58.2.1 -r1.58.2.2 src/sys/opencrypto/crypto.c
cvs rdiff -u -r1.89.2.3 -r1.89.2.4 src/sys/opencrypto/cryptodev.c
cvs rdiff -u -r1.31 -r1.31.2.1 src/sys/opencrypto/cryptodev.h
cvs rdiff -u -r1.49.2.1 -r1.49.2.2 src/sys/opencrypto/cryptosoft.c
cvs rdiff -u -r1.22 -r1.22.8.1 src/sys/opencrypto/deflate.c
cvs rdiff -u -r1.6 -r1.6.10.1 src/sys/opencrypto/ocryptodev.c
cvs rdiff -u -r1.68 -r1.68.8.1 src/sys/rump/include/rump/rump.h
cvs rdiff -u -r1.170.6.1 -r1.170.6.2 src/sys/rump/librump/rumpkern/vm.c
cvs rdiff -u -r1.203.6.1 -r1.203.6.2 src/sys/uvm/uvm_extern.h
cvs rdiff -u -r1.73 -r1.73.8.1 src/sys/uvm/uvm_map.h
cvs rdiff -u -r1.30.2.2 -r1.30.2.3 src/sys/uvm/pmap/pmap.c
cvs rdiff -u -r1.4 -r1.4.6.1 src/sys/uvm/pmap/pmap_segtab.c
cvs rdiff -u -r1.11 -r1.11.2.1 src/tests/bin/sh/t_expand.sh
cvs rdiff -u -r1.3 -r1.3.6.1 src/tests/bin/sh/t_redircloexec.sh
cvs rdiff -u -r1.15 -r1.15.2.1 src/tests/net/net_common.sh
cvs rdiff -u -r1.4 -r1.4.6.1 src/tests/net/carp/t_basic.sh
cvs rdiff -u -r1.1.6.2 -r1.1.6.3 src/tests/net/ipsec/Makefile
cvs rdiff -u -r1.1.6.1 -r1.1.6.2 src/tests/net/ipsec/algorithms.sh \
    src/tests/net/ipsec/t_ipsec_transport.sh
cvs rdiff -u -r1.2.2.2 -r1.2.2.3 src/tests/net/ipsec/common.sh
cvs rdiff -u -r1.2.2.3 -r1.2.2.4 src/tests/net/ipsec/t_ipsec_gif.sh \
    src/tests/net/ipsec/t_ipsec_l2tp.sh
cvs rdiff -u -r0 -r1.3.2.2 src/tests/net/ipsec/t_ipsec_misc.sh
cvs rdiff -u -r1.3.6.1 -r1.3.6.2 src/tests/net/ipsec/t_ipsec_tunnel.sh
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/tests/net/ipsec/t_ipsec_tunnel_odd.sh
cvs rdiff -u -r1.24 -r1.24.2.1 src/tests/usr.bin/Makefile
cvs rdiff -u -r0 -r1.3.2.2 src/tests/usr.bin/c++/Makefile
cvs rdiff -u -r0 -r1.2.2.2 src/tests/usr.bin/c++/t_cxxruntime.sh \
    src/tests/usr.bin/c++/t_hello.sh
cvs rdiff -u -r0 -r1.1.2.2 src/tests/usr.bin/c++/t_static_destructor.sh
cvs rdiff -u -r1.3 -r1.3.6.1 src/tests/usr.bin/cc/t_hello.sh
cvs rdiff -u -r1.11 -r1.11.6.1 src/usr.bin/infocmp/infocmp.c
cvs rdiff -u -r1.8.6.1 -r1.8.6.2 src/usr.bin/rump_allserver/Makefile
cvs rdiff -u -r1.2 -r1.2.6.1 src/usr.bin/rump_dhcpclient/Makefile
cvs rdiff -u -r1.2 -r1.2.6.1 src/usr.bin/rump_halt/Makefile
cvs rdiff -u -r1.9.6.1 -r1.9.6.2 src/usr.bin/rump_server/Makefile
cvs rdiff -u -r1.51 -r1.51.6.1 src/usr.bin/su/su.1
cvs rdiff -u -r1.23 -r1.23.2.1 src/usr.sbin/npf/npfctl/npf_show.c
cvs rdiff -u -r1.20 -r1.20.4.1 src/usr.sbin/npf/npftest/npftest.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.