Updating src tree:
P src/bin/ksh/ksh.Man
P src/dist/pdisk/validate.c
P src/distrib/sets/lists/base/shl.mi
RCS file: /cvsroot/src/distrib/sets/lists/comp/mi,v
retrieving revision 1.953
retrieving revision 1.955
Merging differences between 1.953 and 1.955 into mi
rcsmerge: warning: conflicts during merge
cvs update: conflicts found in src/distrib/sets/lists/comp/mi
C src/distrib/sets/lists/comp/mi
P src/distrib/sets/lists/comp/shl.mi
P src/distrib/utils/sysinst/bsddisklabel.c
P src/distrib/utils/sysinst/label.c
P src/distrib/utils/sysinst/main.c
P src/distrib/utils/sysinst/net.c
P src/distrib/utils/sysinst/target.c
P src/distrib/utils/sysinst/util.c
P src/distrib/utils/sysinst/arch/i386/md.c
P src/distrib/utils/sysinst/arch/mac68k/md.c
P src/doc/3RDPARTY
P src/doc/CHANGES
P src/gnu/lib/libstdc++-v3_4/arch/armeb/c++config.h
P src/gnu/lib/libstdc++-v3_4/arch/armeb/cxxabi_tweaks.h
P src/gnu/lib/libstdc++-v3_4/arch/hppa/c++config.h
P src/gnu/lib/libstdc++-v3_4/arch/hppa/cxxabi_tweaks.h
P src/gnu/lib/libstdc++-v3_4/arch/m68000/c++config.h
P src/gnu/lib/libstdc++-v3_4/arch/m68000/cxxabi_tweaks.h
P src/gnu/lib/libstdc++-v3_4/arch/m68k/c++config.h
P src/gnu/lib/libstdc++-v3_4/arch/m68k/cxxabi_tweaks.h
P src/gnu/lib/libstdc++-v3_4/arch/mipseb/c++config.h
P src/gnu/lib/libstdc++-v3_4/arch/mipseb/cxxabi_tweaks.h
P src/gnu/lib/libstdc++-v3_4/arch/mipsel/c++config.h
P src/gnu/lib/libstdc++-v3_4/arch/mipsel/cxxabi_tweaks.h
P src/gnu/lib/libstdc++-v3_4/arch/powerpc64/c++config.h
P src/gnu/lib/libstdc++-v3_4/arch/powerpc64/cxxabi_tweaks.h
P src/gnu/lib/libstdc++-v3_4/arch/sh3eb/c++config.h
P src/gnu/lib/libstdc++-v3_4/arch/sh3eb/cxxabi_tweaks.h
P src/gnu/lib/libstdc++-v3_4/arch/sh3el/c++config.h
P src/gnu/lib/libstdc++-v3_4/arch/sh3el/cxxabi_tweaks.h
P src/gnu/lib/libstdc++-v3_4/arch/sh5el/c++config.h
P src/gnu/lib/libstdc++-v3_4/arch/sh5el/cxxabi_tweaks.h
P src/gnu/lib/libstdc++-v3_4/arch/vax/c++config.h
P src/gnu/lib/libstdc++-v3_4/arch/vax/cxxabi_tweaks.h
P src/gnu/libexec/uucp/uusched/uusched.in
P src/gnu/libexec/uucp/uuto/uuto.in
P src/gnu/usr.bin/gcc4/arch/armeb/auto-host.h
P src/gnu/usr.bin/gcc4/arch/armeb/configargs.h
P src/gnu/usr.bin/gcc4/arch/armeb/defs.mk
P src/gnu/usr.bin/gcc4/arch/hppa/configargs.h
P src/gnu/usr.bin/gcc4/arch/hppa/defs.mk
P src/gnu/usr.bin/gcc4/arch/hppa/tm.h
P src/gnu/usr.bin/gcc4/arch/m68000/configargs.h
P src/gnu/usr.bin/gcc4/arch/m68000/defs.mk
P src/gnu/usr.bin/gcc4/arch/m68k/configargs.h
P src/gnu/usr.bin/gcc4/arch/m68k/defs.mk
P src/gnu/usr.bin/gcc4/arch/mipseb/configargs.h
P src/gnu/usr.bin/gcc4/arch/mipseb/defs.mk
P src/gnu/usr.bin/gcc4/arch/mipsel/configargs.h
P src/gnu/usr.bin/gcc4/arch/mipsel/defs.mk
P src/gnu/usr.bin/gcc4/arch/powerpc64/configargs.h
P src/gnu/usr.bin/gcc4/arch/powerpc64/defs.mk
P src/gnu/usr.bin/gcc4/arch/sh3eb/configargs.h
P src/gnu/usr.bin/gcc4/arch/sh3eb/defs.mk
P src/gnu/usr.bin/gcc4/arch/sh3el/configargs.h
P src/gnu/usr.bin/gcc4/arch/sh3el/defs.mk
P src/gnu/usr.bin/gcc4/arch/sh5el/configargs.h
P src/gnu/usr.bin/gcc4/arch/sh5el/defs.mk
P src/gnu/usr.bin/gcc4/arch/vax/configargs.h
P src/gnu/usr.bin/gcc4/arch/vax/defs.mk
P src/gnu/usr.bin/gcc4/libiberty/defs.mk
P src/gnu/usr.bin/gcc4/libiberty/arch/armeb/config.h
P src/gnu/usr.bin/gcc4/libiberty/arch/hppa/config.h
P src/gnu/usr.bin/gcc4/libiberty/arch/m68000/config.h
P src/gnu/usr.bin/gcc4/libiberty/arch/m68k/config.h
P src/gnu/usr.bin/gcc4/libiberty/arch/mipseb/config.h
P src/gnu/usr.bin/gcc4/libiberty/arch/mipsel/config.h
P src/gnu/usr.bin/gcc4/libiberty/arch/powerpc64/config.h
P src/gnu/usr.bin/gcc4/libiberty/arch/sh3eb/config.h
P src/gnu/usr.bin/gcc4/libiberty/arch/sh3el/config.h
P src/gnu/usr.bin/gcc4/libiberty/arch/vax/config.h
P src/include/mntopts.h
P src/lib/libc/shlib_version
P src/lib/libc/gen/Makefile.inc
P src/lib/libc/gen/nlist_coff.c
P src/lib/libc/gen/nlist_ecoff.c
P src/lib/libc/gen/syslog.3
P src/lib/libc/gen/syslog.c
P src/lib/libc/include/namespace.h
P src/lib/libc/sys/open.2
P src/lib/libcrypt/bcrypt.c
P src/lib/libpuffs/opdump.c
P src/lib/libpuffs/puffs.c
P src/lib/libpuffs/puffs.h
U src/lib/libpuffs/subr.c
P src/sbin/edlabel/edlabel.c
P src/sbin/mount/mount.8
P src/share/examples/puffs/dtfs/dtfs.c
P src/share/examples/puffs/dtfs/dtfs.h
P src/share/examples/puffs/dtfs/dtfs_subr.c
P src/share/examples/puffs/dtfs/dtfs_vnops.c
P src/share/examples/secmodel/secmodel_example.c
P src/share/man/man4/options.4
P src/share/man/man8/man8.i386/multiboot.8
P src/share/man/man9/kauth.9
P src/share/man/man9/vmem.9
P src/sys/altq/altq_rmclass.c
P src/sys/arch/acorn32/acorn32/rpc_machdep.c
P src/sys/arch/acorn32/eb7500atx/eb7500atx_machdep.c
P src/sys/arch/acorn32/include/bootconfig.h
P src/sys/arch/amd64/amd64/machdep.c
P src/sys/arch/amd64/amd64/netbsd32_machdep.c
P src/sys/arch/amd64/amd64/process_machdep.c
P src/sys/arch/amiga/amiga/machdep.c
P src/sys/arch/arm/arm/bootconfig.c
P src/sys/arch/arm/ofw/ofwgencfg_machdep.c
P src/sys/arch/cats/include/bootconfig.h
P src/sys/arch/evbarm/conf/GUMSTIX
P src/sys/arch/evbarm/conf/TEAMASA_NPWR
P src/sys/arch/evbarm/conf/TWINTAIL
P src/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c
P src/sys/arch/evbarm/lubbock/lubbock_machdep.c
P src/sys/arch/evbarm/viper/viper_machdep.c
P src/sys/arch/evbppc/explora/machdep.c
P src/sys/arch/evbppc/include/explora.h
P src/sys/arch/hp700/hp700/mainbus.c
P src/sys/arch/hpcarm/include/bootconfig.h
P src/sys/arch/hpcarm/include/types.h
P src/sys/arch/hppa/hppa/hppa_machdep.c
P src/sys/arch/hppa/hppa/pmap.c
P src/sys/arch/i386/conf/ALL
P src/sys/arch/i386/conf/GENERIC
P src/sys/arch/i386/conf/GENERIC_LAPTOP
P src/sys/arch/i386/conf/QEMU
P src/sys/arch/i386/conf/files.i386
P src/sys/arch/i386/i386/locore.S
P src/sys/arch/i386/i386/machdep.c
P src/sys/arch/i386/i386/multiboot.c
P src/sys/arch/i386/include/multiboot.h
P src/sys/arch/i386/stand/bootxx/Makefile.bootxx
P src/sys/arch/i386/stand/bootxx/boot1.c
P src/sys/arch/iyonix/include/bootconfig.h
P src/sys/arch/m68k/m68k/sig_machdep.c
P src/sys/arch/macppc/macppc/machdep.c
P src/sys/arch/mips/mips/mips_machdep.c
P src/sys/arch/netwinder/include/bootconfig.h
P src/sys/arch/powerpc/powerpc/sig_machdep.c
P src/sys/arch/sh3/sh3/db_disasm.c
P src/sys/arch/sh3/sh3/locore_subr.S
P src/sys/arch/sh3/sh3/pmap.c
P src/sys/arch/sh5/dev/scif.c
P src/sys/arch/shark/shark/shark_machdep.c
P src/sys/arch/sparc/sparc/machdep.c
P src/sys/arch/sparc64/sparc64/autoconf.c
P src/sys/arch/sparc64/sparc64/locore.s
P src/sys/arch/sparc64/sparc64/pmap.c
P src/sys/arch/vax/vax/machdep.c
P src/sys/arch/xen/i386/machdep.c
P src/sys/dev/ata/ata.c
P src/sys/dev/ata/files.ata
P src/sys/dev/ata/wd.c
P src/sys/dev/ic/rtl8169.c
P src/sys/dev/ic/wdc.c
P src/sys/dev/ic/wdcvar.h
P src/sys/dev/pci/artsata.c
P src/sys/dev/pci/files.pci
P src/sys/dev/pci/if_de.c
P src/sys/dev/pci/pccbb.c
P src/sys/dev/pci/pcidevs
P src/sys/dev/pci/pcidevs.h
P src/sys/dev/pci/pcidevs_data.h
P src/sys/dev/pci/pdcsata.c
P src/sys/dev/pci/satalink.c
P src/sys/dev/pci/svwsata.c
P src/sys/dev/pcmcia/files.pcmcia
P src/sys/dev/pcmcia/pcmcia.c
P src/sys/dev/ppbus/lpt.c
P src/sys/dev/ppbus/pps_ppbus.c
P src/sys/dev/usb/files.usb
P src/sys/dev/usb/uhub.c
P src/sys/dev/usb/usb_port.h
P src/sys/dev/usb/usbdivar.h
P src/sys/fs/cd9660/cd9660_vfsops.c
P src/sys/fs/msdosfs/msdosfs_vfsops.c
P src/sys/fs/puffs/puffs_msgif.c
P src/sys/fs/puffs/puffs_msgif.h
P src/sys/fs/puffs/puffs_subr.c
P src/sys/fs/puffs/puffs_vnops.c
P src/sys/fs/smbfs/smbfs_vfsops.c
P src/sys/kern/kern_ksyms.c
P src/sys/kern/kern_lwp.c
P src/sys/kern/kern_pax.c
P src/sys/kern/kern_verifiedexec.c
P src/sys/kern/subr_disk.c
P src/sys/kern/subr_specificdata.c
P src/sys/kern/subr_vmem.c
P src/sys/kern/uipc_socket.c
P src/sys/kern/uipc_syscalls.c
P src/sys/kern/vfs_cache.c
P src/sys/kern/vfs_getcwd.c
P src/sys/kern/vfs_syscalls.c
P src/sys/miscfs/procfs/procfs.h
P src/sys/miscfs/procfs/procfs_linux.c
P src/sys/miscfs/procfs/procfs_subr.c
P src/sys/miscfs/procfs/procfs_vnops.c
P src/sys/miscfs/umapfs/umap_vnops.c
P src/sys/net/bpf.c
P src/sys/net/if.c
P src/sys/net/if_gif.c
P src/sys/net/if_gre.c
P src/sys/net/if_ppp.c
P src/sys/net/if_pppoe.c
P src/sys/net/if_vlan.c
P src/sys/net/raw_usrreq.c
P src/sys/net/agr/if_agr.c
P src/sys/net80211/ieee80211_ioctl.c
P src/sys/netatalk/at_control.c
P src/sys/netinet/in.c
P src/sys/netinet/ip_carp.c
P src/sys/netinet/raw_ip.c
P src/sys/netisdn/i4b_ipr.c
P src/sys/netiso/esis.c
P src/sys/netiso/iso.c
P src/sys/nfs/nfs_export.c
P src/sys/nfs/nfs_vfsops.c
P src/sys/secmodel/bsd44/secmodel_bsd44_suser.c
P src/sys/sys/disk.h
P src/sys/sys/dkio.h
P src/sys/sys/fstypes.h
P src/sys/sys/kauth.h
P src/sys/sys/ksyms.h
P src/sys/sys/lwp.h
P src/sys/sys/proc.h
P src/sys/ufs/ext2fs/ext2fs_vfsops.c
P src/sys/ufs/ffs/ffs_snapshot.c
P src/sys/ufs/ffs/ffs_softdep.c
P src/sys/ufs/ffs/ffs_vfsops.c
P src/usr.bin/ftp/ftp.c
P src/usr.bin/gzip/gzip.c
P src/usr.bin/kdump/kdump.c
P src/usr.bin/ktruss/dump.c
P src/usr.bin/less/less2netbsd
P src/usr.bin/less/less/LICENSE
P src/usr.bin/less/less/NEWS
P src/usr.bin/less/less/README
P src/usr.bin/less/less/brac.c
P src/usr.bin/less/less/ch.c
P src/usr.bin/less/less/charset.c
U src/usr.bin/less/less/charset.h
P src/usr.bin/less/less/cmd.h
P src/usr.bin/less/less/cmdbuf.c
P src/usr.bin/less/less/command.c
P src/usr.bin/less/less/decode.c
P src/usr.bin/less/less/defines.h
P src/usr.bin/less/less/edit.c
P src/usr.bin/less/less/filename.c
P src/usr.bin/less/less/forwback.c
P src/usr.bin/less/less/funcs.h
P src/usr.bin/less/less/ifile.c
P src/usr.bin/less/less/input.c
P src/usr.bin/less/less/jump.c
P src/usr.bin/less/less/less.1
P src/usr.bin/less/less/less.h
P src/usr.bin/less/less/lesskey.h
P src/usr.bin/less/less/lglob.h
P src/usr.bin/less/less/line.c
P src/usr.bin/less/less/linenum.c
P src/usr.bin/less/less/lsystem.c
P src/usr.bin/less/less/main.c
P src/usr.bin/less/less/mark.c
P src/usr.bin/less/less/optfunc.c
P src/usr.bin/less/less/option.c
P src/usr.bin/less/less/option.h
P src/usr.bin/less/less/opttbl.c
P src/usr.bin/less/less/os.c
P src/usr.bin/less/less/output.c
P src/usr.bin/less/less/pckeys.h
P src/usr.bin/less/less/position.c
P src/usr.bin/less/less/position.h
P src/usr.bin/less/less/prompt.c
P src/usr.bin/less/less/screen.c
P src/usr.bin/less/less/search.c
P src/usr.bin/less/less/signal.c
P src/usr.bin/less/less/tags.c
P src/usr.bin/less/less/ttyin.c
P src/usr.bin/less/less/version.c
P src/usr.bin/less/lessecho/lessecho.c
P src/usr.bin/less/lesskey/lesskey.1
P src/usr.bin/less/lesskey/lesskey.c
P src/usr.bin/less/lesskey/lesskey.h
P src/usr.bin/mail/mime_codecs.c
P src/usr.bin/make/Makefile
P src/usr.bin/make/lst.h
P src/usr.bin/make/suff.c
P src/usr.bin/make/lst.lib/lstAppend.c
P src/usr.bin/make/lst.lib/lstAtEnd.c
P src/usr.bin/make/lst.lib/lstAtFront.c
P src/usr.bin/make/lst.lib/lstEnQueue.c
P src/usr.bin/make/lst.lib/lstInsert.c
P src/usr.bin/make/lst.lib/lstInt.h
U src/usr.bin/make/lst.lib/lstPrev.c
P src/usr.bin/menuc/mdb.c
P src/usr.bin/sort/init.c
P src/usr.bin/sort/sort.c
P src/usr.bin/tip/acu.c
P src/usr.sbin/installboot/ffs.c

Updating xsrc tree:


Killing core files:


Running the SUP scanner:
SUP Scan for current starting at Thu Oct 26 03:18:41 2006
SUP Scan for current completed at Thu Oct 26 03:20:02 2006
SUP Scan for mirror starting at Thu Oct 26 03:20:02 2006
SUP Scan for mirror completed at Thu Oct 26 03:29:39 2006


Updating file list:
-rw-rw-r--  1 srcmastr  netbsd  19543792 Oct 26 03:49 ls-lRA.gz