PERFORCE change 85063 for review
Scott Long
scottl at FreeBSD.org
Sun Oct 9 20:23:45 PDT 2005
http://perforce.freebsd.org/chv.cgi?CH=85063
Change 85063 by scottl at scottl-junior on 2005/10/10 03:22:38
IFC
Affected files ...
.. //depot/projects/soc2005/ufsj/src/ObsoleteFiles.inc#2 integrate
.. //depot/projects/soc2005/ufsj/src/UPDATING#3 integrate
.. //depot/projects/soc2005/ufsj/src/bin/rm/rm.1#2 integrate
.. //depot/projects/soc2005/ufsj/src/bin/rm/rm.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/contrib/bc/bc/main.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/contrib/bsnmp/FREEBSD-Xlist#2 integrate
.. //depot/projects/soc2005/ufsj/src/contrib/bsnmp/NEWS#2 integrate
.. //depot/projects/soc2005/ufsj/src/contrib/bsnmp/VERSION#2 integrate
.. //depot/projects/soc2005/ufsj/src/contrib/bsnmp/gensnmpdef/gensnmpdef.1#2 integrate
.. //depot/projects/soc2005/ufsj/src/contrib/bsnmp/gensnmptree/gensnmptree.1#2 integrate
.. //depot/projects/soc2005/ufsj/src/contrib/bsnmp/gensnmptree/gensnmptree.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/contrib/bsnmp/lib/asn1.3#2 integrate
.. //depot/projects/soc2005/ufsj/src/contrib/bsnmp/lib/asn1.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/contrib/bsnmp/lib/asn1.h#2 integrate
.. //depot/projects/soc2005/ufsj/src/contrib/bsnmp/lib/bsnmpagent.3#2 integrate
.. //depot/projects/soc2005/ufsj/src/contrib/bsnmp/lib/bsnmpclient.3#2 integrate
.. //depot/projects/soc2005/ufsj/src/contrib/bsnmp/lib/bsnmplib.3#2 integrate
.. //depot/projects/soc2005/ufsj/src/contrib/bsnmp/lib/snmp.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/contrib/bsnmp/lib/snmpagent.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/contrib/bsnmp/lib/snmpclient.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/contrib/bsnmp/snmp_mibII/mibII.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/contrib/bsnmp/snmp_mibII/mibII.h#2 integrate
.. //depot/projects/soc2005/ufsj/src/contrib/bsnmp/snmp_mibII/mibII_ipaddr.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/contrib/bsnmp/snmp_mibII/mibII_route.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/contrib/bsnmp/snmp_mibII/snmp_mibII.3#2 integrate
.. //depot/projects/soc2005/ufsj/src/contrib/bsnmp/snmp_ntp/BEGEMOT-NTP-MIB.txt#2 integrate
.. //depot/projects/soc2005/ufsj/src/contrib/bsnmp/snmp_ntp/snmp_ntp.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/contrib/bsnmp/snmpd/.gdbinit#2 delete
.. //depot/projects/soc2005/ufsj/src/contrib/bsnmp/snmpd/bsnmpd.1#2 integrate
.. //depot/projects/soc2005/ufsj/src/contrib/bsnmp/snmpd/config.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/contrib/bsnmp/snmpd/main.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/contrib/bsnmp/snmpd/snmpmod.3#2 integrate
.. //depot/projects/soc2005/ufsj/src/contrib/bsnmp/snmpd/snmpmod.h#2 integrate
.. //depot/projects/soc2005/ufsj/src/contrib/bsnmp/snmpd/trans_udp.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/contrib/bsnmp/snmpd/trap.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/ABOUT-NLS#1 branch
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/AUTHORS#1 branch
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/COPYING#2 integrate
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/COPYING.LIB#2 delete
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/ChangeLog#2 integrate
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/FREEBSD-upgrade#2 integrate
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/INSTALL#1 branch
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/NEWS#2 integrate
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/README#2 integrate
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/THANKS#1 branch
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/TODO#1 branch
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/alloca.c#2 delete
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/copyin.c#2 delete
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/copyout.c#2 delete
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/copypass.c#2 delete
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/cpio.1#2 delete
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/cpio.h#2 delete
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/cpio.texi#2 delete
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/cpiohdr.h#2 delete
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/defer.c#2 delete
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/defer.h#2 delete
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/dirname.c#2 delete
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/doc/cpio.1#1 branch
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/doc/cpio.texi#1 branch
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/dstring.c#2 delete
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/dstring.h#2 delete
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/error.c#2 delete
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/extern.h#2 delete
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/filemode.c#2 delete
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/filetypes.h#2 delete
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/global.c#2 delete
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/idcache.c#2 delete
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/alloca_.h#1 branch
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/argp-ba.c#1 branch
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/argp-eexst.c#1 branch
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/argp-fmtstream.c#1 branch
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/argp-fmtstream.h#1 branch
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/argp-fs-xinl.c#1 branch
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/argp-help.c#1 branch
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/argp-namefrob.h#1 branch
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/argp-parse.c#1 branch
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/argp-pv.c#1 branch
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/argp-pvh.c#1 branch
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/argp-xinl.c#1 branch
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/argp.h#1 branch
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/basename.c#1 branch
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/dirname.c#1 branch
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/dirname.h#1 branch
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/error.c#1 branch
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/error.h#1 branch
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/exit.h#1 branch
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/exitfail.c#1 branch
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/exitfail.h#1 branch
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/full-write.c#1 branch
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/full-write.h#1 branch
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/getopt.c#1 branch
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/getopt1.c#1 branch
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/getopt_.h#1 branch
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/getopt_int.h#1 branch
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/gettext.h#1 branch
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/localedir.h#1 branch
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/mempcpy.c#1 branch
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/mempcpy.h#1 branch
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/rmt.h#1 branch
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/rtapelib.c#1 branch
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/safe-read.c#1 branch
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/safe-read.h#1 branch
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/safe-write.c#1 branch
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/safe-write.h#1 branch
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/savedir.c#1 branch
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/savedir.h#1 branch
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/strcase.h#1 branch
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/strchrnul.c#1 branch
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/strchrnul.h#1 branch
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/stripslash.c#1 branch
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/strndup.c#1 branch
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/strndup.h#1 branch
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/strnlen.c#1 branch
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/system.h#1 branch
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/unlocked-io.h#1 branch
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/xalloc-die.c#1 branch
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/xalloc.h#1 branch
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/lib/xmalloc.c#1 branch
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/main.c#2 delete
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/makepath.c#2 delete
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/rmt.h#2 delete
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/rtapelib.c#2 delete
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/safe-stat.h#2 delete
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/src/copyin.c#1 branch
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/src/copyout.c#1 branch
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/src/copypass.c#1 branch
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/src/cpio.h#1 branch
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/src/cpiohdr.h#1 branch
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/src/defer.c#1 branch
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/src/defer.h#1 branch
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/src/dstring.c#1 branch
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/src/dstring.h#1 branch
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/src/extern.h#1 branch
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/src/filemode.c#1 branch
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/src/filetypes.h#1 branch
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/src/global.c#1 branch
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/src/idcache.c#1 branch
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/src/main.c#1 branch
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/src/makepath.c#1 branch
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/src/safe-stat.h#1 branch
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/src/tar.c#1 branch
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/src/tar.h#1 branch
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/src/tarhdr.h#1 branch
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/src/userspec.c#1 branch
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/src/util.c#1 branch
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/stripslash.c#2 delete
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/system.h#2 delete
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/tar.c#2 delete
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/tar.h#2 delete
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/tarhdr.h#2 delete
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/userspec.c#2 delete
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/util.c#2 delete
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/version.c#2 delete
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/xmalloc.c#2 delete
.. //depot/projects/soc2005/ufsj/src/contrib/cpio/xstrdup.c#2 delete
.. //depot/projects/soc2005/ufsj/src/contrib/pf/man/pf.4#2 integrate
.. //depot/projects/soc2005/ufsj/src/contrib/pf/man/pf.conf.5#2 integrate
.. //depot/projects/soc2005/ufsj/src/contrib/pf/man/pfsync.4#3 integrate
.. //depot/projects/soc2005/ufsj/src/contrib/smbfs/include/netsmb/nb_lib.h#2 integrate
.. //depot/projects/soc2005/ufsj/src/contrib/smbfs/include/netsmb/smb_lib.h#3 integrate
.. //depot/projects/soc2005/ufsj/src/contrib/smbfs/lib/smb/ctx.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/contrib/smbfs/lib/smb/nb.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/contrib/smbfs/lib/smb/nb_net.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/contrib/smbfs/lib/smb/nbns_rq.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/contrib/smbfs/mount_smbfs/mount_smbfs.8#2 integrate
.. //depot/projects/soc2005/ufsj/src/etc/defaults/rc.conf#4 integrate
.. //depot/projects/soc2005/ufsj/src/etc/mtree/BSD.include.dist#3 integrate
.. //depot/projects/soc2005/ufsj/src/etc/pccard_ether#3 integrate
.. //depot/projects/soc2005/ufsj/src/etc/rc.d/Makefile#4 integrate
.. //depot/projects/soc2005/ufsj/src/etc/rc.d/archdep#2 integrate
.. //depot/projects/soc2005/ufsj/src/etc/rc.d/pf#3 integrate
.. //depot/projects/soc2005/ufsj/src/etc/rc.d/pflog#3 integrate
.. //depot/projects/soc2005/ufsj/src/etc/rc.d/pfsync#1 branch
.. //depot/projects/soc2005/ufsj/src/etc/rc.d/ugidfw#2 integrate
.. //depot/projects/soc2005/ufsj/src/etc/rc.firewall6#2 integrate
.. //depot/projects/soc2005/ufsj/src/etc/rc.subr#3 integrate
.. //depot/projects/soc2005/ufsj/src/games/fortune/datfiles/limerick#2 integrate
.. //depot/projects/soc2005/ufsj/src/gnu/usr.bin/cpio/Makefile#2 integrate
.. //depot/projects/soc2005/ufsj/src/gnu/usr.bin/cpio/config.h#1 branch
.. //depot/projects/soc2005/ufsj/src/gnu/usr.bin/cpio/doc/Makefile#2 integrate
.. //depot/projects/soc2005/ufsj/src/gnu/usr.bin/gdb/kgdb/trgt_amd64.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/include/Makefile#3 integrate
.. //depot/projects/soc2005/ufsj/src/include/pthread_np.h#2 integrate
.. //depot/projects/soc2005/ufsj/src/lib/csu/amd64/crt1.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/lib/csu/i386-elf/crt1.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/lib/libbsnmp/libbsnmp/Makefile#2 integrate
.. //depot/projects/soc2005/ufsj/src/lib/libc/arm/string/Makefile.inc#2 integrate
.. //depot/projects/soc2005/ufsj/src/lib/libc/arm/string/strlen.S#1 branch
.. //depot/projects/soc2005/ufsj/src/lib/libdevstat/devstat.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/lib/libedit/editline.3#3 integrate
.. //depot/projects/soc2005/ufsj/src/lib/libedit/el.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/lib/libedit/makelist#3 integrate
.. //depot/projects/soc2005/ufsj/src/lib/libedit/map.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/lib/libkvm/kvm_arm.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/lib/libpam/modules/pam_ssh/Makefile#3 integrate
.. //depot/projects/soc2005/ufsj/src/lib/libthr/pthread.map#3 integrate
.. //depot/projects/soc2005/ufsj/src/lib/libthr/thread/thr_join.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/lib/libutil/trimdomain.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/lib/msun/src/e_rem_pio2f.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/lib/msun/src/k_cosf.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/release/Makefile#3 integrate
.. //depot/projects/soc2005/ufsj/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#3 integrate
.. //depot/projects/soc2005/ufsj/src/release/pc98/boot_crunch.conf#2 integrate
.. //depot/projects/soc2005/ufsj/src/release/picobsd/bridge/PICOBSD#2 integrate
.. //depot/projects/soc2005/ufsj/src/release/picobsd/tinyware/ns/ns.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sbin/Makefile#2 integrate
.. //depot/projects/soc2005/ufsj/src/sbin/devd/devd.cc#3 integrate
.. //depot/projects/soc2005/ufsj/src/sbin/geom/class/mirror/gmirror.8#2 integrate
.. //depot/projects/soc2005/ufsj/src/sbin/ifconfig/ifbridge.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sbin/ifconfig/ifconfig.8#4 integrate
.. //depot/projects/soc2005/ufsj/src/sbin/ifconfig/ifconfig.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sbin/ifconfig/ifieee80211.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sbin/ifconfig/ifvlan.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sbin/ipfw/ipfw.8#3 integrate
.. //depot/projects/soc2005/ufsj/src/sbin/mount/Makefile#2 integrate
.. //depot/projects/soc2005/ufsj/src/sbin/mount/extern.h#2 integrate
.. //depot/projects/soc2005/ufsj/src/sbin/mount/getmntopts.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sbin/mount/mount.c#4 integrate
.. //depot/projects/soc2005/ufsj/src/sbin/mount/mount_ufs.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sbin/mount_cd9660/mount_cd9660.8#2 integrate
.. //depot/projects/soc2005/ufsj/src/sbin/reboot/boot_i386.8#3 integrate
.. //depot/projects/soc2005/ufsj/src/sbin/route/keywords#2 integrate
.. //depot/projects/soc2005/ufsj/src/sbin/route/route.8#2 integrate
.. //depot/projects/soc2005/ufsj/src/sbin/route/route.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sbin/savecore/savecore.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/share/man/man4/Makefile#3 integrate
.. //depot/projects/soc2005/ufsj/src/share/man/man4/an.4#3 integrate
.. //depot/projects/soc2005/ufsj/src/share/man/man4/ath.4#3 integrate
.. //depot/projects/soc2005/ufsj/src/share/man/man4/aue.4#3 integrate
.. //depot/projects/soc2005/ufsj/src/share/man/man4/awi.4#3 integrate
.. //depot/projects/soc2005/ufsj/src/share/man/man4/axe.4#3 integrate
.. //depot/projects/soc2005/ufsj/src/share/man/man4/bfe.4#3 integrate
.. //depot/projects/soc2005/ufsj/src/share/man/man4/bge.4#3 integrate
.. //depot/projects/soc2005/ufsj/src/share/man/man4/bridge.4#2 delete
.. //depot/projects/soc2005/ufsj/src/share/man/man4/cardbus.4#2 integrate
.. //depot/projects/soc2005/ufsj/src/share/man/man4/cdce.4#4 integrate
.. //depot/projects/soc2005/ufsj/src/share/man/man4/cm.4#3 integrate
.. //depot/projects/soc2005/ufsj/src/share/man/man4/cue.4#3 integrate
.. //depot/projects/soc2005/ufsj/src/share/man/man4/dc.4#3 integrate
.. //depot/projects/soc2005/ufsj/src/share/man/man4/dcons.4#2 integrate
.. //depot/projects/soc2005/ufsj/src/share/man/man4/de.4#3 integrate
.. //depot/projects/soc2005/ufsj/src/share/man/man4/dummynet.4#2 integrate
.. //depot/projects/soc2005/ufsj/src/share/man/man4/ed.4#4 integrate
.. //depot/projects/soc2005/ufsj/src/share/man/man4/em.4#3 integrate
.. //depot/projects/soc2005/ufsj/src/share/man/man4/en.4#3 integrate
.. //depot/projects/soc2005/ufsj/src/share/man/man4/fwe.4#3 integrate
.. //depot/projects/soc2005/ufsj/src/share/man/man4/fwip.4#3 integrate
.. //depot/projects/soc2005/ufsj/src/share/man/man4/fxp.4#3 integrate
.. //depot/projects/soc2005/ufsj/src/share/man/man4/hme.4#3 integrate
.. //depot/projects/soc2005/ufsj/src/share/man/man4/hwpmc.4#3 integrate
.. //depot/projects/soc2005/ufsj/src/share/man/man4/ipw.4#3 integrate
.. //depot/projects/soc2005/ufsj/src/share/man/man4/iwi.4#3 integrate
.. //depot/projects/soc2005/ufsj/src/share/man/man4/kue.4#3 integrate
.. //depot/projects/soc2005/ufsj/src/share/man/man4/lge.4#3 integrate
.. //depot/projects/soc2005/ufsj/src/share/man/man4/lmc.4#1 branch
.. //depot/projects/soc2005/ufsj/src/share/man/man4/mac_seeotheruids.4#2 integrate
.. //depot/projects/soc2005/ufsj/src/share/man/man4/man4.i386/arl.4#3 integrate
.. //depot/projects/soc2005/ufsj/src/share/man/man4/man4.i386/cp.4#3 integrate
.. //depot/projects/soc2005/ufsj/src/share/man/man4/man4.i386/cs.4#3 integrate
.. //depot/projects/soc2005/ufsj/src/share/man/man4/man4.i386/cx.4#3 integrate
.. //depot/projects/soc2005/ufsj/src/share/man/man4/man4.i386/ep.4#3 integrate
.. //depot/projects/soc2005/ufsj/src/share/man/man4/man4.i386/ex.4#3 integrate
.. //depot/projects/soc2005/ufsj/src/share/man/man4/man4.i386/fe.4#4 integrate
.. //depot/projects/soc2005/ufsj/src/share/man/man4/man4.i386/ie.4#3 integrate
.. //depot/projects/soc2005/ufsj/src/share/man/man4/man4.i386/lnc.4#4 integrate
.. //depot/projects/soc2005/ufsj/src/share/man/man4/man4.i386/ray.4#3 integrate
.. //depot/projects/soc2005/ufsj/src/share/man/man4/man4.i386/vx.4#3 integrate
.. //depot/projects/soc2005/ufsj/src/share/man/man4/my.4#3 integrate
.. //depot/projects/soc2005/ufsj/src/share/man/man4/ng_bridge.4#2 integrate
.. //depot/projects/soc2005/ufsj/src/share/man/man4/nge.4#3 integrate
.. //depot/projects/soc2005/ufsj/src/share/man/man4/nve.4#3 integrate
.. //depot/projects/soc2005/ufsj/src/share/man/man4/pccard.4#2 integrate
.. //depot/projects/soc2005/ufsj/src/share/man/man4/pccbb.4#2 integrate
.. //depot/projects/soc2005/ufsj/src/share/man/man4/pcn.4#3 integrate
.. //depot/projects/soc2005/ufsj/src/share/man/man4/polling.4#2 integrate
.. //depot/projects/soc2005/ufsj/src/share/man/man4/ral.4#3 integrate
.. //depot/projects/soc2005/ufsj/src/share/man/man4/re.4#3 integrate
.. //depot/projects/soc2005/ufsj/src/share/man/man4/rl.4#3 integrate
.. //depot/projects/soc2005/ufsj/src/share/man/man4/rue.4#3 integrate
.. //depot/projects/soc2005/ufsj/src/share/man/man4/sf.4#3 integrate
.. //depot/projects/soc2005/ufsj/src/share/man/man4/sis.4#3 integrate
.. //depot/projects/soc2005/ufsj/src/share/man/man4/sk.4#3 integrate
.. //depot/projects/soc2005/ufsj/src/share/man/man4/sn.4#4 integrate
.. //depot/projects/soc2005/ufsj/src/share/man/man4/ste.4#3 integrate
.. //depot/projects/soc2005/ufsj/src/share/man/man4/ti.4#3 integrate
.. //depot/projects/soc2005/ufsj/src/share/man/man4/tl.4#3 integrate
.. //depot/projects/soc2005/ufsj/src/share/man/man4/tx.4#3 integrate
.. //depot/projects/soc2005/ufsj/src/share/man/man4/txp.4#3 integrate
.. //depot/projects/soc2005/ufsj/src/share/man/man4/udav.4#3 integrate
.. //depot/projects/soc2005/ufsj/src/share/man/man4/ural.4#4 integrate
.. //depot/projects/soc2005/ufsj/src/share/man/man4/vge.4#3 integrate
.. //depot/projects/soc2005/ufsj/src/share/man/man4/vlan.4#3 integrate
.. //depot/projects/soc2005/ufsj/src/share/man/man4/vr.4#4 integrate
.. //depot/projects/soc2005/ufsj/src/share/man/man4/wb.4#3 integrate
.. //depot/projects/soc2005/ufsj/src/share/man/man4/wi.4#3 integrate
.. //depot/projects/soc2005/ufsj/src/share/man/man4/xe.4#3 integrate
.. //depot/projects/soc2005/ufsj/src/share/man/man4/xl.4#3 integrate
.. //depot/projects/soc2005/ufsj/src/share/man/man5/Makefile#3 integrate
.. //depot/projects/soc2005/ufsj/src/share/man/man5/rc.conf.5#4 integrate
.. //depot/projects/soc2005/ufsj/src/share/man/man9/Makefile#4 integrate
.. //depot/projects/soc2005/ufsj/src/share/man/man9/atomic.9#2 integrate
.. //depot/projects/soc2005/ufsj/src/share/man/man9/critical_enter.9#2 integrate
.. //depot/projects/soc2005/ufsj/src/share/man/man9/pfil.9#2 integrate
.. //depot/projects/soc2005/ufsj/src/share/mk/sys.mk#2 integrate
.. //depot/projects/soc2005/ufsj/src/share/msgdef/Makefile#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/alpha/alpha/interrupt.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/alpha/alpha/trap.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/alpha/include/atomic.h#4 integrate
.. //depot/projects/soc2005/ufsj/src/sys/alpha/osf1/osf1_ioctl.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/alpha/osf1/osf1_misc.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/alpha/osf1/osf1_signal.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/amd64/amd64/cpu_switch.S#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/amd64/amd64/elf_machdep.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/amd64/amd64/gdb_machdep.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/amd64/amd64/genassym.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/amd64/amd64/machdep.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/amd64/amd64/support.S#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/amd64/amd64/trap.c#4 integrate
.. //depot/projects/soc2005/ufsj/src/sys/amd64/amd64/vm_machdep.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/amd64/conf/NOTES#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/amd64/ia32/ia32_reg.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/amd64/ia32/ia32_signal.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/amd64/include/atomic.h#4 integrate
.. //depot/projects/soc2005/ufsj/src/sys/amd64/include/pcb.h#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/arm/arm/bcopy_page.S#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/arm/arm/bcopyinout.S#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/arm/arm/bcopyinout_xscale.S#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/arm/arm/busdma_machdep.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/arm/arm/dump_machdep.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/arm/arm/elf_trampoline.c#1 branch
.. //depot/projects/soc2005/ufsj/src/sys/arm/arm/genassym.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/arm/arm/in_cksum.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/arm/arm/in_cksum_arm.S#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/arm/arm/inckern.S#1 branch
.. //depot/projects/soc2005/ufsj/src/sys/arm/arm/intr.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/arm/arm/locore.S#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/arm/arm/machdep.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/arm/arm/mem.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/arm/arm/pmap.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/arm/arm/support.S#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/arm/arm/swtch.S#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/arm/arm/vm_machdep.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/arm/conf/IQ31244#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/arm/conf/SIMICS#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/arm/include/atomic.h#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/arm/include/in_cksum.h#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/arm/include/md_var.h#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/arm/include/pmap.h#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/arm/sa11x0/assabet_machdep.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/arm/xscale/i80321/files.i80321#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/arm/xscale/i80321/i80321_aau.c#1 branch
.. //depot/projects/soc2005/ufsj/src/sys/arm/xscale/i80321/i80321_dma.c#1 branch
.. //depot/projects/soc2005/ufsj/src/sys/arm/xscale/i80321/i80321_timer.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/arm/xscale/i80321/iq31244_machdep.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/arm/xscale/i80321/iq80321.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/boot/pc98/loader/main.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/compat/freebsd32/freebsd32_misc.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/compat/freebsd32/freebsd32_proto.h#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/compat/freebsd32/freebsd32_syscall.h#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/compat/freebsd32/freebsd32_syscalls.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/compat/freebsd32/freebsd32_sysent.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/compat/freebsd32/syscalls.master#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/compat/linux/linux_socket.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/compat/svr4/svr4_fcntl.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/compat/svr4/svr4_ioctl.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/compat/svr4/svr4_ipc.c#4 integrate
.. //depot/projects/soc2005/ufsj/src/sys/compat/svr4/svr4_misc.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/compat/svr4/svr4_signal.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/compat/svr4/svr4_stat.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/compat/svr4/svr4_stream.c#4 integrate
.. //depot/projects/soc2005/ufsj/src/sys/compat/svr4/svr4_termios.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/compat/svr4/svr4_ttold.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/compat/svr4/svr4_util.h#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/conf/Makefile.arm#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/conf/NOTES#4 integrate
.. //depot/projects/soc2005/ufsj/src/sys/conf/files#5 integrate
.. //depot/projects/soc2005/ufsj/src/sys/conf/files.arm#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/conf/kern.pre.mk#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/conf/kmod.mk#4 integrate
.. //depot/projects/soc2005/ufsj/src/sys/conf/options#5 integrate
.. //depot/projects/soc2005/ufsj/src/sys/ddb/db_command.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/ddb/db_output.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/aac/aac.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/aac/aac_cam.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/aac/aac_debug.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/aac/aac_pci.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/aac/aac_tables.h#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/aac/aacreg.h#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/aac/aacvar.h#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/ata/ata-all.h#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/ata/ata-chipset.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/ata/ata-dma.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/ata/atapi-cd.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/bge/if_bge.c#4 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/cardbus/cardbus.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/cp/if_cp.c#4 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/ctau/if_ct.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/cx/if_cx.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/ed/ax88x90reg.h#1 branch
.. //depot/projects/soc2005/ufsj/src/sys/dev/ed/dl100xxreg.h#1 branch
.. //depot/projects/soc2005/ufsj/src/sys/dev/ed/if_ed_isa.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/ed/if_ed_pccard.c#4 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/ed/if_ed_pci.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/ed/if_ed_rtl80x9.c#1 branch
.. //depot/projects/soc2005/ufsj/src/sys/dev/ed/if_edreg.h#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/ed/if_edvar.h#4 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/ed/rtl80x9reg.h#1 branch
.. //depot/projects/soc2005/ufsj/src/sys/dev/ed/tc5299jreg.h#1 branch
.. //depot/projects/soc2005/ufsj/src/sys/dev/em/if_em.c#4 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/em/if_em.h#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/en/if_en_pci.c#4 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/fb/creator.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/fb/fbreg.h#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/fb/gfb.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/fb/machfb.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/fb/s3_pci.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/fb/tga.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/fb/vga.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/firewire/00README#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/firewire/if_fwe.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/firewire/if_fwip.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/fxp/if_fxp.c#4 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/fxp/if_fxpvar.h#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/if_ndis/if_ndis.c#4 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/ips/ips_commands.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/iwi/if_iwi.c#5 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/iwi/if_iwireg.h#4 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/ixgb/README#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/ixgb/if_ixgb.c#4 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/ixgb/if_ixgb.h#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/lge/if_lge.c#4 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/lge/if_lgereg.h#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/lmc/if_lmc.c#1 branch
.. //depot/projects/soc2005/ufsj/src/sys/dev/lmc/if_lmc.h#1 branch
.. //depot/projects/soc2005/ufsj/src/sys/dev/md/md.c#4 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/mii/acphy.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/mii/amphy.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/mii/brgphy.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/mii/ciphy.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/mii/dcphy.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/mii/exphy.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/mii/lxtphy.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/mii/mii_physubr.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/mii/miivar.h#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/mii/nsgphy.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/mii/nsphy.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/mii/pnaphy.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/mii/pnphy.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/mii/qsphy.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/mii/rgephy.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/mii/rlphy.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/mii/tdkphy.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/mii/tlphy.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/mii/ukphy.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/mii/xmphy.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/mpt/mpt.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/nge/if_nge.c#4 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/pccbb/pccbb.c#4 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/pccbb/pccbb_pci.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/pccbb/pccbbdevid.h#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/pccbb/pccbbvar.h#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/pci/isa_pci.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/pci/pci.c#4 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/puc/puc.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/re/if_re.c#4 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/sound/pci/als4000.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/sound/pci/es137x.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/sound/pci/ich.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/sound/pci/via8233.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/sound/pci/via82c686.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/sound/pcm/ac97.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/sound/pcm/ac97.h#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/sound/pcm/ac97_patch.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/sound/pcm/ac97_patch.h#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/sound/pcm/channel.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/sound/pcm/dsp.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/sound/pcm/feeder_volume.c#1 branch
.. //depot/projects/soc2005/ufsj/src/sys/dev/sound/pcm/mixer.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/sound/pcm/sndstat.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/sound/pcm/sound.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/sound/pcm/sound.h#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/sound/usb/uaudio_pcm.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/syscons/scgfbrndr.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/syscons/scmouse.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/syscons/scvgarndr.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/syscons/scvidctl.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/syscons/syscons.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/syscons/syscons.h#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/txp/if_txpreg.h#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/usb/if_cdce.c#4 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/usb/usbdevs#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/vge/if_vge.c#4 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/vx/if_vx.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/vx/if_vx_eisa.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/vx/if_vx_pci.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/vx/if_vxvar.h#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/watchdog/watchdog.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/wi/if_wi.c#4 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/wi/if_wivar.h#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/xe/if_xereg.h#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/fs/fifofs/fifo_vnops.c#4 integrate
.. //depot/projects/soc2005/ufsj/src/sys/fs/msdosfs/bootsect.h#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/fs/msdosfs/msdosfs_vfsops.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/fs/nwfs/nwfs_vfsops.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/fs/udf/udf_vfsops.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/geom/geom_disk.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/geom/geom_gpt.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/geom/uzip/g_uzip.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/gnu/fs/ext2fs/ext2_alloc.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/i386/conf/NOTES#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/i386/i386/apic_vector.s#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/i386/i386/local_apic.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/i386/i386/mp_machdep.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/i386/i386/trap.c#4 integrate
.. //depot/projects/soc2005/ufsj/src/sys/i386/i386/vm86.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/i386/include/atomic.h#4 integrate
.. //depot/projects/soc2005/ufsj/src/sys/i386/include/smptests.h#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/i386/isa/vesa.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/ia64/ia32/ia32_signal.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/ia64/ia64/nexus.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/ia64/ia64/unaligned.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/ia64/include/atomic.h#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/isa/pnp.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/kern/imgact_elf.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/kern/init_sysent.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/kern/kern_clock.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/kern/kern_conf.c#4 integrate
.. //depot/projects/soc2005/ufsj/src/sys/kern/kern_cpu.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/kern/kern_descrip.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/kern/kern_exec.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/kern/kern_jail.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/kern/kern_kse.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/kern/kern_lock.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/kern/kern_mac.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/kern/kern_mbuf.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/kern/kern_poll.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/kern/kern_proc.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/kern/kern_prot.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/kern/kern_resource.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/kern/kern_thread.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/kern/kern_uuid.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/kern/subr_bus.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/kern/subr_kdb.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/kern/subr_rman.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/kern/subr_turnstile.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/kern/syscalls.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/kern/syscalls.master#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/kern/sysv_shm.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/kern/vfs_bio.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/kern/vfs_export.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/kern/vfs_subr.c#4 integrate
.. //depot/projects/soc2005/ufsj/src/sys/modules/Makefile#4 integrate
.. //depot/projects/soc2005/ufsj/src/sys/modules/agp/Makefile#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/modules/ath/Makefile#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/modules/ath_rate_amrr/Makefile#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/modules/ath_rate_onoe/Makefile#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/modules/ath_rate_sample/Makefile#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/modules/aue/Makefile#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/modules/axe/Makefile#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/modules/bfe/Makefile#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/modules/bge/Makefile#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/modules/bridge/Makefile#2 delete
.. //depot/projects/soc2005/ufsj/src/sys/modules/cdce/Makefile#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/modules/cue/Makefile#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/modules/dc/Makefile#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/modules/de/Makefile#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/modules/dummynet/Makefile#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/modules/ed/Makefile#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/modules/em/Makefile#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/modules/fxp/Makefile#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/modules/geom/geom_uzip/Makefile#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/modules/hifn/Makefile#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/modules/if_ndis/Makefile#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/modules/ipw/Makefile#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/modules/iwi/Makefile#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/modules/ixgb/Makefile#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/modules/kue/Makefile#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/modules/lge/Makefile#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/modules/lmc/Makefile#1 branch
.. //depot/projects/soc2005/ufsj/src/sys/modules/mii/Makefile#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/modules/ncv/Makefile#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/modules/ndis/Makefile#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/modules/nge/Makefile#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/modules/nsp/Makefile#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/modules/pcn/Makefile#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/modules/ral/Makefile#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/modules/re/Makefile#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/modules/rl/Makefile#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/modules/rue/Makefile#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/modules/safe/Makefile#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/modules/sf/Makefile#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/modules/sis/Makefile#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/modules/sk/Makefile#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/modules/snc/Makefile#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/modules/sound/sound/Makefile#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/modules/ste/Makefile#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/modules/stg/Makefile#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/modules/ti/Makefile#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/modules/tl/Makefile#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/modules/tx/Makefile#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/modules/txp/Makefile#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/modules/ubsec/Makefile#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/modules/udav/Makefile#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/modules/ural/Makefile#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/modules/vge/Makefile#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/modules/vr/Makefile#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/modules/vx/Makefile#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/modules/wb/Makefile#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/modules/xl/Makefile#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/net/bpf.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/net/bridge.c#3 delete
.. //depot/projects/soc2005/ufsj/src/sys/net/bridge.h#2 delete
.. //depot/projects/soc2005/ufsj/src/sys/net/if.c#4 integrate
.. //depot/projects/soc2005/ufsj/src/sys/net/if.h#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/net/if_bridge.c#4 integrate
.. //depot/projects/soc2005/ufsj/src/sys/net/if_ethersubr.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/net/if_fwsubr.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/net/if_var.h#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/net/if_vlan.c#4 integrate
.. //depot/projects/soc2005/ufsj/src/sys/net/netisr.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/netgraph/ng_ether.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/netgraph/ng_tty.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/netinet/if_ether.c#4 integrate
.. //depot/projects/soc2005/ufsj/src/sys/netinet/in.c#4 integrate
.. //depot/projects/soc2005/ufsj/src/sys/netinet/ip_dummynet.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/netinet/ip_dummynet.h#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/netinet/ip_fw2.c#4 integrate
.. //depot/projects/soc2005/ufsj/src/sys/netinet/raw_ip.c#4 integrate
.. //depot/projects/soc2005/ufsj/src/sys/netinet/tcp_subr.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/netsmb/netbios.h#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/nfsclient/nfs_diskless.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/nfsserver/nfs_srvsock.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/nfsserver/nfs_srvsubs.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/pc98/cbus/sio.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/pc98/conf/GENERIC#4 integrate
.. //depot/projects/soc2005/ufsj/src/sys/pc98/conf/GENERIC.hints#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/pc98/conf/NOTES#4 integrate
.. //depot/projects/soc2005/ufsj/src/sys/pci/agp_amd64.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/pci/agpreg.h#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/pci/if_dc.c#4 integrate
.. //depot/projects/soc2005/ufsj/src/sys/pci/if_rl.c#4 integrate
.. //depot/projects/soc2005/ufsj/src/sys/pci/if_rlreg.h#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/pci/if_sf.c#4 integrate
.. //depot/projects/soc2005/ufsj/src/sys/pci/if_sis.c#4 integrate
.. //depot/projects/soc2005/ufsj/src/sys/pci/if_ste.c#4 integrate
.. //depot/projects/soc2005/ufsj/src/sys/pci/if_ti.c#4 integrate
.. //depot/projects/soc2005/ufsj/src/sys/pci/if_tireg.h#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/pci/if_vr.c#4 integrate
.. //depot/projects/soc2005/ufsj/src/sys/pci/if_wb.c#4 integrate
.. //depot/projects/soc2005/ufsj/src/sys/pci/if_xl.c#4 integrate
.. //depot/projects/soc2005/ufsj/src/sys/powerpc/include/atomic.h#4 integrate
.. //depot/projects/soc2005/ufsj/src/sys/powerpc/ofw/ofw_syscons.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/security/mac/mac_process.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/security/mac_seeotheruids/mac_seeotheruids.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/sparc64/include/atomic.h#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/sys/buf.h#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/sys/cdefs.h#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/sys/kerneldump.h#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/sys/libkern.h#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/sys/mac.h#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/sys/mac_policy.h#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/sys/param.h#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/sys/proc.h#4 integrate
.. //depot/projects/soc2005/ufsj/src/sys/sys/refcount.h#1 branch
.. //depot/projects/soc2005/ufsj/src/sys/sys/resourcevar.h#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/sys/rman.h#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/sys/syscall.h#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/sys/syscall.mk#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/sys/sysproto.h#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/sys/ucred.h#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/sys/uuid.h#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/ufs/ffs/ffs_alloc.c#5 integrate
.. //depot/projects/soc2005/ufsj/src/sys/ufs/ffs/ffs_snapshot.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/ufs/ffs/ffs_softdep.c#4 integrate
.. //depot/projects/soc2005/ufsj/src/sys/ufs/ffs/ffs_vfsops.c#6 integrate
.. //depot/projects/soc2005/ufsj/src/sys/ufs/ffs/ffs_vnops.c#4 integrate
.. //depot/projects/soc2005/ufsj/src/sys/ufs/ufs/ufs_vnops.c#6 integrate
.. //depot/projects/soc2005/ufsj/src/sys/vm/uma.h#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/vm/uma_core.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/vm/vm_mmap.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/vm/vm_page.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/vm/vm_zeroidle.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/tools/regression/geom_gpt/gctl.t#2 integrate
.. //depot/projects/soc2005/ufsj/src/tools/regression/geom_uzip/Makefile#2 integrate
.. //depot/projects/soc2005/ufsj/src/tools/regression/geom_uzip/test-1.img.gz.uue#2 delete
.. //depot/projects/soc2005/ufsj/src/tools/regression/geom_uzip/test-1.img.uzip.uue#1 branch
.. //depot/projects/soc2005/ufsj/src/tools/regression/geom_uzip/test-1.sh#2 integrate
.. //depot/projects/soc2005/ufsj/src/tools/regression/geom_uzip/test-2.sh#2 integrate
.. //depot/projects/soc2005/ufsj/src/tools/regression/lib/libutil/Makefile#1 branch
.. //depot/projects/soc2005/ufsj/src/tools/regression/lib/libutil/test-trimdomain-nodomain.c#1 branch
.. //depot/projects/soc2005/ufsj/src/tools/regression/lib/libutil/test-trimdomain-nodomain.t#1 branch
.. //depot/projects/soc2005/ufsj/src/tools/regression/lib/libutil/test-trimdomain.c#1 branch
.. //depot/projects/soc2005/ufsj/src/tools/regression/lib/libutil/test-trimdomain.t#1 branch
.. //depot/projects/soc2005/ufsj/src/tools/tools/README#4 integrate
.. //depot/projects/soc2005/ufsj/src/tools/tools/iwi/Makefile#1 branch
.. //depot/projects/soc2005/ufsj/src/tools/tools/iwi/iwistats.c#1 branch
.. //depot/projects/soc2005/ufsj/src/tools/tools/nanobsd/nanobsd.sh#3 integrate
.. //depot/projects/soc2005/ufsj/src/tools/tools/netrate/http/Makefile#1 branch
.. //depot/projects/soc2005/ufsj/src/tools/tools/netrate/http/http.c#1 branch
.. //depot/projects/soc2005/ufsj/src/tools/tools/netrate/httpd/Makefile#1 branch
.. //depot/projects/soc2005/ufsj/src/tools/tools/netrate/httpd/httpd.c#1 branch
.. //depot/projects/soc2005/ufsj/src/tools/tools/netrate/tcpconnect/Makefile#1 branch
.. //depot/projects/soc2005/ufsj/src/tools/tools/netrate/tcpconnect/tcpconnect.c#1 branch
.. //depot/projects/soc2005/ufsj/src/tools/tools/netrate/tcpreceive/Makefile#1 branch
.. //depot/projects/soc2005/ufsj/src/tools/tools/netrate/tcpreceive/tcpreceive.c#1 branch
.. //depot/projects/soc2005/ufsj/src/tools/tools/tinderbox/etc/releng_6.rc#2 integrate
.. //depot/projects/soc2005/ufsj/src/tools/tools/tinderbox/etc/update_releng_6.rc#2 integrate
.. //depot/projects/soc2005/ufsj/src/usr.bin/calendar/calendars/calendar.freebsd#4 integrate
.. //depot/projects/soc2005/ufsj/src/usr.bin/gprof/gprof.1#2 integrate
.. //depot/projects/soc2005/ufsj/src/usr.bin/gprof/printgprof.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/usr.bin/lockf/lockf.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/usr.bin/lorder/Makefile#2 integrate
.. //depot/projects/soc2005/ufsj/src/usr.bin/mail/mail.1#2 integrate
.. //depot/projects/soc2005/ufsj/src/usr.bin/mail/main.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/usr.bin/make/job.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/usr.bin/make/make.1#4 integrate
.. //depot/projects/soc2005/ufsj/src/usr.bin/mt/mt.1#2 integrate
.. //depot/projects/soc2005/ufsj/src/usr.bin/netstat/if.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/usr.bin/netstat/main.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/usr.bin/netstat/netstat.1#3 integrate
.. //depot/projects/soc2005/ufsj/src/usr.bin/netstat/netstat.h#3 integrate
.. //depot/projects/soc2005/ufsj/src/usr.sbin/Makefile#4 integrate
.. //depot/projects/soc2005/ufsj/src/usr.sbin/bsnmpd/bsnmpd/Makefile#2 integrate
.. //depot/projects/soc2005/ufsj/src/usr.sbin/bsnmpd/gensnmptree/Makefile#2 integrate
.. //depot/projects/soc2005/ufsj/src/usr.sbin/bsnmpd/modules/Makefile.inc#3 integrate
.. //depot/projects/soc2005/ufsj/src/usr.sbin/lmcconfig/Makefile#1 branch
.. //depot/projects/soc2005/ufsj/src/usr.sbin/lmcconfig/lmcconfig.8#1 branch
.. //depot/projects/soc2005/ufsj/src/usr.sbin/lmcconfig/lmcconfig.c#1 branch
.. //depot/projects/soc2005/ufsj/src/usr.sbin/ntp/ntptrace/Makefile#2 integrate
.. //depot/projects/soc2005/ufsj/src/usr.sbin/pccard/Makefile#2 integrate
.. //depot/projects/soc2005/ufsj/src/usr.sbin/pmccontrol/pmccontrol.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/usr.sbin/sysinstall/Makefile#2 integrate
.. //depot/projects/soc2005/ufsj/src/usr.sbin/sysinstall/devices.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/usr.sbin/sysinstall/sysinstall.h#2 integrate
.. //depot/projects/soc2005/ufsj/src/usr.sbin/syslogd/syslogd.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/usr.sbin/watchdogd/watchdogd.c#4 integrate
Differences ...
==== //depot/projects/soc2005/ufsj/src/ObsoleteFiles.inc#2 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.15 2005/09/11 18:19:42 netchild Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.18 2005/10/08 22:51:47 thompsa Exp $
#
# This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
# directories (OLD_DIRS) which should get removed at an update. Recently
@@ -14,6 +14,8 @@
# The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
#
+# 20050927: bridge(4) replaced by if_bridge(4)
+OLD_FILES+=usr/include/net/bridge.h
# 20050831: not implemented
OLD_FILES+=usr/share/man/man3/getino.3.gz
OLD_FILES+=usr/share/man/man3/putino.3.gz
==== //depot/projects/soc2005/ufsj/src/UPDATING#3 (text+ko) ====
@@ -21,6 +21,14 @@
developers choose to disable these features on build machines
to maximize performance.
+20051001:
+ kern.polling.enable sysctl MIB is now deprecated. Use ifconfig(8)
+ to turn polling(4) on your interfaces.
+
+20050927:
+ The old bridge(4) implementation was retired. The new
+ if_bridge(4) serves as a full functional replacement.
+
20050722:
The ai_addrlen of a struct addrinfo was changed to a socklen_t
to conform to POSIX-2001. This change broke an ABI
@@ -411,4 +419,4 @@
Contact Warner Losh if you have any questions about your use of
this document.
-$FreeBSD: src/UPDATING,v 1.420 2005/09/09 15:59:17 obrien Exp $
+$FreeBSD: src/UPDATING,v 1.422 2005/10/01 20:53:51 glebius Exp $
==== //depot/projects/soc2005/ufsj/src/bin/rm/rm.1#2 (text+ko) ====
@@ -30,9 +30,9 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)rm.1 8.5 (Berkeley) 12/5/94
-.\" $FreeBSD: src/bin/rm/rm.1,v 1.36 2005/02/09 17:37:39 ru Exp $
+.\" $FreeBSD: src/bin/rm/rm.1,v 1.38 2005/09/30 02:12:15 dougb Exp $
.\"
-.Dd October 28, 2004
+.Dd September 29, 2005
.Dt RM 1
.Os
.Sh NAME
@@ -88,6 +88,10 @@
Overwrite regular files before deleting them.
Files are overwritten three times, first with the byte pattern 0xff,
then 0x00, and then 0xff again, before they are deleted.
+Specifying this flag for a read only file will cause
+.Nm
+to generate an error message and exit.
+The file wil not be removed or overwritten.
.It Fl R
Attempt to remove the file hierarchy rooted in each file argument.
The
==== //depot/projects/soc2005/ufsj/src/bin/rm/rm.c#2 (text+ko) ====
@@ -39,7 +39,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/rm/rm.c,v 1.52 2004/11/13 04:07:01 jkh Exp $");
+__FBSDID("$FreeBSD: src/bin/rm/rm.c,v 1.53 2005/09/29 20:40:29 dougb Exp $");
#include <sys/stat.h>
#include <sys/param.h>
@@ -452,11 +452,8 @@
* talking to a terminal, ask. Symbolic links are excluded
* because their permissions are meaningless. Check stdin_ok
* first because we may not have stat'ed the file.
- * Also skip this check if the -P option was specified because
- * we will not be able to overwrite file contents and will
- * barf later.
*/
- if (!stdin_ok || S_ISLNK(sp->st_mode) || Pflag ||
+ if (!stdin_ok || S_ISLNK(sp->st_mode) ||
(!access(name, W_OK) &&
!(sp->st_flags & (SF_APPEND|SF_IMMUTABLE)) &&
(!(sp->st_flags & (UF_APPEND|UF_IMMUTABLE)) || !uid)))
@@ -464,6 +461,10 @@
strmode(sp->st_mode, modep);
if ((flagsp = fflagstostr(sp->st_flags)) == NULL)
err(1, "fflagstostr");
+ if (Pflag)
+ errx(1,
+ "%s: -P was specified, but file is not writable",
+ path);
(void)fprintf(stderr, "override %s%s%s/%s %s%sfor %s? ",
modep + 1, modep[9] == ' ' ? "" : " ",
user_from_uid(sp->st_uid, 0),
==== //depot/projects/soc2005/ufsj/src/contrib/bc/bc/main.c#2 (text+ko) ====
@@ -26,7 +26,7 @@
Western Washington University
Bellingham, WA 98226-9062
-$FreeBSD: src/contrib/bc/bc/main.c,v 1.6 2004/02/17 00:53:50 ache Exp $
+$FreeBSD: src/contrib/bc/bc/main.c,v 1.7 2005/09/27 18:52:17 brooks Exp $
*************************************************************************/
@@ -65,7 +65,7 @@
printf ("usage: %s [options] [file ...]\n%s%s%s%s%s%s%s", progname,
" -h --help print this usage and exit\n",
" -i --interactive force interactive mode\n",
- " -l --mathlib use the predefine math routnes\n",
+ " -l --mathlib use the predefine math routines\n",
" -q --quiet don't print initial banner\n",
" -s --standard non-standard bc constructs are errors\n",
" -w --warn warn about non-standard bc constructs\n",
==== //depot/projects/soc2005/ufsj/src/contrib/bsnmp/FREEBSD-Xlist#2 (text+ko) ====
@@ -1,4 +1,4 @@
-#$FreeBSD: src/contrib/bsnmp/FREEBSD-Xlist,v 1.3 2005/02/28 17:29:10 harti Exp $
+#$FreeBSD: src/contrib/bsnmp/FREEBSD-Xlist,v 1.4 2005/10/04 14:53:06 harti Exp $
*/Makefile.in
*/acinclude.m4
*/aclocal.m4
@@ -10,5 +10,6 @@
*/gensnmptree/Makefile.in
*/lib/Makefile.in
*/snmp_mibII/Makefile.in
+*/snmp_ntp/Makefile.in
*/snmpd/Makefile.in
*/snmpd/.gdbinit
==== //depot/projects/soc2005/ufsj/src/contrib/bsnmp/NEWS#2 (text+ko) ====
@@ -1,3 +1,25 @@
+1.11 Make the Mib2 routing table use red-black tree. This vastly
+ reduces loading and access time. Load the table only every 10
+ minutes. In the meantime process message from the routing socket
+ to update the table.
+
+ Lot of man-page fixes from ru at freebsd.org.
+
+ Fixes to command line macros and macro redefinition.
+
+ Trap variables for ntp (still need trap definition and code).
+
+ Periodic timers from Victor Cruceru.
+
+ Man-page fixes from Christian Brueffer.
+
+ Lots of spelling fixes from Giorgios Keramidas.
+
+ A number of changes to facilitate building on FreeBSD-4 from
+ Andrey Elsukov.
+
+ Add repeatable timers.
+
1.10
Change all the tick handling in the daemon from 32-bit to 64-bit.
Bump the modules' major version number to 3.
@@ -34,7 +56,7 @@
Maxim Konovalov)
1.7
- snmpd: Move event library initialisation before reading of
+ snmpd: Move event library initialization before reading of
config file (thanks to phk).
gensnmptree: can now read more than one tree and merge them.
==== //depot/projects/soc2005/ufsj/src/contrib/bsnmp/VERSION#2 (text+ko) ====
@@ -1,1 +1,1 @@
-1.10
+1.11
==== //depot/projects/soc2005/ufsj/src/contrib/bsnmp/gensnmpdef/gensnmpdef.1#2 (text+ko) ====
@@ -1,5 +1,5 @@
.\"
-.\" Copyright (C) 2004
+.\" Copyright (C) 2004-2005
.\" Hartmut Brandt.
.\" All rights reserved.
.\"
@@ -26,9 +26,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $Begemot: bsnmp/gensnmpdef/gensnmpdef.1,v 1.3 2005/02/25 11:55:54 brandt_h Exp $
+.\" $Begemot: bsnmp/gensnmpdef/gensnmpdef.1,v 1.5 2005/10/04 08:46:46 brandt_h Exp $
.\"
-.Dd April 14, 2004
+.Dd June 14, 2005
.Dt GENSNMPDEF 1
.Os
.Sh NAME
@@ -43,7 +43,8 @@
The
.Nm
utility is used to create an initial MIB description file from
-one or more MIBs. The description file must be edited to be actually useful
+one or more MIBs.
+The description file must be edited to be actually useful
for feeding it into
.Xr gensnmptree 1 .
.Pp
@@ -57,13 +58,13 @@
.Pp
.Nm
does no attempt on sorting the OID tree so in case of complex and
-non-standard MIBs it is necessay to sort the tree in the resulting definition
+non-standard MIBs it is necessary to sort the tree in the resulting definition
file by hand.
.Sh SEE ALSO
.Xr snmpd 1
+.Sh AUTHORS
+.An Hartmut Brandt Aq harti at freebsd.org
.Sh BUGS
The utility is by no means bullet-proof and may fail for complex
or non-standard MIBs.
Its output is expected to be edited by hand.
-.Sh AUTHORS
-.An Hartmut Brandt Aq harti at freebsd.org
==== //depot/projects/soc2005/ufsj/src/contrib/bsnmp/gensnmptree/gensnmptree.1#2 (text+ko) ====
@@ -1,5 +1,5 @@
.\"
-.\" Copyright (c) 2001-2003
+.\" Copyright (c) 2001-2005
.\" Fraunhofer Institute for Open Communication Systems (FhG Fokus).
.\" All rights reserved.
.\"
@@ -26,9 +26,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $Begemot: bsnmp/gensnmptree/gensnmptree.1,v 1.4 2005/02/25 11:55:56 brandt_h Exp $
+.\" $Begemot: bsnmp/gensnmptree/gensnmptree.1,v 1.5 2005/06/15 11:31:25 brandt_h Exp $
.\"
-.Dd October 7, 2003
+.Dd June 14, 2005
.Dt GENSNMPTREE 1
.Os
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list