PERFORCE change 145402 for review
John Birrell
jb at FreeBSD.org
Fri Jul 18 02:49:43 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=145402
Change 145402 by jb at freebsd3 on 2008/07/18 02:49:17
IFC
Affected files ...
.. //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/tools/checkupdate/checkupdate.1#3 integrate
.. //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/tools/checkupdate/checkupdate.py#3 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#50 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/portbuild/article.sgml#13 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/problem-reports/article.sgml#8 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/developers-handbook/kernelbuild/chapter.sgml#2 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/faq/book.sgml#24 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#6 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml#9 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml#18 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#17 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#16 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/printing/chapter.sgml#16 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml#23 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/share/sgml/authors.ent#41 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/share/sgml/mailing-lists.ent#9 integrate
.. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/share/tools/checkupdate/notify#1 branch
.. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/eresources/chapter.sgml#4 integrate
.. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/mirrors/chapter.sgml#6 integrate
.. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/network-servers/chapter.sgml#6 integrate
.. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/printing/chapter.sgml#10 integrate
.. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/security/chapter.sgml#7 integrate
.. //depot/projects/dtrace/doc/mn_MN.UTF-8/share/sgml/mailing-lists.ent#4 integrate
.. //depot/projects/dtrace/doc/nl_NL.ISO8859-1/books/handbook/mail/chapter.sgml#3 integrate
.. //depot/projects/dtrace/doc/share/pgpkeys/beech.key#2 integrate
.. //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys-developers.sgml#41 integrate
.. //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys.ent#39 integrate
.. //depot/projects/dtrace/doc/share/pgpkeys/sson.key#1 branch
.. //depot/projects/dtrace/doc/share/sgml/man-refs.ent#36 integrate
.. //depot/projects/dtrace/ports/MOVED#100 integrate
.. //depot/projects/dtrace/ports/Mk/bsd.gecko.mk#2 integrate
.. //depot/projects/dtrace/ports/Mk/bsd.php.mk#13 integrate
.. //depot/projects/dtrace/ports/Tools/scripts/bump_revision.pl#4 integrate
.. //depot/projects/dtrace/ports/Tools/scripts/modules/Makefile#1 branch
.. //depot/projects/dtrace/ports/Tools/scripts/modules/buildmodules.pl#1 branch
.. //depot/projects/dtrace/ports/Tools/scripts/modules/modules.head#1 branch
.. //depot/projects/dtrace/ports/Tools/scripts/modules/update.sh#1 branch
.. //depot/projects/dtrace/ports/UPDATING#82 integrate
.. //depot/projects/dtrace/src/ObsoleteFiles.inc#49 integrate
.. //depot/projects/dtrace/src/UPDATING#35 integrate
.. //depot/projects/dtrace/src/bin/setfacl/setfacl.1#5 integrate
.. //depot/projects/dtrace/src/bin/stty/print.c#4 integrate
.. //depot/projects/dtrace/src/contrib/bind9/CHANGES#9 integrate
.. //depot/projects/dtrace/src/contrib/bind9/FREEBSD-Upgrade#5 delete
.. //depot/projects/dtrace/src/contrib/bind9/FREEBSD-Xlist#4 delete
.. //depot/projects/dtrace/src/contrib/bind9/bin/named/client.c#7 integrate
.. //depot/projects/dtrace/src/contrib/bind9/bin/named/server.c#7 integrate
.. //depot/projects/dtrace/src/contrib/bind9/doc/arm/Bv9ARM-book.xml#7 integrate
.. //depot/projects/dtrace/src/contrib/bind9/doc/arm/Bv9ARM.ch06.html#7 integrate
.. //depot/projects/dtrace/src/contrib/bind9/doc/arm/Bv9ARM.pdf#7 integrate
.. //depot/projects/dtrace/src/contrib/bind9/lib/bind/aclocal.m4#4 delete
.. //depot/projects/dtrace/src/contrib/bind9/lib/bind/config.h.in#6 delete
.. //depot/projects/dtrace/src/contrib/bind9/lib/bind/configure#7 delete
.. //depot/projects/dtrace/src/contrib/bind9/lib/bind9/check.c#7 integrate
.. //depot/projects/dtrace/src/contrib/bind9/lib/dns/api#7 integrate
.. //depot/projects/dtrace/src/contrib/bind9/lib/dns/dispatch.c#7 integrate
.. //depot/projects/dtrace/src/contrib/bind9/lib/dns/include/dns/dispatch.h#6 integrate
.. //depot/projects/dtrace/src/contrib/bind9/lib/dns/resolver.c#9 integrate
.. //depot/projects/dtrace/src/contrib/bind9/version#9 integrate
.. //depot/projects/dtrace/src/contrib/cpio/ABOUT-NLS#4 integrate
.. //depot/projects/dtrace/src/contrib/cpio/COPYING#4 integrate
.. //depot/projects/dtrace/src/contrib/cpio/ChangeLog#4 integrate
.. //depot/projects/dtrace/src/contrib/cpio/INSTALL#4 integrate
.. //depot/projects/dtrace/src/contrib/cpio/NEWS#4 integrate
.. //depot/projects/dtrace/src/contrib/cpio/THANKS#4 integrate
.. //depot/projects/dtrace/src/contrib/cpio/TODO#4 integrate
.. //depot/projects/dtrace/src/contrib/cpio/doc/cpio.texi#4 integrate
.. //depot/projects/dtrace/src/contrib/cpio/doc/version.texi#1 branch
.. //depot/projects/dtrace/src/contrib/cpio/lib/alloca_.h#4 integrate
.. //depot/projects/dtrace/src/contrib/cpio/lib/argp-ba.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cpio/lib/argp-eexst.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cpio/lib/argp-fmtstream.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cpio/lib/argp-fmtstream.h#4 integrate
.. //depot/projects/dtrace/src/contrib/cpio/lib/argp-fs-xinl.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cpio/lib/argp-help.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cpio/lib/argp-namefrob.h#4 integrate
.. //depot/projects/dtrace/src/contrib/cpio/lib/argp-parse.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cpio/lib/argp-pin.c#1 branch
.. //depot/projects/dtrace/src/contrib/cpio/lib/argp-pv.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cpio/lib/argp-pvh.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cpio/lib/argp-xinl.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cpio/lib/argp.h#4 integrate
.. //depot/projects/dtrace/src/contrib/cpio/lib/basename.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cpio/lib/dirname.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cpio/lib/dirname.h#4 integrate
.. //depot/projects/dtrace/src/contrib/cpio/lib/error.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cpio/lib/error.h#4 integrate
.. //depot/projects/dtrace/src/contrib/cpio/lib/exit.h#4 delete
.. //depot/projects/dtrace/src/contrib/cpio/lib/exitfail.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cpio/lib/exitfail.h#4 integrate
.. //depot/projects/dtrace/src/contrib/cpio/lib/fatal.c#1 branch
.. //depot/projects/dtrace/src/contrib/cpio/lib/full-write.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cpio/lib/full-write.h#4 integrate
.. //depot/projects/dtrace/src/contrib/cpio/lib/getopt.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cpio/lib/getopt1.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cpio/lib/getopt_.h#4 integrate
.. //depot/projects/dtrace/src/contrib/cpio/lib/getopt_int.h#4 integrate
.. //depot/projects/dtrace/src/contrib/cpio/lib/gettext.h#4 integrate
.. //depot/projects/dtrace/src/contrib/cpio/lib/hash.c#1 branch
.. //depot/projects/dtrace/src/contrib/cpio/lib/hash.h#1 branch
.. //depot/projects/dtrace/src/contrib/cpio/lib/intprops.h#1 branch
.. //depot/projects/dtrace/src/contrib/cpio/lib/inttostr.c#1 branch
.. //depot/projects/dtrace/src/contrib/cpio/lib/inttostr.h#1 branch
.. //depot/projects/dtrace/src/contrib/cpio/lib/localedir.h#4 delete
.. //depot/projects/dtrace/src/contrib/cpio/lib/mempcpy.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cpio/lib/mempcpy.h#4 delete
.. //depot/projects/dtrace/src/contrib/cpio/lib/paxerror.c#1 branch
.. //depot/projects/dtrace/src/contrib/cpio/lib/paxexit.c#1 branch
.. //depot/projects/dtrace/src/contrib/cpio/lib/paxlib.h#1 branch
.. //depot/projects/dtrace/src/contrib/cpio/lib/paxnames.c#1 branch
.. //depot/projects/dtrace/src/contrib/cpio/lib/quote.c#1 branch
.. //depot/projects/dtrace/src/contrib/cpio/lib/quote.h#1 branch
.. //depot/projects/dtrace/src/contrib/cpio/lib/quotearg.c#1 branch
.. //depot/projects/dtrace/src/contrib/cpio/lib/quotearg.h#1 branch
.. //depot/projects/dtrace/src/contrib/cpio/lib/rmt-command.h#1 branch
.. //depot/projects/dtrace/src/contrib/cpio/lib/rmt.h#4 integrate
.. //depot/projects/dtrace/src/contrib/cpio/lib/rtapelib.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cpio/lib/safe-read.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cpio/lib/safe-read.h#4 integrate
.. //depot/projects/dtrace/src/contrib/cpio/lib/safe-write.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cpio/lib/safe-write.h#4 integrate
.. //depot/projects/dtrace/src/contrib/cpio/lib/savedir.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cpio/lib/savedir.h#4 integrate
.. //depot/projects/dtrace/src/contrib/cpio/lib/strcase.h#4 delete
.. //depot/projects/dtrace/src/contrib/cpio/lib/strchrnul.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cpio/lib/strchrnul.h#4 delete
.. //depot/projects/dtrace/src/contrib/cpio/lib/stripslash.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cpio/lib/strndup.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cpio/lib/strndup.h#4 delete
.. //depot/projects/dtrace/src/contrib/cpio/lib/strnlen.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cpio/lib/system-ioctl.h#1 branch
.. //depot/projects/dtrace/src/contrib/cpio/lib/system.h#4 integrate
.. //depot/projects/dtrace/src/contrib/cpio/lib/umaxtostr.c#1 branch
.. //depot/projects/dtrace/src/contrib/cpio/lib/unlocked-io.h#4 integrate
.. //depot/projects/dtrace/src/contrib/cpio/lib/utimens.c#1 branch
.. //depot/projects/dtrace/src/contrib/cpio/lib/utimens.h#1 branch
.. //depot/projects/dtrace/src/contrib/cpio/lib/xalloc-die.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cpio/lib/xalloc.h#4 integrate
.. //depot/projects/dtrace/src/contrib/cpio/lib/xmalloc.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cpio/lib/xstrndup.c#1 branch
.. //depot/projects/dtrace/src/contrib/cpio/lib/xstrndup.h#1 branch
.. //depot/projects/dtrace/src/contrib/cpio/src/copyin.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cpio/src/copyout.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cpio/src/copypass.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cpio/src/cpio.h#4 integrate
.. //depot/projects/dtrace/src/contrib/cpio/src/cpiohdr.h#4 integrate
.. //depot/projects/dtrace/src/contrib/cpio/src/defer.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cpio/src/defer.h#4 integrate
.. //depot/projects/dtrace/src/contrib/cpio/src/dstring.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cpio/src/dstring.h#4 integrate
.. //depot/projects/dtrace/src/contrib/cpio/src/extern.h#4 integrate
.. //depot/projects/dtrace/src/contrib/cpio/src/filemode.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cpio/src/filetypes.h#4 integrate
.. //depot/projects/dtrace/src/contrib/cpio/src/global.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cpio/src/idcache.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cpio/src/main.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cpio/src/makepath.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cpio/src/tar.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cpio/src/tar.h#4 integrate
.. //depot/projects/dtrace/src/contrib/cpio/src/tarhdr.h#4 integrate
.. //depot/projects/dtrace/src/contrib/cpio/src/userspec.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cpio/src/util.c#4 integrate
.. //depot/projects/dtrace/src/etc/etc.amd64/ttys#7 integrate
.. //depot/projects/dtrace/src/etc/etc.i386/ttys#7 integrate
.. //depot/projects/dtrace/src/etc/namedb/named.conf#6 integrate
.. //depot/projects/dtrace/src/etc/rc.d/amd#9 integrate
.. //depot/projects/dtrace/src/etc/rc.d/apmd#5 integrate
.. //depot/projects/dtrace/src/etc/rc.d/bsnmpd#4 integrate
.. //depot/projects/dtrace/src/etc/rc.d/bthidd#3 integrate
.. //depot/projects/dtrace/src/etc/rc.d/devd#5 integrate
.. //depot/projects/dtrace/src/etc/rc.d/ftp-proxy#3 integrate
.. //depot/projects/dtrace/src/etc/rc.d/ftpd#4 integrate
.. //depot/projects/dtrace/src/etc/rc.d/hcsecd#5 integrate
.. //depot/projects/dtrace/src/etc/rc.d/idmapd#2 integrate
.. //depot/projects/dtrace/src/etc/rc.d/ipfw#9 integrate
.. //depot/projects/dtrace/src/etc/rc.d/keyserv#5 integrate
.. //depot/projects/dtrace/src/etc/rc.d/lockd#4 integrate
.. //depot/projects/dtrace/src/etc/rc.d/lpd#6 integrate
.. //depot/projects/dtrace/src/etc/rc.d/mountcritlocal#8 integrate
.. //depot/projects/dtrace/src/etc/rc.d/mountd#6 integrate
.. //depot/projects/dtrace/src/etc/rc.d/moused#8 integrate
.. //depot/projects/dtrace/src/etc/rc.d/nfsclient#5 integrate
.. //depot/projects/dtrace/src/etc/rc.d/nfsd#5 integrate
.. //depot/projects/dtrace/src/etc/rc.d/nscd#4 integrate
.. //depot/projects/dtrace/src/etc/rc.d/ntpd#6 integrate
.. //depot/projects/dtrace/src/etc/rc.d/pf#6 integrate
.. //depot/projects/dtrace/src/etc/rc.d/powerd#5 integrate
.. //depot/projects/dtrace/src/etc/rc.d/rpcbind#5 integrate
.. //depot/projects/dtrace/src/etc/rc.d/rtadvd#5 integrate
.. //depot/projects/dtrace/src/etc/rc.d/rwho#5 integrate
.. //depot/projects/dtrace/src/etc/rc.d/savecore#6 integrate
.. //depot/projects/dtrace/src/etc/rc.d/sdpd#5 integrate
.. //depot/projects/dtrace/src/etc/rc.d/sendmail#6 integrate
.. //depot/projects/dtrace/src/etc/rc.d/sshd#7 integrate
.. //depot/projects/dtrace/src/etc/rc.d/statd#4 integrate
.. //depot/projects/dtrace/src/etc/rc.d/timed#5 integrate
.. //depot/projects/dtrace/src/etc/rc.d/ugidfw#6 integrate
.. //depot/projects/dtrace/src/etc/rc.d/watchdogd#4 integrate
.. //depot/projects/dtrace/src/etc/rc.d/ypbind#6 integrate
.. //depot/projects/dtrace/src/etc/rc.d/yppasswdd#6 integrate
.. //depot/projects/dtrace/src/etc/rc.d/ypserv#6 integrate
.. //depot/projects/dtrace/src/etc/rc.d/ypset#5 integrate
.. //depot/projects/dtrace/src/etc/rc.d/ypupdated#5 integrate
.. //depot/projects/dtrace/src/etc/rc.d/ypxfrd#6 integrate
.. //depot/projects/dtrace/src/etc/rc.firewall#10 integrate
.. //depot/projects/dtrace/src/games/fortune/datfiles/fortunes#35 integrate
.. //depot/projects/dtrace/src/gnu/usr.bin/cpio/Makefile#6 integrate
.. //depot/projects/dtrace/src/gnu/usr.bin/cpio/config.h#4 integrate
.. //depot/projects/dtrace/src/include/unistd.h#16 integrate
.. //depot/projects/dtrace/src/lib/libarchive/archive.h#2 integrate
.. //depot/projects/dtrace/src/lib/libarchive/archive_read_support_format_tar.c#17 integrate
.. //depot/projects/dtrace/src/lib/libarchive/archive_write_disk.c#9 integrate
.. //depot/projects/dtrace/src/lib/libarchive/config_freebsd.h#8 integrate
.. //depot/projects/dtrace/src/lib/libc/gen/signal.3#5 integrate
.. //depot/projects/dtrace/src/lib/libc/posix1e/acl_support.c#5 integrate
.. //depot/projects/dtrace/src/lib/libc/stdlib/hcreate.3#4 integrate
.. //depot/projects/dtrace/src/lib/libc/stdlib/hcreate.c#4 integrate
.. //depot/projects/dtrace/src/lib/libc/sys/Symbol.map#13 integrate
.. //depot/projects/dtrace/src/lib/libc/sys/ktrace.2#5 integrate
.. //depot/projects/dtrace/src/lib/libc/sys/modstat.2#5 integrate
.. //depot/projects/dtrace/src/lib/libgeom/geom_ctl.c#4 integrate
.. //depot/projects/dtrace/src/lib/libgeom/geom_getxml.c#5 integrate
.. //depot/projects/dtrace/src/lib/libgeom/geom_xml2tree.c#4 integrate
.. //depot/projects/dtrace/src/lib/libutil/expand_number.c#4 integrate
.. //depot/projects/dtrace/src/release/Makefile#20 integrate
.. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/hardware/article.sgml#7 integrate
.. //depot/projects/dtrace/src/sbin/Makefile#13 integrate
.. //depot/projects/dtrace/src/sbin/mount_nfs/mount_nfs.c#8 integrate
.. //depot/projects/dtrace/src/share/man/man4/Makefile#39 integrate
.. //depot/projects/dtrace/src/share/man/man4/ahc.4#5 integrate
.. //depot/projects/dtrace/src/share/man/man4/bpf.4#7 integrate
.. //depot/projects/dtrace/src/share/man/man4/cnw.4#5 delete
.. //depot/projects/dtrace/src/share/man/man4/ddb.4#18 integrate
.. //depot/projects/dtrace/src/share/man/man4/ed.4#7 integrate
.. //depot/projects/dtrace/src/share/man/man4/et.4#1 branch
.. //depot/projects/dtrace/src/share/man/man4/malo.4#4 integrate
.. //depot/projects/dtrace/src/share/man/man4/man4.i386/Makefile#6 integrate
.. //depot/projects/dtrace/src/share/man/man4/man4.i386/arl.4#4 delete
.. //depot/projects/dtrace/src/share/man/man4/man4.i386/oltr.4#4 delete
.. //depot/projects/dtrace/src/share/man/man4/man4.i386/sbni.4#4 delete
.. //depot/projects/dtrace/src/share/man/man4/man4.powerpc/Makefile#3 integrate
.. //depot/projects/dtrace/src/share/man/man4/man4.powerpc/bm.4#1 branch
.. //depot/projects/dtrace/src/share/man/man4/sbsh.4#5 delete
.. //depot/projects/dtrace/src/share/man/man4/zyd.4#3 integrate
.. //depot/projects/dtrace/src/share/man/man9/style.9#8 integrate
.. //depot/projects/dtrace/src/share/misc/committers-src.dot#13 integrate
.. //depot/projects/dtrace/src/share/zoneinfo/leapseconds#8 integrate
.. //depot/projects/dtrace/src/sys/Makefile#15 integrate
.. //depot/projects/dtrace/src/sys/amd64/amd64/busdma_machdep.c#10 integrate
.. //depot/projects/dtrace/src/sys/amd64/amd64/machdep.c#29 integrate
.. //depot/projects/dtrace/src/sys/amd64/amd64/minidump_machdep.c#7 integrate
.. //depot/projects/dtrace/src/sys/amd64/amd64/mp_machdep.c#13 integrate
.. //depot/projects/dtrace/src/sys/amd64/amd64/pmap.c#50 integrate
.. //depot/projects/dtrace/src/sys/amd64/conf/GENERIC#43 integrate
.. //depot/projects/dtrace/src/sys/amd64/conf/GENERIC.hints#6 integrate
.. //depot/projects/dtrace/src/sys/amd64/include/pmap.h#13 integrate
.. //depot/projects/dtrace/src/sys/amd64/include/vmparam.h#9 integrate
.. //depot/projects/dtrace/src/sys/arm/at91/if_atereg.h#5 integrate
.. //depot/projects/dtrace/src/sys/boot/forth/loader.conf#17 integrate
.. //depot/projects/dtrace/src/sys/boot/pc98/boot2/README.serial.98#4 delete
.. //depot/projects/dtrace/src/sys/cam/scsi/scsi_da.c#15 integrate
.. //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_misc.c#15 integrate
.. //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_proto.h#25 integrate
.. //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_syscall.h#25 integrate
.. //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_syscalls.c#25 integrate
.. //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_sysent.c#25 integrate
.. //depot/projects/dtrace/src/sys/compat/freebsd32/syscalls.master#25 integrate
.. //depot/projects/dtrace/src/sys/compat/linux/linux_misc.c#25 integrate
.. //depot/projects/dtrace/src/sys/compat/svr4/svr4_stat.c#5 integrate
.. //depot/projects/dtrace/src/sys/conf/NOTES#61 integrate
.. //depot/projects/dtrace/src/sys/conf/files#99 integrate
.. //depot/projects/dtrace/src/sys/conf/files.i386#37 integrate
.. //depot/projects/dtrace/src/sys/conf/files.pc98#23 integrate
.. //depot/projects/dtrace/src/sys/conf/kern.post.mk#15 integrate
.. //depot/projects/dtrace/src/sys/conf/newvers.sh#6 integrate
.. //depot/projects/dtrace/src/sys/contrib/dev/oltr/COPYRIGHT#4 delete
.. //depot/projects/dtrace/src/sys/contrib/dev/oltr/i386-elf.trlld.o.uu#4 delete
.. //depot/projects/dtrace/src/sys/contrib/dev/oltr/if_oltr.c#6 delete
.. //depot/projects/dtrace/src/sys/contrib/dev/oltr/if_oltr_isa.c#4 delete
.. //depot/projects/dtrace/src/sys/contrib/dev/oltr/if_oltr_pci.c#4 delete
.. //depot/projects/dtrace/src/sys/contrib/dev/oltr/if_oltrvar.h#4 delete
.. //depot/projects/dtrace/src/sys/contrib/dev/oltr/trlld.h#4 delete
.. //depot/projects/dtrace/src/sys/contrib/dev/oltr/trlldbm.c#4 delete
.. //depot/projects/dtrace/src/sys/contrib/dev/oltr/trlldhm.c#4 delete
.. //depot/projects/dtrace/src/sys/contrib/dev/oltr/trlldmac.c#4 delete
.. //depot/projects/dtrace/src/sys/dev/acpi_support/acpi_asus.c#9 integrate
.. //depot/projects/dtrace/src/sys/dev/age/if_age.c#3 integrate
.. //depot/projects/dtrace/src/sys/dev/arl/if_arl.c#7 delete
.. //depot/projects/dtrace/src/sys/dev/arl/if_arl_isa.c#6 delete
.. //depot/projects/dtrace/src/sys/dev/arl/if_arlreg.h#5 delete
.. //depot/projects/dtrace/src/sys/dev/ata/ata-chipset.c#30 integrate
.. //depot/projects/dtrace/src/sys/dev/ata/ata-pci.h#17 integrate
.. //depot/projects/dtrace/src/sys/dev/ciss/ciss.c#17 integrate
.. //depot/projects/dtrace/src/sys/dev/ciss/cissio.h#4 integrate
.. //depot/projects/dtrace/src/sys/dev/ciss/cissreg.h#4 integrate
.. //depot/projects/dtrace/src/sys/dev/ciss/cissvar.h#5 integrate
.. //depot/projects/dtrace/src/sys/dev/cnw/if_cnw.c#8 delete
.. //depot/projects/dtrace/src/sys/dev/cnw/if_cnwioctl.h#4 delete
.. //depot/projects/dtrace/src/sys/dev/cnw/if_cnwreg.h#4 delete
.. //depot/projects/dtrace/src/sys/dev/cs/if_cs.c#6 integrate
.. //depot/projects/dtrace/src/sys/dev/cs/if_csreg.h#5 integrate
.. //depot/projects/dtrace/src/sys/dev/ed/if_ed_pccard.c#6 integrate
.. //depot/projects/dtrace/src/sys/dev/et/if_et.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/if_ndis/if_ndis.c#21 integrate
.. //depot/projects/dtrace/src/sys/dev/k8temp/k8temp.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/lmc/if_lmc.c#8 integrate
.. //depot/projects/dtrace/src/sys/dev/lmc/if_lmc.h#6 integrate
.. //depot/projects/dtrace/src/sys/dev/mxge/if_mxge.c#17 integrate
.. //depot/projects/dtrace/src/sys/dev/pccard/pccarddevs#9 integrate
.. //depot/projects/dtrace/src/sys/dev/re/if_re.c#22 integrate
.. //depot/projects/dtrace/src/sys/dev/sbni/if_sbni.c#6 delete
.. //depot/projects/dtrace/src/sys/dev/sbni/if_sbni_isa.c#5 delete
.. //depot/projects/dtrace/src/sys/dev/sbni/if_sbni_pci.c#5 delete
.. //depot/projects/dtrace/src/sys/dev/sbni/if_sbnireg.h#4 delete
.. //depot/projects/dtrace/src/sys/dev/sbni/if_sbnivar.h#4 delete
.. //depot/projects/dtrace/src/sys/dev/sbsh/if_sbsh.c#7 delete
.. //depot/projects/dtrace/src/sys/dev/sbsh/if_sbshreg.h#4 delete
.. //depot/projects/dtrace/src/sys/dev/sound/pci/hda/hdac.c#20 integrate
.. //depot/projects/dtrace/src/sys/dev/syscons/daemon/daemon_saver.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/usb/ohci.c#11 integrate
.. //depot/projects/dtrace/src/sys/dev/vr/if_vr.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/vr/if_vrreg.h#2 integrate
.. //depot/projects/dtrace/src/sys/fs/cd9660/cd9660_rrip.c#2 integrate
.. //depot/projects/dtrace/src/sys/fs/msdosfs/msdosfs_vnops.c#14 integrate
.. //depot/projects/dtrace/src/sys/geom/vinum/geom_vinum_drive.c#6 integrate
.. //depot/projects/dtrace/src/sys/geom/vinum/geom_vinum_subr.c#5 integrate
.. //depot/projects/dtrace/src/sys/i386/conf/GENERIC#43 integrate
.. //depot/projects/dtrace/src/sys/i386/conf/GENERIC.hints#9 integrate
.. //depot/projects/dtrace/src/sys/i386/conf/NOTES#24 integrate
.. //depot/projects/dtrace/src/sys/i386/i386/busdma_machdep.c#11 integrate
.. //depot/projects/dtrace/src/sys/i386/i386/mp_machdep.c#15 integrate
.. //depot/projects/dtrace/src/sys/i386/i386/pmap.c#41 integrate
.. //depot/projects/dtrace/src/sys/i386/ibcs2/ibcs2_socksys.c#5 integrate
.. //depot/projects/dtrace/src/sys/ia64/conf/GENERIC#16 integrate
.. //depot/projects/dtrace/src/sys/ia64/ia64/busdma_machdep.c#8 integrate
.. //depot/projects/dtrace/src/sys/ia64/ia64/machdep.c#25 integrate
.. //depot/projects/dtrace/src/sys/ia64/include/ia64_cpu.h#5 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_conf.c#17 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_cpuset.c#8 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_event.c#15 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_exec.c#29 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_fork.c#32 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_jail.c#16 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_malloc.c#12 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_mib.c#10 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_xxx.c#7 integrate
.. //depot/projects/dtrace/src/sys/kern/link_elf.c#19 integrate
.. //depot/projects/dtrace/src/sys/kern/link_elf_obj.c#17 integrate
.. //depot/projects/dtrace/src/sys/kern/subr_param.c#6 integrate
.. //depot/projects/dtrace/src/sys/kern/subr_stack.c#7 integrate
.. //depot/projects/dtrace/src/sys/kern/vfs_mount.c#36 integrate
.. //depot/projects/dtrace/src/sys/libkern/memset.c#2 integrate
.. //depot/projects/dtrace/src/sys/mips/adm5120/adm5120_machdep.c#1 branch
.. //depot/projects/dtrace/src/sys/mips/adm5120/adm5120reg.h#1 branch
.. //depot/projects/dtrace/src/sys/mips/adm5120/admpci.c#1 branch
.. //depot/projects/dtrace/src/sys/mips/adm5120/console.c#1 branch
.. //depot/projects/dtrace/src/sys/mips/adm5120/files.adm5120#1 branch
.. //depot/projects/dtrace/src/sys/mips/adm5120/if_admsw.c#1 branch
.. //depot/projects/dtrace/src/sys/mips/adm5120/if_admswreg.h#1 branch
.. //depot/projects/dtrace/src/sys/mips/adm5120/if_admswvar.h#1 branch
.. //depot/projects/dtrace/src/sys/mips/adm5120/obio.c#1 branch
.. //depot/projects/dtrace/src/sys/mips/adm5120/obiovar.h#1 branch
.. //depot/projects/dtrace/src/sys/mips/adm5120/std.adm5120#1 branch
.. //depot/projects/dtrace/src/sys/mips/adm5120/uart_bus_adm5120.c#1 branch
.. //depot/projects/dtrace/src/sys/mips/adm5120/uart_cpu_adm5120.c#1 branch
.. //depot/projects/dtrace/src/sys/mips/adm5120/uart_dev_adm5120.c#1 branch
.. //depot/projects/dtrace/src/sys/mips/adm5120/uart_dev_adm5120.h#1 branch
.. //depot/projects/dtrace/src/sys/mips/idt/files.idt#1 branch
.. //depot/projects/dtrace/src/sys/mips/idt/idt_machdep.c#1 branch
.. //depot/projects/dtrace/src/sys/mips/idt/idtpci.c#1 branch
.. //depot/projects/dtrace/src/sys/mips/idt/idtreg.h#1 branch
.. //depot/projects/dtrace/src/sys/mips/idt/if_kr.c#1 branch
.. //depot/projects/dtrace/src/sys/mips/idt/if_krreg.h#1 branch
.. //depot/projects/dtrace/src/sys/mips/idt/obio.c#1 branch
.. //depot/projects/dtrace/src/sys/mips/idt/obiovar.h#1 branch
.. //depot/projects/dtrace/src/sys/mips/idt/std.idt#1 branch
.. //depot/projects/dtrace/src/sys/mips/idt/uart_bus_rc32434.c#1 branch
.. //depot/projects/dtrace/src/sys/mips/idt/uart_cpu_rc32434.c#1 branch
.. //depot/projects/dtrace/src/sys/mips/malta/files.malta#1 branch
.. //depot/projects/dtrace/src/sys/mips/malta/gt.c#1 branch
.. //depot/projects/dtrace/src/sys/mips/malta/gt_pci.c#1 branch
.. //depot/projects/dtrace/src/sys/mips/malta/gtreg.h#1 branch
.. //depot/projects/dtrace/src/sys/mips/malta/gtvar.h#1 branch
.. //depot/projects/dtrace/src/sys/mips/malta/malta_machdep.c#1 branch
.. //depot/projects/dtrace/src/sys/mips/malta/maltareg.h#1 branch
.. //depot/projects/dtrace/src/sys/mips/malta/obio.c#1 branch
.. //depot/projects/dtrace/src/sys/mips/malta/obiovar.h#1 branch
.. //depot/projects/dtrace/src/sys/mips/malta/std.malta#1 branch
.. //depot/projects/dtrace/src/sys/mips/malta/uart_bus_maltausart.c#1 branch
.. //depot/projects/dtrace/src/sys/mips/malta/uart_cpu_maltausart.c#1 branch
.. //depot/projects/dtrace/src/sys/mips/malta/yamon.c#1 branch
.. //depot/projects/dtrace/src/sys/mips/malta/yamon.h#1 branch
.. //depot/projects/dtrace/src/sys/mips/mips/pmap.c#5 integrate
.. //depot/projects/dtrace/src/sys/mips/mips32/adm5120/adm5120_machdep.c#2 delete
.. //depot/projects/dtrace/src/sys/mips/mips32/adm5120/adm5120reg.h#2 delete
.. //depot/projects/dtrace/src/sys/mips/mips32/adm5120/admpci.c#2 delete
.. //depot/projects/dtrace/src/sys/mips/mips32/adm5120/console.c#2 delete
.. //depot/projects/dtrace/src/sys/mips/mips32/adm5120/files.adm5120#2 delete
.. //depot/projects/dtrace/src/sys/mips/mips32/adm5120/if_admsw.c#2 delete
.. //depot/projects/dtrace/src/sys/mips/mips32/adm5120/if_admswreg.h#2 delete
.. //depot/projects/dtrace/src/sys/mips/mips32/adm5120/if_admswvar.h#2 delete
.. //depot/projects/dtrace/src/sys/mips/mips32/adm5120/obio.c#2 delete
.. //depot/projects/dtrace/src/sys/mips/mips32/adm5120/obiovar.h#2 delete
.. //depot/projects/dtrace/src/sys/mips/mips32/adm5120/std.adm5120#2 delete
.. //depot/projects/dtrace/src/sys/mips/mips32/adm5120/uart_bus_adm5120.c#2 delete
.. //depot/projects/dtrace/src/sys/mips/mips32/adm5120/uart_cpu_adm5120.c#2 delete
.. //depot/projects/dtrace/src/sys/mips/mips32/adm5120/uart_dev_adm5120.c#2 delete
.. //depot/projects/dtrace/src/sys/mips/mips32/adm5120/uart_dev_adm5120.h#2 delete
.. //depot/projects/dtrace/src/sys/mips/mips32/idt/files.idt#2 delete
.. //depot/projects/dtrace/src/sys/mips/mips32/idt/idt_machdep.c#2 delete
.. //depot/projects/dtrace/src/sys/mips/mips32/idt/idtpci.c#2 delete
.. //depot/projects/dtrace/src/sys/mips/mips32/idt/idtreg.h#2 delete
.. //depot/projects/dtrace/src/sys/mips/mips32/idt/if_kr.c#2 delete
.. //depot/projects/dtrace/src/sys/mips/mips32/idt/if_krreg.h#2 delete
.. //depot/projects/dtrace/src/sys/mips/mips32/idt/obio.c#2 delete
.. //depot/projects/dtrace/src/sys/mips/mips32/idt/obiovar.h#2 delete
.. //depot/projects/dtrace/src/sys/mips/mips32/idt/std.idt#2 delete
.. //depot/projects/dtrace/src/sys/mips/mips32/idt/uart_bus_rc32434.c#2 delete
.. //depot/projects/dtrace/src/sys/mips/mips32/idt/uart_cpu_rc32434.c#2 delete
.. //depot/projects/dtrace/src/sys/mips/mips32/malta/files.malta#2 delete
.. //depot/projects/dtrace/src/sys/mips/mips32/malta/gt.c#2 delete
.. //depot/projects/dtrace/src/sys/mips/mips32/malta/gt_pci.c#2 delete
.. //depot/projects/dtrace/src/sys/mips/mips32/malta/gtreg.h#2 delete
.. //depot/projects/dtrace/src/sys/mips/mips32/malta/gtvar.h#2 delete
.. //depot/projects/dtrace/src/sys/mips/mips32/malta/malta_machdep.c#2 delete
.. //depot/projects/dtrace/src/sys/mips/mips32/malta/maltareg.h#2 delete
.. //depot/projects/dtrace/src/sys/mips/mips32/malta/obio.c#2 delete
.. //depot/projects/dtrace/src/sys/mips/mips32/malta/obiovar.h#2 delete
.. //depot/projects/dtrace/src/sys/mips/mips32/malta/std.malta#2 delete
.. //depot/projects/dtrace/src/sys/mips/mips32/malta/uart_bus_maltausart.c#2 delete
.. //depot/projects/dtrace/src/sys/mips/mips32/malta/uart_cpu_maltausart.c#2 delete
.. //depot/projects/dtrace/src/sys/mips/mips32/malta/yamon.c#2 delete
.. //depot/projects/dtrace/src/sys/mips/mips32/malta/yamon.h#2 delete
.. //depot/projects/dtrace/src/sys/mips/mips32/sentry5/files.sentry5#2 delete
.. //depot/projects/dtrace/src/sys/mips/mips32/sentry5/obio.c#2 delete
.. //depot/projects/dtrace/src/sys/mips/mips32/sentry5/obiovar.h#2 delete
.. //depot/projects/dtrace/src/sys/mips/mips32/sentry5/s5_machdep.c#2 delete
.. //depot/projects/dtrace/src/sys/mips/mips32/sentry5/s5reg.h#2 delete
.. //depot/projects/dtrace/src/sys/mips/mips32/sentry5/siba_cc.c#2 delete
.. //depot/projects/dtrace/src/sys/mips/mips32/sentry5/siba_mips.c#2 delete
.. //depot/projects/dtrace/src/sys/mips/mips32/sentry5/siba_sdram.c#2 delete
.. //depot/projects/dtrace/src/sys/mips/mips32/sentry5/uart_bus_sbusart.c#2 delete
.. //depot/projects/dtrace/src/sys/mips/mips32/sentry5/uart_cpu_sbusart.c#2 delete
.. //depot/projects/dtrace/src/sys/mips/sentry5/files.sentry5#1 branch
.. //depot/projects/dtrace/src/sys/mips/sentry5/obio.c#1 branch
.. //depot/projects/dtrace/src/sys/mips/sentry5/obiovar.h#1 branch
.. //depot/projects/dtrace/src/sys/mips/sentry5/s5_machdep.c#1 branch
.. //depot/projects/dtrace/src/sys/mips/sentry5/s5reg.h#1 branch
.. //depot/projects/dtrace/src/sys/mips/sentry5/siba_cc.c#1 branch
.. //depot/projects/dtrace/src/sys/mips/sentry5/siba_mips.c#1 branch
.. //depot/projects/dtrace/src/sys/mips/sentry5/siba_sdram.c#1 branch
.. //depot/projects/dtrace/src/sys/mips/sentry5/uart_bus_sbusart.c#1 branch
.. //depot/projects/dtrace/src/sys/mips/sentry5/uart_cpu_sbusart.c#1 branch
.. //depot/projects/dtrace/src/sys/modules/Makefile#51 integrate
.. //depot/projects/dtrace/src/sys/modules/arl/Makefile#4 delete
.. //depot/projects/dtrace/src/sys/modules/cnw/Makefile#2 delete
.. //depot/projects/dtrace/src/sys/modules/oltr/Makefile#4 delete
.. //depot/projects/dtrace/src/sys/modules/sbni/Makefile#4 delete
.. //depot/projects/dtrace/src/sys/modules/sbsh/Makefile#4 delete
.. //depot/projects/dtrace/src/sys/net/bpf.c#23 integrate
.. //depot/projects/dtrace/src/sys/net/bpf.h#11 integrate
.. //depot/projects/dtrace/src/sys/net/bpf_zerocopy.c#4 integrate
.. //depot/projects/dtrace/src/sys/net/bpf_zerocopy.h#3 integrate
.. //depot/projects/dtrace/src/sys/net/if_lagg.c#10 integrate
.. //depot/projects/dtrace/src/sys/net/if_vlan.c#15 integrate
.. //depot/projects/dtrace/src/sys/net/raw_cb.c#5 integrate
.. //depot/projects/dtrace/src/sys/net/raw_cb.h#4 integrate
.. //depot/projects/dtrace/src/sys/net/raw_usrreq.c#7 integrate
.. //depot/projects/dtrace/src/sys/net/rtsock.c#13 integrate
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_ht.c#8 integrate
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_output.c#15 integrate
.. //depot/projects/dtrace/src/sys/netgraph/bluetooth/common/ng_bluetooth.c#5 integrate
.. //depot/projects/dtrace/src/sys/netgraph/bluetooth/drivers/ubt/TODO#4 integrate
.. //depot/projects/dtrace/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#6 integrate
.. //depot/projects/dtrace/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h#5 integrate
.. //depot/projects/dtrace/src/sys/netgraph/bluetooth/include/ng_bluetooth.h#5 integrate
.. //depot/projects/dtrace/src/sys/netgraph/bluetooth/include/ng_btsocket.h#5 integrate
.. //depot/projects/dtrace/src/sys/netgraph/ng_iface.c#5 integrate
.. //depot/projects/dtrace/src/sys/netgraph/ng_ip_input.c#4 integrate
.. //depot/projects/dtrace/src/sys/netinet/in_pcb.c#23 integrate
.. //depot/projects/dtrace/src/sys/netinet/in_pcb.h#11 integrate
.. //depot/projects/dtrace/src/sys/netinet/ip_carp.c#13 integrate
.. //depot/projects/dtrace/src/sys/netinet/ip_gre.c#8 integrate
.. //depot/projects/dtrace/src/sys/netinet/raw_ip.c#18 integrate
.. //depot/projects/dtrace/src/sys/netinet/sctp_asconf.c#9 integrate
.. //depot/projects/dtrace/src/sys/netinet/sctp_asconf.h#5 integrate
.. //depot/projects/dtrace/src/sys/netinet/sctp_bsd_addr.c#10 integrate
.. //depot/projects/dtrace/src/sys/netinet/sctp_bsd_addr.h#6 integrate
.. //depot/projects/dtrace/src/sys/netinet/sctp_cc_functions.h#2 integrate
.. //depot/projects/dtrace/src/sys/netinet/sctp_constants.h#10 integrate
.. //depot/projects/dtrace/src/sys/netinet/sctp_crc32.h#4 integrate
.. //depot/projects/dtrace/src/sys/netinet/sctp_indata.c#14 integrate
.. //depot/projects/dtrace/src/sys/netinet/sctp_indata.h#4 integrate
.. //depot/projects/dtrace/src/sys/netinet/sctp_input.c#15 integrate
.. //depot/projects/dtrace/src/sys/netinet/sctp_input.h#5 integrate
.. //depot/projects/dtrace/src/sys/netinet/sctp_os_bsd.h#7 integrate
.. //depot/projects/dtrace/src/sys/netinet/sctp_output.c#18 integrate
.. //depot/projects/dtrace/src/sys/netinet/sctp_output.h#6 integrate
.. //depot/projects/dtrace/src/sys/netinet/sctp_pcb.c#18 integrate
.. //depot/projects/dtrace/src/sys/netinet/sctp_pcb.h#8 integrate
.. //depot/projects/dtrace/src/sys/netinet/sctp_sysctl.h#4 integrate
.. //depot/projects/dtrace/src/sys/netinet/sctp_timer.c#10 integrate
.. //depot/projects/dtrace/src/sys/netinet/sctp_timer.h#4 integrate
.. //depot/projects/dtrace/src/sys/netinet/sctp_uio.h#9 integrate
.. //depot/projects/dtrace/src/sys/netinet/sctp_usrreq.c#17 integrate
.. //depot/projects/dtrace/src/sys/netinet/sctp_var.h#10 integrate
.. //depot/projects/dtrace/src/sys/netinet/sctputil.c#21 integrate
.. //depot/projects/dtrace/src/sys/netinet/sctputil.h#9 integrate
.. //depot/projects/dtrace/src/sys/netinet/tcp_output.c#15 integrate
.. //depot/projects/dtrace/src/sys/netinet/udp_usrreq.c#20 integrate
.. //depot/projects/dtrace/src/sys/netinet6/icmp6.c#14 integrate
.. //depot/projects/dtrace/src/sys/netinet6/in6.c#16 integrate
.. //depot/projects/dtrace/src/sys/netinet6/in6_ifattach.c#12 integrate
.. //depot/projects/dtrace/src/sys/netinet6/in6_pcb.c#16 integrate
.. //depot/projects/dtrace/src/sys/netinet6/in6_pcb.h#7 integrate
.. //depot/projects/dtrace/src/sys/netinet6/in6_src.c#14 integrate
.. //depot/projects/dtrace/src/sys/netinet6/ip6_var.h#8 integrate
.. //depot/projects/dtrace/src/sys/netinet6/raw_ip6.c#12 integrate
.. //depot/projects/dtrace/src/sys/netinet6/sctp6_usrreq.c#11 integrate
.. //depot/projects/dtrace/src/sys/netinet6/sctp6_var.h#5 integrate
.. //depot/projects/dtrace/src/sys/netinet6/udp6_usrreq.c#19 integrate
.. //depot/projects/dtrace/src/sys/netipsec/keysock.c#9 integrate
.. //depot/projects/dtrace/src/sys/nfsclient/bootp_subr.c#9 integrate
.. //depot/projects/dtrace/src/sys/nfsclient/nfs_vfsops.c#22 integrate
.. //depot/projects/dtrace/src/sys/nlm/nlm_advlock.c#2 integrate
.. //depot/projects/dtrace/src/sys/pc98/conf/GENERIC#20 integrate
.. //depot/projects/dtrace/src/sys/pc98/conf/NOTES#13 integrate
.. //depot/projects/dtrace/src/sys/pc98/include/bus.h#4 integrate
.. //depot/projects/dtrace/src/sys/pc98/pc98/busiosubr.c#4 integrate
.. //depot/projects/dtrace/src/sys/pci/if_rlreg.h#17 integrate
.. //depot/projects/dtrace/src/sys/powerpc/conf/GENERIC#19 integrate
.. //depot/projects/dtrace/src/sys/rpc/authunix_prot.c#4 integrate
.. //depot/projects/dtrace/src/sys/sparc64/conf/GENERIC#24 integrate
.. //depot/projects/dtrace/src/sys/sparc64/include/in_cksum.h#5 integrate
.. //depot/projects/dtrace/src/sys/sparc64/sparc64/in_cksum.c#4 integrate
.. //depot/projects/dtrace/src/sys/sun4v/conf/GENERIC#22 integrate
.. //depot/projects/dtrace/src/sys/sys/event.h#6 integrate
.. //depot/projects/dtrace/src/sys/sys/eventhandler.h#11 integrate
.. //depot/projects/dtrace/src/sys/sys/imgact.h#6 integrate
.. //depot/projects/dtrace/src/sys/sys/ioctl_compat.h#6 integrate
.. //depot/projects/dtrace/src/sys/sys/kernel.h#22 integrate
.. //depot/projects/dtrace/src/sys/sys/libkern.h#8 integrate
.. //depot/projects/dtrace/src/sys/sys/link_elf.h#5 integrate
.. //depot/projects/dtrace/src/sys/sys/termios.h#5 integrate
.. //depot/projects/dtrace/src/sys/sys/ttycom.h#6 integrate
.. //depot/projects/dtrace/src/sys/vm/swap_pager.c#20 integrate
.. //depot/projects/dtrace/src/sys/vm/vm_kern.h#5 integrate
.. //depot/projects/dtrace/src/tools/tools/mctest/Makefile#2 integrate
.. //depot/projects/dtrace/src/tools/tools/mctest/mcgrab.1#1 branch
.. //depot/projects/dtrace/src/tools/tools/mctest/mcgrab.cc#1 branch
.. //depot/projects/dtrace/src/usr.bin/calendar/calendars/calendar.freebsd#26 integrate
.. //depot/projects/dtrace/src/usr.bin/cmp/regular.c#4 integrate
.. //depot/projects/dtrace/src/usr.bin/cpio/Makefile#3 integrate
.. //depot/projects/dtrace/src/usr.bin/cpio/config_freebsd.h#2 integrate
.. //depot/projects/dtrace/src/usr.bin/cpio/cpio.c#4 integrate
.. //depot/projects/dtrace/src/usr.bin/tar/Makefile#9 integrate
.. //depot/projects/dtrace/src/usr.bin/tar/bsdtar.h#11 integrate
.. //depot/projects/dtrace/src/usr.bin/tar/config_freebsd.h#5 integrate
.. //depot/projects/dtrace/src/usr.bin/tar/read.c#11 integrate
.. //depot/projects/dtrace/src/usr.bin/tar/write.c#15 integrate
.. //depot/projects/dtrace/src/usr.sbin/Makefile#28 integrate
.. //depot/projects/dtrace/src/usr.sbin/arlcontrol/Makefile#4 delete
.. //depot/projects/dtrace/src/usr.sbin/arlcontrol/arlcontrol.8#4 delete
.. //depot/projects/dtrace/src/usr.sbin/arlcontrol/arlcontrol.c#4 delete
.. //depot/projects/dtrace/src/usr.sbin/cdcontrol/cdcontrol.1#4 integrate
.. //depot/projects/dtrace/src/usr.sbin/cdcontrol/cdcontrol.c#5 integrate
.. //depot/projects/dtrace/src/usr.sbin/extattr/rmextattr.c#4 integrate
.. //depot/projects/dtrace/src/usr.sbin/pkg_install/create/main.c#10 integrate
.. //depot/projects/dtrace/src/usr.sbin/pkg_install/lib/lib.h#13 integrate
.. //depot/projects/dtrace/src/usr.sbin/pstat/pstat.c#6 integrate
.. //depot/projects/dtrace/src/usr.sbin/pw/pwupd.c#4 integrate
.. //depot/projects/dtrace/src/usr.sbin/sysinstall/package.c#4 integrate
.. //depot/projects/dtrace/src/usr.sbin/syslogd/syslog.conf.5#7 integrate
.. //depot/projects/dtrace/src/usr.sbin/syslogd/syslogd.c#10 integrate
.. //depot/projects/dtrace/www/de/community/irc.sgml#5 integrate
.. //depot/projects/dtrace/www/de/developers.sgml#14 integrate
.. //depot/projects/dtrace/www/de/index.xsl#16 integrate
.. //depot/projects/dtrace/www/de/share/sgml/libcommon.xsl#7 integrate
.. //depot/projects/dtrace/www/de/share/sgml/navibar.l10n.ent#10 integrate
.. //depot/projects/dtrace/www/de/share/sgml/news.xml#25 integrate
.. //depot/projects/dtrace/www/de/share/sgml/press.xml#18 integrate
.. //depot/projects/dtrace/www/de/support/bugreports.sgml#6 integrate
.. //depot/projects/dtrace/www/en/developers.sgml#40 integrate
.. //depot/projects/dtrace/www/en/docproj/current.sgml#5 integrate
.. //depot/projects/dtrace/www/en/donations/donors.sgml#32 integrate
.. //depot/projects/dtrace/www/en/gnome/docs/develfaq.sgml#11 integrate
.. //depot/projects/dtrace/www/en/gnome/docs/halfaq.sgml#3 integrate
.. //depot/projects/dtrace/www/en/gnome/index.xsl#13 integrate
.. //depot/projects/dtrace/www/share/sgml/advisories.xml#19 integrate
.. //depot/projects/dtrace/www/share/sgml/commercial.consult.xml#15 integrate
.. //depot/projects/dtrace/www/share/sgml/news.xml#55 integrate
.. //depot/projects/dtrace/www/share/sgml/press.xml#24 integrate
Differences ...
==== //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/tools/checkupdate/checkupdate.1#3 (text+ko) ====
@@ -22,9 +22,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: doc/el_GR.ISO8859-7/share/tools/checkupdate/checkupdate.1,v 1.3 2008/06/16 21:53:10 keramida Exp $
+.\" $FreeBSD: doc/el_GR.ISO8859-7/share/tools/checkupdate/checkupdate.1,v 1.4 2008/07/09 19:53:54 pgj Exp $
.\"
-.Dd June 15, 2008
+.Dd July 9, 2008
.Dt CHECKUPDATE 1
.Os
.Sh NAME
@@ -32,7 +32,7 @@
.Nd "check a translation of the FreeBSD doc/ tree for source updates"
.Sh SYNOPSIS
.Nm
-.Op Fl aenpqtv
+.Op Fl acenpPqtv
.Op Fl R Ar workspace
.Sh DESCRIPTION
The
@@ -54,6 +54,12 @@
.Bl -tag -width ".Fl f Ar flist"
.It Fl a
Enable all file checks for each input file.
+.It Fl c
+Generate compact report primarily suitable for commit logs. It will
+only contain revision difference information and names of the affected
+files. This will automatically disable
+.Dq patch preview
+mode.
.It Fl e
Report everything.
File revision information is displayed for all the files of our input
@@ -67,6 +73,11 @@
Whenever a difference is found in the revisions of the original
translated file and the current English revision, show a patch of the
untranslated changes.
+.It Fl P
+Do not be so
+.Dq picky
+and show all the information even if files do not contain tags. It is
+disabled by default and it is not recommended to use.
.It Fl q
Run in
.Dq quiet
==== //depot/projects/dtrace/doc/el_GR.ISO8859-7/share/tools/checkupdate/checkupdate.py#3 (text+ko) ====
@@ -25,7 +25,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: doc/el_GR.ISO8859-7/share/tools/checkupdate/checkupdate.py,v 1.5 2008/06/16 21:53:10 keramida Exp $
+# $FreeBSD: doc/el_GR.ISO8859-7/share/tools/checkupdate/checkupdate.py,v 1.6 2008/07/09 19:53:54 pgj Exp $
"""
The translation helper utility `checkupdate'.
@@ -57,6 +57,7 @@
import os
import re
import sys
+import subprocess
# Alias some functions from other modules, to shorter, easier to use names.
exit = sys.exit
@@ -68,11 +69,13 @@
allchecks = None # All the file check functions we support.
checks = None # No checks are done by default.
-patchmode = False # Snow patches that need translation.
+patchmode = False # Show patches that need translation.
root = "." # The default workspace directory.
verbose = None # Run in `quiet' mode by default.
everything = False # Report everything, i.e. all input files.
tuplemode = False # Use the standard output mode
+compactmode = False # Generate compact stdout suitable for commit logs.
+pickymode = True # Skip files without '%SRCID%' and '%SOURCE%' (default).
# -------------------- useful functions --------------------------------
@@ -259,18 +262,64 @@
def reportfile(fname, frev, srcfile, srcexists, srcid, srcrev):
"""Report that an update is needed for a translated file."""
- text = "%s%s" % (fname, frev and " rev. " + str(frev) or "")
+ if not compactmode:
+ text = "%s%s" % (fname, frev and " rev. " + str(frev) or "")
revtext = "%-10s -> %-10s" % (srcid or "NO-%SRCID%", srcrev or "NONE")
- if srcfile and not srcexists:
- filetext = "%s (MISSING)" % srcfile
- elif srcfile:
- filetext = "%s" % srcfile
+ if not compactmode:
+ if srcfile and not srcexists:
+ filetext = "%s (MISSING)" % srcfile
+ elif srcfile:
+ filetext = "%s" % srcfile
+ else:
+ filetext = "NO-%SOURCE%"
+
+ if compactmode:
+ print "%s %s" % (revtext, fname)
else:
- filetext = "NO-%SOURCE%"
+ print "%s" % text
+ print " %s %s" % (revtext, filetext)
+ print ""
+
+def showdiff(fname, frev, srcfile, srcexists, srcid, srcrev):
+ """Show differences in the original file."""
+
+ if not (srcfile and srcexists and srcid and srcrev):
+ # Raise an exception?
+ print " No patch could be retrieved."
+ print ""
+ return None
+
+ cvsdiff = ["cvs", "-R", "diff", "-u",
+ "-r%s" % srcid, "-r%s" % srcrev, "%s" % srcfile]
+
+ svndiff = ["svn", "diff",
+ "-r", "%s:%s" % (srcid, srcrev), "%s" % srcfile]
+
+ diffargs = None
+ if os.path.isdir(root + "/CVS"):
+ diffargs = cvsdiff
+ elif os.path.isdir(root + "/.svn"):
+ diffargs = svndiff
+
+ if not diffargs:
+ print " Not a Subversion or CVS checkout."
+ print ""
+ return None
+
+ diffcmd = ""
+
+ for arg in diffargs:
+ diffcmd += (arg + " ")
+
+ print " Patch review for:"
+ print " %s" % diffcmd
+ print ""
+
+ output = subprocess.Popen(diffargs, stdout=subprocess.PIPE, cwd=root).communicate()[0]
- print "%s" % text
- print " %s %s" % (revtext, filetext)
+ print output
print ""
+ return True
def checkinfo(info):
"""Check the `info' tuple of file information. The tuple should
@@ -322,7 +371,16 @@
reportfile(fname, frev, srcfile, srcexists, srcid, srcrev)
return True
- # The same is one of srcid, srcrev is unavailable.
+ # There is no frev, srcid, srcrev so do not report (has no sense).
+ if (pickymode and not everything) and (not srcid and not srcrev and not frev):
+ return None
+
+ # There is no srcid, srcrev, may be the user does not want to track
+ # this file.
+ if (pickymode and not everything) and (not srcid and not srcrev):
+ return None
+
+ # If one of srcid, srcrev is unavailable, we report it.
if not srcid or not srcrev:
reportfile(fname, frev, srcfile, srcexists, srcid, srcrev)
return True
@@ -331,6 +389,8 @@
# have different values for these two.
if srcid != srcrev:
reportfile(fname, frev, srcfile, srcexists, srcid, srcrev)
+ if patchmode:
+ return showdiff(fname, frev, srcfile, srcexists, srcid, srcrev)
return True
return None
@@ -358,15 +418,11 @@
print info
else:
checkinfo(info)
- if patchmode:
- # XXX: Add `patchmode' handling here, to show the diffs of the
- # XXX: original English text.
- message("Patch preview mode not implemented for `%s'" % fname)
return retval
def usage():
"""Print a usage message, and exit."""
- print "usage: %s [-aenpqtv] [-R workspace]" % progname
+ print "usage: %s [-acenpPqtv] [-R workspace]" % progname
exit(1)
# -------------------- main script body --------------------------------
@@ -374,7 +430,7 @@
if __name__ == "__main__":
debug(3, "Parsing script options")
try:
- opts, args = getopt.getopt(sys.argv[1:], 'aenpqtR:v')
+ opts, args = getopt.getopt(sys.argv[1:], 'acenpPqtR:v')
except getopt.GetoptError, err:
usage()
@@ -384,6 +440,10 @@
if o == '-a':
debug(3, "Enabling all file checks")
checks = allchecks # All file checks enabled.
+ elif o == '-c':
+ debug(3, "Compact mode on")
+ compactmode = True # Generate compact report.
+ patchmode = False # No previews allowed.
elif o == '-e':
debug(3, "Reporting file revision info for everything")
everything = True
@@ -391,8 +451,14 @@
debug(3, "Disabling all file checks")
checks = None # No file checks enabled.
elif o == '-p':
- debug(3, "Enabling patch preview mode")
- patchmode = True
+ if not compactmode:
+ debug(3, "Enabling patch preview mode")
+ patchmode = True# Show diffs for files to be merged.
+ else:
+ debug(3, "No patch preview due to compact mode")
+ elif o == '-P':
+ debug(3, "Disabling picky mode")
+ pickymode = False # Picky mode: no check if no revision.
elif o == '-q':
debug(3, "Going into quiet mode.")
verbose = False # Quiet mode; no verbose messages.
==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#50 (text+ko) ====
@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml,v 1.233 2008/07/03 16:41:26 nwhitehorn Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml,v 1.234 2008/07/08 05:40:34 sson Exp $ -->
<!--
NOTE TO NEW COMMITTERS: Core and committers lists are sorted in
alphabetical order by last name. Please keep in mind that fact while
@@ -1266,6 +1266,10 @@
</listitem>
<listitem>
+ <para>&a.sson;</para>
+ </listitem>
+
+ <listitem>
<para>&a.ssouhlal;</para>
</listitem>
==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/portbuild/article.sgml#13 (text+ko) ====
@@ -11,7 +11,7 @@
<corpauthor>The &os; Ports Management Team</corpauthor>
</authorgroup>
- <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/portbuild/article.sgml,v 1.28 2008/06/11 12:15:30 pav Exp $</pubdate>
+ <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/portbuild/article.sgml,v 1.29 2008/07/04 13:03:22 pav Exp $</pubdate>
<copyright>
<year>2003</year>
@@ -1067,4 +1067,70 @@
should also be committed to
<filename>/usr/ports/CHANGES</filename>.</para>
</sect1>
+
+ <sect1 id="disk-failure">
+ <title>Procedures for dealing with disk failures</title>
+
+ <para>When a machine has a disk failure (e.g. panics due to read errors,
+ etc), then we should do the following steps:</para>
+
+ <itemizedlist>
+ <listitem><para>Note the time and failure mode (e.g. paste in the
+ relevant console output) in
+ <filename>/var/portbuild/<replaceable>${arch}</replaceable>/reboots</filename></para></listitem>
+
+ <listitem><para>For i386 gohan clients, scrub the disk by touching
+ <filename>/SCRUB</filename> in the nfsroot (e.g.
+ <filename>/a/nfs/8.dir1/SCRUB</filename>) and rebooting. This will
+ <command>dd if=/dev/zero of=/dev/ad0</command> and force the drive to
+ remap any bad sectors it finds, if it has enough spares left. This is
+ a temporary measure to extend the lifetime of a drive that is on the
+ way out.</para>
+
+ <note><para>For the i386 blade systems another signal of a failing
+ disk seems to be that the blade will completely hang and be
+ unresponsive to either console break, or even NMI.</para></note>
+
+ <para>For other build systems that don't newfs their disk at boot (e.g.
+ amd64 systems) this step has to be skipped.</para></listitem>
+
+ <listitem><para>If the problem recurs, then the disk is probably toast.
+ Take the machine out of <filename>mlist</filename> and (for ata disks)
+ run <command>smartctl</command> on the drive:</para>
+
+ <screen>smartctl -t long /dev/ad0</screen>
+
+ <para>It will take about 1/2 hour:</para>
+
+ <screen>gohan51# smartctl -t long /dev/ad0
+smartctl version 5.38 [i386-portbld-freebsd8.0] Copyright (C) 2002-8
+Bruce Allen
+Home page is http://smartmontools.sourceforge.net/
+
+=== START OF OFFLINE IMMEDIATE AND SELF-TEST SECTION ===
+Sending command: "Execute SMART Extended self-test routine immediately in off-line mode".
+Drive command "Execute SMART Extended self-test routine immediately in off-line mode" successful.
+Testing has begun.
+Please wait 31 minutes for test to complete.
+Test will complete after Fri Jul 4 03:59:56 2008
+
+Use smartctl -X to abort test.</screen>
+
+ <para>Then <command>smartctl -a /dev/ad0</command> shows the status
+ after it finishes:</para>
+
+ <screen># SMART Self-test log structure revision number 1
+# Num Test_Description Status Remaining
+LifeTime(hours) LBA_of_first_error
+# 1 Extended offline Completed: read failure 80% 15252 319286</screen>
+
+ <para>It will also display other data including a log of previous drive
+ errors. It is possible for the drive to show previous DMA errors
+ without failing the self-test though (because of sector
+ remapping).</para></listitem>
+ </itemizedlist>
+
+ <para>When a disk has failed, please inform &a.kris; so he can try to get it
+ replaced.</para>
+ </sect1>
</article>
==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/problem-reports/article.sgml#8 (text+ko) ====
@@ -7,7 +7,7 @@
<articleinfo>
<title>Writing &os; Problem Reports</title>
- <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/problem-reports/article.sgml,v 1.56 2008/05/28 00:36:07 gabor Exp $</pubdate>
+ <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/problem-reports/article.sgml,v 1.60 2008/07/13 14:37:24 remko Exp $</pubdate>
<legalnotice id="trademarks" role="trademarks">
&tm-attrib.freebsd;
@@ -202,7 +202,7 @@
only result in a developer advising you to upgrade to a
supported version to see if the problem still recurs. The
Security Officer team maintains the
- <ulink url="http://www.freebsd.org/security/">list of supported
+ <ulink url="&url.base;/security/">list of supported
versions</ulink>.</para>
<para>If the problem is in a port, note that you must first
@@ -342,7 +342,7 @@
<para><emphasis>If you have a patch, say so.</emphasis>
A PR with a patch included is much more likely to be
looked at than one without. If you are including one,
- put the string <literal>[patch]</literal> at the
+ put the string <literal>[patch]</literal> (including the brackets) at the
beginning of the <quote>Synopsis</quote>. (Although it is
not mandatory to use that exact string, by convention,
that is the one that is used.)</para>
@@ -352,7 +352,7 @@
<para><emphasis>If you are a maintainer, say so.</emphasis>
If you are maintaining a part of the source code (for
instance, a port), you might consider adding the string
- <literal>[maintainer update]</literal> at the beginning of
+ <literal>[maintainer update]</literal> (including the brackets) at the beginning of
your synopsis line, and you definitely should set the
<quote>Class</quote> of
your PR to <literal>maintainer-update</literal>. This way
@@ -521,16 +521,17 @@
you insert manual linebreaks somewhere around 70 characters,
so that the web display of the PR will be readable.</para>
- <para>Similar considerations apply if you are using the web-based
- PR submittal form instead of &man.send-pr.1;. Note that
+ <para>Similar considerations apply if you are using the
+ <ulink url="&url.base;/send-pr.html"> web-based
+ PR submission form</ulink> instead of &man.send-pr.1;. Note that
cut-and-paste operations can have their own side-effects on
text formatting. In certain cases it may be necessary to use
&man.uuencode.1; to ensure that patches arrive unmodified.</para>
<para>Finally, if your submission will be lengthy, you should
to prepare your work offline so that nothing will be lost in
- case there is a problem submitting it. This can be an especial
- problem with the web form.</para>
+ case there is a problem submitting it. This can especially be a
+ problem with the <ulink url="&url.base;/send-pr.html">web form</ulink>.</para>
</section>
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list