PERFORCE change 172451 for review

Peter Wemm peter at FreeBSD.org
Fri Jan 1 05:43:39 UTC 2010


http://p4web.freebsd.org/chv.cgi?CH=172451

Change 172451 by peter at peter_overcee on 2010/01/01 05:43:15

	IFC @172450

Affected files ...

.. //depot/projects/hammer/COPYRIGHT#9 integrate
.. //depot/projects/hammer/MAINTAINERS#54 integrate
.. //depot/projects/hammer/Makefile.inc1#150 integrate
.. //depot/projects/hammer/ObsoleteFiles.inc#74 integrate
.. //depot/projects/hammer/UPDATING#139 integrate
.. //depot/projects/hammer/bin/kenv/kenv.c#6 integrate
.. //depot/projects/hammer/bin/pax/ftree.c#6 integrate
.. //depot/projects/hammer/bin/pax/sel_subs.c#5 integrate
.. //depot/projects/hammer/bin/pkill/pkill.c#5 integrate
.. //depot/projects/hammer/bin/setfacl/merge.c#4 integrate
.. //depot/projects/hammer/bin/setfacl/remove.c#4 integrate
.. //depot/projects/hammer/bin/setfacl/setfacl.h#5 integrate
.. //depot/projects/hammer/bin/setfacl/util.c#3 integrate
.. //depot/projects/hammer/bin/sh/alias.c#9 integrate
.. //depot/projects/hammer/bin/sh/alias.h#3 integrate
.. //depot/projects/hammer/bin/sh/arith.h#6 integrate
.. //depot/projects/hammer/bin/sh/arith.y#8 integrate
.. //depot/projects/hammer/bin/sh/cd.c#7 integrate
.. //depot/projects/hammer/bin/sh/error.c#7 integrate
.. //depot/projects/hammer/bin/sh/error.h#5 integrate
.. //depot/projects/hammer/bin/sh/eval.c#25 integrate
.. //depot/projects/hammer/bin/sh/eval.h#6 integrate
.. //depot/projects/hammer/bin/sh/exec.c#16 integrate
.. //depot/projects/hammer/bin/sh/exec.h#7 integrate
.. //depot/projects/hammer/bin/sh/expand.c#18 integrate
.. //depot/projects/hammer/bin/sh/expand.h#4 integrate
.. //depot/projects/hammer/bin/sh/histedit.c#10 integrate
.. //depot/projects/hammer/bin/sh/input.c#8 integrate
.. //depot/projects/hammer/bin/sh/input.h#5 integrate
.. //depot/projects/hammer/bin/sh/jobs.c#17 integrate
.. //depot/projects/hammer/bin/sh/mail.c#4 integrate
.. //depot/projects/hammer/bin/sh/main.c#10 integrate
.. //depot/projects/hammer/bin/sh/main.h#3 integrate
.. //depot/projects/hammer/bin/sh/memalloc.c#7 integrate
.. //depot/projects/hammer/bin/sh/memalloc.h#5 integrate
.. //depot/projects/hammer/bin/sh/miscbltin.c#13 integrate
.. //depot/projects/hammer/bin/sh/mkbuiltins#8 integrate
.. //depot/projects/hammer/bin/sh/mkinit.c#5 integrate
.. //depot/projects/hammer/bin/sh/mksyntax.c#8 integrate
.. //depot/projects/hammer/bin/sh/myhistedit.h#3 integrate
.. //depot/projects/hammer/bin/sh/mystring.c#3 integrate
.. //depot/projects/hammer/bin/sh/options.c#9 integrate
.. //depot/projects/hammer/bin/sh/options.h#3 integrate
.. //depot/projects/hammer/bin/sh/output.c#8 integrate
.. //depot/projects/hammer/bin/sh/output.h#4 integrate
.. //depot/projects/hammer/bin/sh/parser.c#19 integrate
.. //depot/projects/hammer/bin/sh/parser.h#5 integrate
.. //depot/projects/hammer/bin/sh/sh.1#34 integrate
.. //depot/projects/hammer/bin/sh/show.c#7 integrate
.. //depot/projects/hammer/bin/sh/show.h#3 integrate
.. //depot/projects/hammer/bin/sh/trap.h#4 integrate
.. //depot/projects/hammer/bin/sh/var.c#18 integrate
.. //depot/projects/hammer/bin/sh/var.h#6 integrate
.. //depot/projects/hammer/cddl/contrib/opensolaris/cmd/zdb/zdb_il.c#3 integrate
.. //depot/projects/hammer/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c#3 integrate
.. //depot/projects/hammer/contrib/ntp/COPYRIGHT#5 integrate
.. //depot/projects/hammer/contrib/ntp/ChangeLog#5 integrate
.. //depot/projects/hammer/contrib/ntp/CommitLog#2 integrate
.. //depot/projects/hammer/contrib/ntp/Makefile.in#5 integrate
.. //depot/projects/hammer/contrib/ntp/NEWS#5 integrate
.. //depot/projects/hammer/contrib/ntp/README#4 integrate
.. //depot/projects/hammer/contrib/ntp/README.bk#4 integrate
.. //depot/projects/hammer/contrib/ntp/README.patches#3 integrate
.. //depot/projects/hammer/contrib/ntp/WHERE-TO-START#3 integrate
.. //depot/projects/hammer/contrib/ntp/aclocal.m4#5 integrate
.. //depot/projects/hammer/contrib/ntp/adjtimed/Makefile.in#5 integrate
.. //depot/projects/hammer/contrib/ntp/arlib/Makefile.in#3 integrate
.. //depot/projects/hammer/contrib/ntp/arlib/aclocal.m4#3 integrate
.. //depot/projects/hammer/contrib/ntp/arlib/configure#3 integrate
.. //depot/projects/hammer/contrib/ntp/build#4 integrate
.. //depot/projects/hammer/contrib/ntp/clockstuff/Makefile.in#5 integrate
.. //depot/projects/hammer/contrib/ntp/config.h.in#5 integrate
.. //depot/projects/hammer/contrib/ntp/configure#5 integrate
.. //depot/projects/hammer/contrib/ntp/configure.ac#2 integrate
.. //depot/projects/hammer/contrib/ntp/flock-build#5 integrate
.. //depot/projects/hammer/contrib/ntp/html/build/hints/solaris.xtra.4095849#1 branch
.. //depot/projects/hammer/contrib/ntp/html/copyright.html#3 integrate
.. //depot/projects/hammer/contrib/ntp/html/drivers/driver40.html#3 integrate
.. //depot/projects/hammer/contrib/ntp/include/Makefile.in#5 integrate
.. //depot/projects/hammer/contrib/ntp/include/copyright.def#2 integrate
.. //depot/projects/hammer/contrib/ntp/include/isc/Makefile.in#3 integrate
.. //depot/projects/hammer/contrib/ntp/include/ntp_debug.h#2 integrate
.. //depot/projects/hammer/contrib/ntp/include/version.def#2 integrate
.. //depot/projects/hammer/contrib/ntp/kernel/Makefile.in#5 integrate
.. //depot/projects/hammer/contrib/ntp/kernel/sys/Makefile.in#5 integrate
.. //depot/projects/hammer/contrib/ntp/libntp/Makefile.in#5 integrate
.. //depot/projects/hammer/contrib/ntp/libopts/Makefile.in#2 integrate
.. //depot/projects/hammer/contrib/ntp/libparse/Makefile.am#3 integrate
.. //depot/projects/hammer/contrib/ntp/libparse/Makefile.in#5 integrate
.. //depot/projects/hammer/contrib/ntp/libparse/clk_rawdcf.c#3 integrate
.. //depot/projects/hammer/contrib/ntp/ntpd/Makefile.in#5 integrate
.. //depot/projects/hammer/contrib/ntp/ntpd/cmd_args.c#4 integrate
.. //depot/projects/hammer/contrib/ntp/ntpd/ntp_crypto.c#7 integrate
.. //depot/projects/hammer/contrib/ntp/ntpd/ntp_intres.c#5 integrate
.. //depot/projects/hammer/contrib/ntp/ntpd/ntp_io.c#6 integrate
.. //depot/projects/hammer/contrib/ntp/ntpd/ntp_request.c#5 integrate
.. //depot/projects/hammer/contrib/ntp/ntpd/ntp_timer.c#5 integrate
.. //depot/projects/hammer/contrib/ntp/ntpd/ntpd-opts.c#2 integrate
.. //depot/projects/hammer/contrib/ntp/ntpd/ntpd-opts.h#2 integrate
.. //depot/projects/hammer/contrib/ntp/ntpd/ntpd-opts.texi#2 integrate
.. //depot/projects/hammer/contrib/ntp/ntpd/ntpd.1#2 integrate
.. //depot/projects/hammer/contrib/ntp/ntpd/ntpd.c#5 integrate
.. //depot/projects/hammer/contrib/ntp/ntpd/ntpdsim-opts.c#2 integrate
.. //depot/projects/hammer/contrib/ntp/ntpd/ntpdsim-opts.h#2 integrate
.. //depot/projects/hammer/contrib/ntp/ntpd/ntpdsim-opts.texi#2 integrate
.. //depot/projects/hammer/contrib/ntp/ntpd/ntpdsim.1#2 integrate
.. //depot/projects/hammer/contrib/ntp/ntpd/refclock_dumbclock.c#3 integrate
.. //depot/projects/hammer/contrib/ntp/ntpd/refclock_hopfser.c#4 integrate
.. //depot/projects/hammer/contrib/ntp/ntpd/refclock_jjy.c#4 integrate
.. //depot/projects/hammer/contrib/ntp/ntpd/refclock_nmea.c#4 integrate
.. //depot/projects/hammer/contrib/ntp/ntpd/refclock_palisade.c#5 integrate
.. //depot/projects/hammer/contrib/ntp/ntpdate/Makefile.in#5 integrate
.. //depot/projects/hammer/contrib/ntp/ntpdc/Makefile.in#5 integrate
.. //depot/projects/hammer/contrib/ntp/ntpdc/ntpdc-opts.c#2 integrate
.. //depot/projects/hammer/contrib/ntp/ntpdc/ntpdc-opts.h#2 integrate
.. //depot/projects/hammer/contrib/ntp/ntpdc/ntpdc-opts.texi#2 integrate
.. //depot/projects/hammer/contrib/ntp/ntpdc/ntpdc.1#2 integrate
.. //depot/projects/hammer/contrib/ntp/ntpq/Makefile.in#5 integrate
.. //depot/projects/hammer/contrib/ntp/ntpq/ntpq-opts.c#2 integrate
.. //depot/projects/hammer/contrib/ntp/ntpq/ntpq-opts.h#2 integrate
.. //depot/projects/hammer/contrib/ntp/ntpq/ntpq-opts.texi#2 integrate
.. //depot/projects/hammer/contrib/ntp/ntpq/ntpq.1#2 integrate
.. //depot/projects/hammer/contrib/ntp/ntpq/ntpq.c#6 integrate
.. //depot/projects/hammer/contrib/ntp/packageinfo.sh#2 integrate
.. //depot/projects/hammer/contrib/ntp/parseutil/Makefile.in#5 integrate
.. //depot/projects/hammer/contrib/ntp/scripts/Makefile.in#5 integrate
.. //depot/projects/hammer/contrib/ntp/sntp/Makefile.in#3 integrate
.. //depot/projects/hammer/contrib/ntp/sntp/aclocal.m4#3 integrate
.. //depot/projects/hammer/contrib/ntp/sntp/config.h.in#2 integrate
.. //depot/projects/hammer/contrib/ntp/sntp/configure#3 integrate
.. //depot/projects/hammer/contrib/ntp/sntp/configure.ac#3 integrate
.. //depot/projects/hammer/contrib/ntp/sntp/libopts/Makefile.in#2 integrate
.. //depot/projects/hammer/contrib/ntp/sntp/sntp-opts.c#2 integrate
.. //depot/projects/hammer/contrib/ntp/sntp/sntp-opts.def#2 integrate
.. //depot/projects/hammer/contrib/ntp/sntp/sntp-opts.h#2 integrate
.. //depot/projects/hammer/contrib/ntp/sntp/sntp-opts.texi#2 integrate
.. //depot/projects/hammer/contrib/ntp/sntp/sntp.1#2 integrate
.. //depot/projects/hammer/contrib/ntp/sntp/version.def#2 integrate
.. //depot/projects/hammer/contrib/ntp/util/Makefile.in#5 integrate
.. //depot/projects/hammer/contrib/ntp/util/ntp-keygen-opts.c#2 integrate
.. //depot/projects/hammer/contrib/ntp/util/ntp-keygen-opts.h#2 integrate
.. //depot/projects/hammer/contrib/ntp/util/ntp-keygen-opts.texi#2 integrate
.. //depot/projects/hammer/contrib/ntp/util/ntp-keygen.1#2 integrate
.. //depot/projects/hammer/contrib/ntp/version#4 integrate
.. //depot/projects/hammer/contrib/ntp/version.m4#2 integrate
.. //depot/projects/hammer/contrib/pf/man/pf.conf.5#14 integrate
.. //depot/projects/hammer/contrib/pf/pfctl/parse.y#8 integrate
.. //depot/projects/hammer/contrib/pf/pfctl/pf_print_state.c#5 integrate
.. //depot/projects/hammer/contrib/pf/pfctl/pfctl_parser.c#7 integrate
.. //depot/projects/hammer/contrib/telnet/telnetd/sys_term.c#4 integrate
.. //depot/projects/hammer/contrib/top/username.c#2 integrate
.. //depot/projects/hammer/etc/defaults/rc.conf#101 integrate
.. //depot/projects/hammer/etc/mtree/BIND.chroot.dist#4 integrate
.. //depot/projects/hammer/etc/mtree/BSD.usr.dist#48 integrate
.. //depot/projects/hammer/etc/namedb/named.conf#16 integrate
.. //depot/projects/hammer/etc/network.subr#33 integrate
.. //depot/projects/hammer/etc/rc.firewall#13 integrate
.. //depot/projects/hammer/etc/rc.subr#48 integrate
.. //depot/projects/hammer/games/fortune/strfile/strfile.c#9 integrate
.. //depot/projects/hammer/games/fortune/unstr/unstr.c#5 integrate
.. //depot/projects/hammer/games/number/number.c#5 integrate
.. //depot/projects/hammer/include/paths.h#10 integrate
.. //depot/projects/hammer/include/signal.h#11 integrate
.. //depot/projects/hammer/lib/libarchive/Makefile#56 integrate
.. //depot/projects/hammer/lib/libarchive/archive.h#21 integrate
.. //depot/projects/hammer/lib/libarchive/archive_check_magic.c#11 integrate
.. //depot/projects/hammer/lib/libarchive/archive_crc32.h#1 branch
.. //depot/projects/hammer/lib/libarchive/archive_endian.h#6 integrate
.. //depot/projects/hammer/lib/libarchive/archive_entry.c#41 integrate
.. //depot/projects/hammer/lib/libarchive/archive_entry.h#29 integrate
.. //depot/projects/hammer/lib/libarchive/archive_entry_link_resolver.c#5 integrate
.. //depot/projects/hammer/lib/libarchive/archive_entry_private.h#7 integrate
.. //depot/projects/hammer/lib/libarchive/archive_entry_stat.c#4 integrate
.. //depot/projects/hammer/lib/libarchive/archive_entry_xattr.c#1 branch
.. //depot/projects/hammer/lib/libarchive/archive_hash.h#1 branch
.. //depot/projects/hammer/lib/libarchive/archive_platform.h#26 integrate
.. //depot/projects/hammer/lib/libarchive/archive_private.h#29 integrate
.. //depot/projects/hammer/lib/libarchive/archive_read.c#30 integrate
.. //depot/projects/hammer/lib/libarchive/archive_read_disk_entry_from_file.c#3 integrate
.. //depot/projects/hammer/lib/libarchive/archive_read_disk_private.h#2 integrate
.. //depot/projects/hammer/lib/libarchive/archive_read_disk_set_standard_lookup.c#3 integrate
.. //depot/projects/hammer/lib/libarchive/archive_read_open_fd.c#11 integrate
.. //depot/projects/hammer/lib/libarchive/archive_read_open_file.c#14 integrate
.. //depot/projects/hammer/lib/libarchive/archive_read_open_filename.c#8 integrate
.. //depot/projects/hammer/lib/libarchive/archive_read_private.h#10 integrate
.. //depot/projects/hammer/lib/libarchive/archive_read_support_compression_all.c#10 integrate
.. //depot/projects/hammer/lib/libarchive/archive_read_support_compression_bzip2.c#20 integrate
.. //depot/projects/hammer/lib/libarchive/archive_read_support_compression_compress.c#14 integrate
.. //depot/projects/hammer/lib/libarchive/archive_read_support_compression_gzip.c#21 integrate
.. //depot/projects/hammer/lib/libarchive/archive_read_support_compression_program.c#10 integrate
.. //depot/projects/hammer/lib/libarchive/archive_read_support_compression_uu.c#1 branch
.. //depot/projects/hammer/lib/libarchive/archive_read_support_compression_xz.c#2 integrate
.. //depot/projects/hammer/lib/libarchive/archive_read_support_format_ar.c#12 integrate
.. //depot/projects/hammer/lib/libarchive/archive_read_support_format_cpio.c#28 integrate
.. //depot/projects/hammer/lib/libarchive/archive_read_support_format_iso9660.c#24 integrate
.. //depot/projects/hammer/lib/libarchive/archive_read_support_format_mtree.c#11 integrate
.. //depot/projects/hammer/lib/libarchive/archive_read_support_format_raw.c#2 integrate
.. //depot/projects/hammer/lib/libarchive/archive_read_support_format_tar.c#48 integrate
.. //depot/projects/hammer/lib/libarchive/archive_read_support_format_zip.c#24 integrate
.. //depot/projects/hammer/lib/libarchive/archive_string.c#18 integrate
.. //depot/projects/hammer/lib/libarchive/archive_string.h#16 integrate
.. //depot/projects/hammer/lib/libarchive/archive_util.3#9 integrate
.. //depot/projects/hammer/lib/libarchive/archive_util.c#20 integrate
.. //depot/projects/hammer/lib/libarchive/archive_virtual.c#3 integrate
.. //depot/projects/hammer/lib/libarchive/archive_write.3#19 integrate
.. //depot/projects/hammer/lib/libarchive/archive_write.c#22 integrate
.. //depot/projects/hammer/lib/libarchive/archive_write_disk.c#24 integrate
.. //depot/projects/hammer/lib/libarchive/archive_write_disk_private.h#2 integrate
.. //depot/projects/hammer/lib/libarchive/archive_write_disk_set_standard_lookup.c#5 integrate
.. //depot/projects/hammer/lib/libarchive/archive_write_open_fd.c#7 integrate
.. //depot/projects/hammer/lib/libarchive/archive_write_private.h#5 integrate
.. //depot/projects/hammer/lib/libarchive/archive_write_set_compression_bzip2.c#17 integrate
.. //depot/projects/hammer/lib/libarchive/archive_write_set_compression_compress.c#2 integrate
.. //depot/projects/hammer/lib/libarchive/archive_write_set_compression_gzip.c#20 integrate
.. //depot/projects/hammer/lib/libarchive/archive_write_set_compression_none.c#17 integrate
.. //depot/projects/hammer/lib/libarchive/archive_write_set_compression_program.c#6 integrate
.. //depot/projects/hammer/lib/libarchive/archive_write_set_compression_xz.c#2 integrate
.. //depot/projects/hammer/lib/libarchive/archive_write_set_format.c#7 integrate
.. //depot/projects/hammer/lib/libarchive/archive_write_set_format_ar.c#10 integrate
.. //depot/projects/hammer/lib/libarchive/archive_write_set_format_by_name.c#9 integrate
.. //depot/projects/hammer/lib/libarchive/archive_write_set_format_cpio.c#16 integrate
.. //depot/projects/hammer/lib/libarchive/archive_write_set_format_cpio_newc.c#6 integrate
.. //depot/projects/hammer/lib/libarchive/archive_write_set_format_mtree.c#4 integrate
.. //depot/projects/hammer/lib/libarchive/archive_write_set_format_pax.c#40 integrate
.. //depot/projects/hammer/lib/libarchive/archive_write_set_format_zip.c#1 branch
.. //depot/projects/hammer/lib/libarchive/config_freebsd.h#14 integrate
.. //depot/projects/hammer/lib/libarchive/filter_fork.h#2 integrate
.. //depot/projects/hammer/lib/libarchive/libarchive-formats.5#17 integrate
.. //depot/projects/hammer/lib/libarchive/tar.5#17 integrate
.. //depot/projects/hammer/lib/libarchive/test/Makefile#20 integrate
.. //depot/projects/hammer/lib/libarchive/test/main.c#19 integrate
.. //depot/projects/hammer/lib/libarchive/test/test.h#12 integrate
.. //depot/projects/hammer/lib/libarchive/test/test_acl_pax.c#9 integrate
.. //depot/projects/hammer/lib/libarchive/test/test_compat_bzip2.c#5 integrate
.. //depot/projects/hammer/lib/libarchive/test/test_compat_cpio.c#1 branch
.. //depot/projects/hammer/lib/libarchive/test/test_compat_cpio_1.cpio.uu#1 branch
.. //depot/projects/hammer/lib/libarchive/test/test_compat_lzma.c#1 branch
.. //depot/projects/hammer/lib/libarchive/test/test_compat_lzma_1.tlz.uu#1 branch
.. //depot/projects/hammer/lib/libarchive/test/test_compat_lzma_2.tlz.uu#1 branch
.. //depot/projects/hammer/lib/libarchive/test/test_compat_lzma_3.tlz.uu#1 branch
.. //depot/projects/hammer/lib/libarchive/test/test_compat_solaris_tar_acl.c#2 integrate
.. //depot/projects/hammer/lib/libarchive/test/test_entry.c#9 integrate
.. //depot/projects/hammer/lib/libarchive/test/test_entry_strmode.c#3 integrate
.. //depot/projects/hammer/lib/libarchive/test/test_extattr_freebsd.c#3 integrate
.. //depot/projects/hammer/lib/libarchive/test/test_fuzz.c#5 integrate
.. //depot/projects/hammer/lib/libarchive/test/test_fuzz_1.iso.Z.uu#1 branch
.. //depot/projects/hammer/lib/libarchive/test/test_fuzz_1.iso.uu#2 delete
.. //depot/projects/hammer/lib/libarchive/test/test_open_fd.c#2 integrate
.. //depot/projects/hammer/lib/libarchive/test/test_open_file.c#2 integrate
.. //depot/projects/hammer/lib/libarchive/test/test_pax_filename_encoding.c#7 integrate
.. //depot/projects/hammer/lib/libarchive/test/test_read_compress_program.c#7 integrate
.. //depot/projects/hammer/lib/libarchive/test/test_read_data_large.c#5 integrate
.. //depot/projects/hammer/lib/libarchive/test/test_read_disk.c#3 integrate
.. //depot/projects/hammer/lib/libarchive/test/test_read_disk_entry_from_file.c#2 integrate
.. //depot/projects/hammer/lib/libarchive/test/test_read_extract.c#9 integrate
.. //depot/projects/hammer/lib/libarchive/test/test_read_format_ar.ar.uu#1 branch
.. //depot/projects/hammer/lib/libarchive/test/test_read_format_ar.c#7 integrate
.. //depot/projects/hammer/lib/libarchive/test/test_read_format_cpio_bin_bz2.c#7 integrate
.. //depot/projects/hammer/lib/libarchive/test/test_read_format_cpio_bin_lzma.c#1 branch
.. //depot/projects/hammer/lib/libarchive/test/test_read_format_iso.iso.Z.uu#1 branch
.. //depot/projects/hammer/lib/libarchive/test/test_read_format_iso_gz.c#6 integrate
.. //depot/projects/hammer/lib/libarchive/test/test_read_format_iso_gz.iso.gz.uu#2 delete
.. //depot/projects/hammer/lib/libarchive/test/test_read_format_iso_joliet.iso.Z.uu#1 branch
.. //depot/projects/hammer/lib/libarchive/test/test_read_format_iso_joliet_long.iso.Z.uu#1 branch
.. //depot/projects/hammer/lib/libarchive/test/test_read_format_iso_joliet_rockridge.iso.Z.uu#1 branch
.. //depot/projects/hammer/lib/libarchive/test/test_read_format_iso_multi_extent.c#1 branch
.. //depot/projects/hammer/lib/libarchive/test/test_read_format_iso_multi_extent.iso.Z.uu#1 branch
.. //depot/projects/hammer/lib/libarchive/test/test_read_format_iso_rockridge.iso.Z.uu#1 branch
.. //depot/projects/hammer/lib/libarchive/test/test_read_format_iso_rockridge_ce.iso.Z.uu#1 branch
.. //depot/projects/hammer/lib/libarchive/test/test_read_format_iso_rockridge_new.iso.Z.uu#1 branch
.. //depot/projects/hammer/lib/libarchive/test/test_read_format_iso_rockridge_rr_moved.iso.Z.uu#1 branch
.. //depot/projects/hammer/lib/libarchive/test/test_read_format_iso_zisofs.iso.Z.uu#1 branch
.. //depot/projects/hammer/lib/libarchive/test/test_read_format_isojoliet_bz2.c#4 integrate
.. //depot/projects/hammer/lib/libarchive/test/test_read_format_isojoliet_bz2.iso.bz2.uu#2 delete
.. //depot/projects/hammer/lib/libarchive/test/test_read_format_isojoliet_long.c#1 branch
.. //depot/projects/hammer/lib/libarchive/test/test_read_format_isojoliet_rr.c#1 branch
.. //depot/projects/hammer/lib/libarchive/test/test_read_format_isojolietrr_bz2.iso.bz2.uu#2 delete
.. //depot/projects/hammer/lib/libarchive/test/test_read_format_isorr_bz2.c#9 integrate
.. //depot/projects/hammer/lib/libarchive/test/test_read_format_isorr_bz2.iso.bz2.uu#3 delete
.. //depot/projects/hammer/lib/libarchive/test/test_read_format_isorr_ce.c#1 branch
.. //depot/projects/hammer/lib/libarchive/test/test_read_format_isorr_new_bz2.c#1 branch
.. //depot/projects/hammer/lib/libarchive/test/test_read_format_isorr_rr_moved.c#1 branch
.. //depot/projects/hammer/lib/libarchive/test/test_read_format_isozisofs_bz2.c#1 branch
.. //depot/projects/hammer/lib/libarchive/test/test_read_format_mtree.c#6 integrate
.. //depot/projects/hammer/lib/libarchive/test/test_read_format_mtree.mtree.uu#1 branch
.. //depot/projects/hammer/lib/libarchive/test/test_read_format_pax_bz2.c#6 integrate
.. //depot/projects/hammer/lib/libarchive/test/test_read_format_tar.c#6 integrate
.. //depot/projects/hammer/lib/libarchive/test/test_read_format_tbz.c#6 integrate
.. //depot/projects/hammer/lib/libarchive/test/test_read_format_tlz.c#1 branch
.. //depot/projects/hammer/lib/libarchive/test/test_read_large.c#6 integrate
.. //depot/projects/hammer/lib/libarchive/test/test_read_uu.c#1 branch
.. //depot/projects/hammer/lib/libarchive/test/test_tar_large.c#6 integrate
.. //depot/projects/hammer/lib/libarchive/test/test_write_compress_program.c#7 integrate
.. //depot/projects/hammer/lib/libarchive/test/test_write_disk.c#12 integrate
.. //depot/projects/hammer/lib/libarchive/test/test_write_disk_failures.c#4 integrate
.. //depot/projects/hammer/lib/libarchive/test/test_write_disk_hardlink.c#6 integrate
.. //depot/projects/hammer/lib/libarchive/test/test_write_disk_perms.c#14 integrate
.. //depot/projects/hammer/lib/libarchive/test/test_write_disk_secure.c#8 integrate
.. //depot/projects/hammer/lib/libarchive/test/test_write_disk_sparse.c#3 integrate
.. //depot/projects/hammer/lib/libarchive/test/test_write_disk_symlink.c#1 branch
.. //depot/projects/hammer/lib/libarchive/test/test_write_disk_times.c#2 integrate
.. //depot/projects/hammer/lib/libarchive/test/test_write_format_cpio_empty.c#4 integrate
.. //depot/projects/hammer/lib/libarchive/test/test_write_format_cpio_newc.c#5 integrate
.. //depot/projects/hammer/lib/libarchive/test/test_write_format_cpio_odc.c#4 integrate
.. //depot/projects/hammer/lib/libarchive/test/test_write_format_tar_ustar.c#4 integrate
.. //depot/projects/hammer/lib/libarchive/test/test_write_format_zip.c#1 branch
.. //depot/projects/hammer/lib/libarchive/test/test_write_format_zip_empty.c#1 branch
.. //depot/projects/hammer/lib/libarchive/test/test_write_format_zip_no_compression.c#1 branch
.. //depot/projects/hammer/lib/libc/gen/sem.c#5 integrate
.. //depot/projects/hammer/lib/libc/gen/time.3#6 integrate
.. //depot/projects/hammer/lib/libc/gen/time.c#4 integrate
.. //depot/projects/hammer/lib/libc/posix1e/acl_delete_entry.c#4 integrate
.. //depot/projects/hammer/lib/libc/stdio/getline.3#3 integrate
.. //depot/projects/hammer/lib/libc/stdio/sprintf.c#5 integrate
.. //depot/projects/hammer/lib/libc/stdio/sscanf.c#5 integrate
.. //depot/projects/hammer/lib/libc/stdio/vsscanf.c#6 integrate
.. //depot/projects/hammer/lib/libc/stdtime/localtime.c#15 integrate
.. //depot/projects/hammer/lib/libc/stdtime/tzfile.5#3 integrate
.. //depot/projects/hammer/lib/libc/sys/clock_gettime.2#11 integrate
.. //depot/projects/hammer/lib/libc/sys/cpuset.2#4 integrate
.. //depot/projects/hammer/lib/libc/sys/kqueue.2#14 integrate
.. //depot/projects/hammer/lib/libexpat/libbsdxml.3#5 integrate
.. //depot/projects/hammer/lib/libgeom/geom_getxml.c#4 integrate
.. //depot/projects/hammer/lib/libgssapi/gss_mech_switch.c#5 integrate
.. //depot/projects/hammer/lib/libjail/jail.c#3 integrate
.. //depot/projects/hammer/lib/libnetgraph/debug.c#4 integrate
.. //depot/projects/hammer/lib/libpam/modules/pam_lastlog/pam_lastlog.c#10 integrate
.. //depot/projects/hammer/lib/libpmc/Makefile#8 integrate
.. //depot/projects/hammer/lib/libpmc/libpmc.c#17 integrate
.. //depot/projects/hammer/lib/libpmc/pmc.xscale.3#1 branch
.. //depot/projects/hammer/lib/librpcsec_gss/rpcsec_gss_conf.c#2 integrate
.. //depot/projects/hammer/lib/librpcsec_gss/svc_rpcsec_gss.c#4 integrate
.. //depot/projects/hammer/lib/libstand/bzipfs.c#5 integrate
.. //depot/projects/hammer/lib/libstand/gzipfs.c#5 integrate
.. //depot/projects/hammer/lib/libugidfw/ugidfw.c#12 integrate
.. //depot/projects/hammer/lib/libulog/ulog.h#2 integrate
.. //depot/projects/hammer/lib/libulog/ulog_getutxent.c#2 integrate
.. //depot/projects/hammer/lib/libulog/ulog_pututxline.c#2 integrate
.. //depot/projects/hammer/lib/libulog/ulog_setutxfile.3#2 integrate
.. //depot/projects/hammer/libexec/atrun/atrun.c#5 integrate
.. //depot/projects/hammer/libexec/rpc.rusersd/Makefile#2 integrate
.. //depot/projects/hammer/libexec/rpc.rusersd/rusers_proc.c#3 integrate
.. //depot/projects/hammer/libexec/rpc.rusersd/rusersd.c#3 integrate
.. //depot/projects/hammer/libexec/rtld-aout/shlib.c#4 integrate
.. //depot/projects/hammer/libexec/rtld-aout/support.c#4 integrate
.. //depot/projects/hammer/libexec/talkd/Makefile#2 integrate
.. //depot/projects/hammer/libexec/talkd/process.c#3 integrate
.. //depot/projects/hammer/release/Makefile#110 integrate
.. //depot/projects/hammer/release/picobsd/bridge/PICOBSD#10 integrate
.. //depot/projects/hammer/release/picobsd/build/mfs.mtree#2 integrate
.. //depot/projects/hammer/release/picobsd/build/picobsd#14 integrate
.. //depot/projects/hammer/release/picobsd/floppy.tree/etc/master.passwd#2 integrate
.. //depot/projects/hammer/release/picobsd/floppy.tree/sbin/dhclient-script#1 branch
.. //depot/projects/hammer/release/picobsd/qemu/PICOBSD#1 branch
.. //depot/projects/hammer/release/picobsd/qemu/PICOBSD.hints#1 branch
.. //depot/projects/hammer/release/picobsd/qemu/config#1 branch
.. //depot/projects/hammer/release/picobsd/qemu/crunch.conf#1 branch
.. //depot/projects/hammer/release/picobsd/qemu/floppy.tree.exclude#1 branch
.. //depot/projects/hammer/sbin/comcontrol/comcontrol.c#4 integrate
.. //depot/projects/hammer/sbin/dumpfs/dumpfs.c#16 integrate
.. //depot/projects/hammer/sbin/fsck_ffs/gjournal.c#3 integrate
.. //depot/projects/hammer/sbin/ggate/ggated/ggated.c#8 integrate
.. //depot/projects/hammer/sbin/ifconfig/regdomain.c#7 integrate
.. //depot/projects/hammer/sbin/ipfw/ipfw.8#75 integrate
.. //depot/projects/hammer/sbin/ipfw/ipfw2.c#73 integrate
.. //depot/projects/hammer/sbin/ipfw/ipfw2.h#4 integrate
.. //depot/projects/hammer/sbin/ldconfig/ldconfig.c#11 integrate
.. //depot/projects/hammer/sbin/mount/mntopts.h#11 integrate
.. //depot/projects/hammer/sbin/mount/mount.8#31 integrate
.. //depot/projects/hammer/sbin/mount/mount.c#37 integrate
.. //depot/projects/hammer/sbin/mount/vfslist.c#4 integrate
.. //depot/projects/hammer/sbin/mount_msdosfs/mount_msdosfs.c#16 integrate
.. //depot/projects/hammer/sbin/mount_nullfs/mount_nullfs.c#8 integrate
.. //depot/projects/hammer/sbin/natd/natd.c#15 integrate
.. //depot/projects/hammer/sbin/nfsiod/nfsiod.8#6 integrate
.. //depot/projects/hammer/sbin/nfsiod/nfsiod.c#6 integrate
.. //depot/projects/hammer/sbin/rcorder/ealloc.c#3 integrate
.. //depot/projects/hammer/sbin/rcorder/hash.c#3 integrate
.. //depot/projects/hammer/sbin/rcorder/rcorder.c#7 integrate
.. //depot/projects/hammer/sbin/reboot/reboot.c#12 integrate
.. //depot/projects/hammer/sbin/routed/if.c#10 integrate
.. //depot/projects/hammer/sbin/shutdown/shutdown.c#7 integrate
.. //depot/projects/hammer/sbin/tunefs/tunefs.8#14 integrate
.. //depot/projects/hammer/sbin/tunefs/tunefs.c#9 integrate
.. //depot/projects/hammer/sbin/umount/Makefile#4 integrate
.. //depot/projects/hammer/sbin/umount/umount.c#13 integrate
.. //depot/projects/hammer/secure/Makefile#8 integrate
.. //depot/projects/hammer/share/examples/Makefile#16 integrate
.. //depot/projects/hammer/share/examples/etc/make.conf#49 integrate
.. //depot/projects/hammer/share/examples/pppd/auth-down.sample#2 delete
.. //depot/projects/hammer/share/examples/pppd/auth-up.sample#2 delete
.. //depot/projects/hammer/share/examples/pppd/chap-secrets.sample#2 delete
.. //depot/projects/hammer/share/examples/pppd/chat.sh.sample#2 delete
.. //depot/projects/hammer/share/examples/pppd/ip-down.sample#2 delete
.. //depot/projects/hammer/share/examples/pppd/ip-up.sample#2 delete
.. //depot/projects/hammer/share/examples/pppd/options.sample#3 delete
.. //depot/projects/hammer/share/examples/pppd/pap-secrets.sample#2 delete
.. //depot/projects/hammer/share/examples/pppd/ppp.deny.sample#6 delete
.. //depot/projects/hammer/share/examples/pppd/ppp.shells.sample#2 delete
.. //depot/projects/hammer/share/examples/slattach/unit-command.sh#2 delete
.. //depot/projects/hammer/share/examples/sliplogin/slip.hosts#2 delete
.. //depot/projects/hammer/share/examples/sliplogin/slip.login#2 delete
.. //depot/projects/hammer/share/examples/sliplogin/slip.logout#2 delete
.. //depot/projects/hammer/share/examples/sliplogin/slip.slparms#2 delete
.. //depot/projects/hammer/share/examples/startslip/sldown.sh#2 delete
.. //depot/projects/hammer/share/examples/startslip/slip.sh#3 delete
.. //depot/projects/hammer/share/examples/startslip/slup.sh#2 delete
.. //depot/projects/hammer/share/man/man4/Makefile#125 integrate
.. //depot/projects/hammer/share/man/man4/gem.4#9 integrate
.. //depot/projects/hammer/share/man/man4/ifmib.4#7 integrate
.. //depot/projects/hammer/share/man/man4/mk48txx.4#1 branch
.. //depot/projects/hammer/share/man/man4/mwlfw.4#2 integrate
.. //depot/projects/hammer/share/man/man4/psm.4#12 integrate
.. //depot/projects/hammer/share/man/man4/ste.4#13 integrate
.. //depot/projects/hammer/share/man/man4/termios.4#9 integrate
.. //depot/projects/hammer/share/man/man4/tty.4#8 integrate
.. //depot/projects/hammer/share/man/man4/u3g.4#6 integrate
.. //depot/projects/hammer/share/man/man4/ucom.4#9 integrate
.. //depot/projects/hammer/share/man/man4/vge.4#8 integrate
.. //depot/projects/hammer/share/man/man4/watchdog.4#8 integrate
.. //depot/projects/hammer/share/man/man5/make.conf.5#51 integrate
.. //depot/projects/hammer/share/man/man5/rc.conf.5#101 integrate
.. //depot/projects/hammer/share/man/man7/build.7#21 integrate
.. //depot/projects/hammer/share/man/man9/LOCK_PROFILING.9#2 integrate
.. //depot/projects/hammer/share/man/man9/Makefile#99 integrate
.. //depot/projects/hammer/share/man/man9/usbdi.9#4 integrate
.. //depot/projects/hammer/share/misc/bsd-family-tree#53 integrate
.. //depot/projects/hammer/share/mk/bsd.sys.mk#21 integrate
.. //depot/projects/hammer/share/zoneinfo/asia#26 integrate
.. //depot/projects/hammer/share/zoneinfo/europe#19 integrate
.. //depot/projects/hammer/share/zoneinfo/zone.tab#21 integrate
.. //depot/projects/hammer/sys/amd64/amd64/mem.c#30 integrate
.. //depot/projects/hammer/sys/amd64/conf/DEFAULTS#15 integrate
.. //depot/projects/hammer/sys/amd64/conf/NOTES#125 integrate
.. //depot/projects/hammer/sys/arm/arm/mem.c#6 integrate
.. //depot/projects/hammer/sys/arm/conf/AVILA#22 integrate
.. //depot/projects/hammer/sys/arm/conf/CAMBRIA#8 integrate
.. //depot/projects/hammer/sys/arm/conf/DEFAULTS#3 integrate
.. //depot/projects/hammer/sys/arm/include/pmc_mdep.h#4 integrate
.. //depot/projects/hammer/sys/arm/xscale/ixp425/files.ixp425#9 integrate
.. //depot/projects/hammer/sys/boot/common/dev_net.c#8 integrate
.. //depot/projects/hammer/sys/boot/common/module.c#7 integrate
.. //depot/projects/hammer/sys/boot/i386/Makefile#10 integrate
.. //depot/projects/hammer/sys/boot/i386/libi386/biosdisk.c#21 integrate
.. //depot/projects/hammer/sys/boot/ofw/libofw/ofw_disk.c#9 integrate
.. //depot/projects/hammer/sys/boot/pc98/Makefile.inc#7 integrate
.. //depot/projects/hammer/sys/boot/pc98/boot2/Makefile#12 integrate
.. //depot/projects/hammer/sys/boot/pc98/boot2/asm.S#2 delete
.. //depot/projects/hammer/sys/boot/pc98/boot2/asm.h#3 delete
.. //depot/projects/hammer/sys/boot/pc98/boot2/bios.S#4 delete
.. //depot/projects/hammer/sys/boot/pc98/boot2/boot.c#12 delete
.. //depot/projects/hammer/sys/boot/pc98/boot2/boot.h#6 delete
.. //depot/projects/hammer/sys/boot/pc98/boot2/boot1.S#1 branch
.. //depot/projects/hammer/sys/boot/pc98/boot2/boot2.S#3 delete
.. //depot/projects/hammer/sys/boot/pc98/boot2/boot2.c#1 branch
.. //depot/projects/hammer/sys/boot/pc98/boot2/dinode.h#4 delete
.. //depot/projects/hammer/sys/boot/pc98/boot2/disk.c#9 delete
.. //depot/projects/hammer/sys/boot/pc98/boot2/fs.h#3 delete
.. //depot/projects/hammer/sys/boot/pc98/boot2/inode.h#5 delete
.. //depot/projects/hammer/sys/boot/pc98/boot2/io.c#8 delete
.. //depot/projects/hammer/sys/boot/pc98/boot2/probe_keyboard.c#3 delete
.. //depot/projects/hammer/sys/boot/pc98/boot2/quota.h#3 delete
.. //depot/projects/hammer/sys/boot/pc98/boot2/serial.S#2 delete
.. //depot/projects/hammer/sys/boot/pc98/boot2/serial_16550.S#6 delete
.. //depot/projects/hammer/sys/boot/pc98/boot2/serial_8251.S#5 delete
.. //depot/projects/hammer/sys/boot/pc98/boot2/start.S#2 delete
.. //depot/projects/hammer/sys/boot/pc98/boot2/sys.c#9 delete
.. //depot/projects/hammer/sys/boot/pc98/boot2/table.c#4 delete
.. //depot/projects/hammer/sys/boot/pc98/kgzldr/crt.s#5 integrate
.. //depot/projects/hammer/sys/boot/pc98/libpc98/Makefile#13 integrate
.. //depot/projects/hammer/sys/boot/pc98/libpc98/biosdisk.c#15 integrate
.. //depot/projects/hammer/sys/boot/pc98/libpc98/libpc98.h#1 branch
.. //depot/projects/hammer/sys/boot/pc98/libpc98/pc98_sys.c#1 branch
.. //depot/projects/hammer/sys/boot/pc98/loader/main.c#14 integrate
.. //depot/projects/hammer/sys/boot/sparc64/loader/main.c#21 integrate
.. //depot/projects/hammer/sys/boot/uboot/lib/glue.c#7 integrate
.. //depot/projects/hammer/sys/cam/ata/ata_all.c#5 integrate
.. //depot/projects/hammer/sys/cam/ata/ata_da.c#5 integrate
.. //depot/projects/hammer/sys/cam/scsi/scsi_cd.c#33 integrate
.. //depot/projects/hammer/sys/cddl/boot/zfs/zfsimpl.h#4 integrate
.. //depot/projects/hammer/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c#4 integrate
.. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#3 integrate
.. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#4 integrate
.. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c#4 integrate
.. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#4 integrate
.. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#4 integrate
.. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#3 integrate
.. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#7 integrate
.. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#10 integrate
.. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c#4 integrate
.. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h#3 integrate
.. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_proto.h#68 integrate
.. //depot/projects/hammer/sys/compat/linux/linux_signal.c#19 integrate
.. //depot/projects/hammer/sys/compat/x86bios/x86bios.c#2 integrate
.. //depot/projects/hammer/sys/conf/NOTES#167 integrate
.. //depot/projects/hammer/sys/conf/files#205 integrate
.. //depot/projects/hammer/sys/conf/files.arm#15 integrate
.. //depot/projects/hammer/sys/conf/files.ia64#48 integrate
.. //depot/projects/hammer/sys/conf/files.sun4v#12 integrate
.. //depot/projects/hammer/sys/conf/options.sparc64#14 integrate
.. //depot/projects/hammer/sys/contrib/dev/iwn/iwlwifi-1000-128.50.3.1.fw.uu#1 branch
.. //depot/projects/hammer/sys/contrib/dev/iwn/iwlwifi-4965-228.57.2.23.fw.uu#2 delete
.. //depot/projects/hammer/sys/contrib/dev/iwn/iwlwifi-4965-228.61.2.24.fw.uu#1 branch
.. //depot/projects/hammer/sys/contrib/dev/iwn/iwlwifi-5000-5.4.A.11.fw.uu#2 delete
.. //depot/projects/hammer/sys/contrib/dev/iwn/iwlwifi-5000-8.24.2.12.fw.uu#1 branch
.. //depot/projects/hammer/sys/contrib/dev/iwn/iwlwifi-6000-9.176.4.1.fw.uu#1 branch
.. //depot/projects/hammer/sys/contrib/pf/net/if_pfsync.c#29 integrate
.. //depot/projects/hammer/sys/contrib/pf/net/if_pfsync.h#8 integrate
.. //depot/projects/hammer/sys/contrib/pf/net/pf.c#46 integrate
.. //depot/projects/hammer/sys/contrib/pf/net/pfvar.h#17 integrate
.. //depot/projects/hammer/sys/dev/adlink/adlink.c#16 integrate
.. //depot/projects/hammer/sys/dev/ae/if_ae.c#7 integrate
.. //depot/projects/hammer/sys/dev/agp/agp.c#8 integrate
.. //depot/projects/hammer/sys/dev/agp/agp_via.c#5 integrate
.. //depot/projects/hammer/sys/dev/ahci/ahci.c#6 integrate
.. //depot/projects/hammer/sys/dev/aic7xxx/aicasm/Makefile#11 integrate
.. //depot/projects/hammer/sys/dev/aic7xxx/aicasm/aicasm.c#8 integrate
.. //depot/projects/hammer/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l#7 integrate
.. //depot/projects/hammer/sys/dev/aic7xxx/aicasm/aicasm_scan.l#7 integrate
.. //depot/projects/hammer/sys/dev/aic7xxx/aicasm/aicasm_symbol.c#8 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-pci.h#66 integrate
.. //depot/projects/hammer/sys/dev/ata/chipsets/ata-amd.c#4 integrate
.. //depot/projects/hammer/sys/dev/ata/chipsets/ata-intel.c#7 integrate
.. //depot/projects/hammer/sys/dev/ata/chipsets/ata-ite.c#4 integrate
.. //depot/projects/hammer/sys/dev/ata/chipsets/ata-promise.c#6 integrate
.. //depot/projects/hammer/sys/dev/ata/chipsets/ata-serverworks.c#6 integrate
.. //depot/projects/hammer/sys/dev/ata/chipsets/ata-via.c#7 integrate
.. //depot/projects/hammer/sys/dev/atkbdc/psm.c#20 integrate
.. //depot/projects/hammer/sys/dev/auxio/auxio.c#6 integrate
.. //depot/projects/hammer/sys/dev/bktr/bktr_os.c#24 integrate
.. //depot/projects/hammer/sys/dev/cardbus/cardbus_cis.c#25 integrate
.. //depot/projects/hammer/sys/dev/ciss/ciss.c#57 integrate
.. //depot/projects/hammer/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c#5 integrate
.. //depot/projects/hammer/sys/dev/dpms/dpms.c#4 integrate
.. //depot/projects/hammer/sys/dev/drm/drm_vm.c#7 integrate
.. //depot/projects/hammer/sys/dev/e1000/if_igb.c#11 integrate
.. //depot/projects/hammer/sys/dev/fb/creator.c#16 integrate
.. //depot/projects/hammer/sys/dev/fb/fb.c#11 integrate
.. //depot/projects/hammer/sys/dev/fb/fbreg.h#16 integrate
.. //depot/projects/hammer/sys/dev/fb/machfb.c#8 integrate
.. //depot/projects/hammer/sys/dev/fb/s3_pci.c#11 integrate
.. //depot/projects/hammer/sys/dev/fb/vesa.c#4 integrate
.. //depot/projects/hammer/sys/dev/fb/vga.c#27 integrate
.. //depot/projects/hammer/sys/dev/fb/vgareg.h#7 integrate
.. //depot/projects/hammer/sys/dev/firewire/fwdev.c#26 integrate
.. //depot/projects/hammer/sys/dev/firewire/fwmem.c#20 integrate
.. //depot/projects/hammer/sys/dev/hifn/hifn7751.c#22 integrate
.. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_arm.c#4 integrate
.. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_core.c#7 integrate
.. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_intel.c#8 integrate
.. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_mod.c#32 integrate
.. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_xscale.c#1 branch
.. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_xscale.h#1 branch
.. //depot/projects/hammer/sys/dev/hwpmc/pmc_events.h#9 integrate
.. //depot/projects/hammer/sys/dev/ichsmb/ichsmb_pci.c#15 integrate
.. //depot/projects/hammer/sys/dev/if_ndis/if_ndis_usb.c#11 integrate
.. //depot/projects/hammer/sys/dev/ipmi/ipmi.c#8 integrate
.. //depot/projects/hammer/sys/dev/ips/ips_pci.c#16 integrate
.. //depot/projects/hammer/sys/dev/isp/isp.c#31 integrate
.. //depot/projects/hammer/sys/dev/iwn/if_iwn.c#10 integrate
.. //depot/projects/hammer/sys/dev/iwn/if_iwnreg.h#3 integrate
.. //depot/projects/hammer/sys/dev/iwn/if_iwnvar.h#4 integrate
.. //depot/projects/hammer/sys/dev/jme/if_jme.c#9 integrate
.. //depot/projects/hammer/sys/dev/ksyms/ksyms.c#3 integrate
.. //depot/projects/hammer/sys/dev/led/led.c#18 integrate
.. //depot/projects/hammer/sys/dev/mc146818/mc146818.c#6 integrate
.. //depot/projects/hammer/sys/dev/mc146818/mc146818reg.h#4 integrate
.. //depot/projects/hammer/sys/dev/mc146818/mc146818var.h#5 integrate
.. //depot/projects/hammer/sys/dev/md/md.c#73 integrate
.. //depot/projects/hammer/sys/dev/mge/if_mge.c#7 integrate
.. //depot/projects/hammer/sys/dev/mii/ip1000phy.c#4 integrate
.. //depot/projects/hammer/sys/dev/mk48txx/mk48txx.c#8 integrate
.. //depot/projects/hammer/sys/dev/mk48txx/mk48txxreg.h#5 integrate
.. //depot/projects/hammer/sys/dev/mk48txx/mk48txxvar.h#3 integrate
.. //depot/projects/hammer/sys/dev/mpt/mpt_pci.c#26 integrate
.. //depot/projects/hammer/sys/dev/mxge/if_mxge.c#24 integrate
.. //depot/projects/hammer/sys/dev/pci/pci.c#78 integrate
.. //depot/projects/hammer/sys/dev/pci/pci_private.h#19 integrate
.. //depot/projects/hammer/sys/dev/siis/siis.c#5 integrate
.. //depot/projects/hammer/sys/dev/siis/siis.h#3 integrate
.. //depot/projects/hammer/sys/dev/sound/pcm/channel.c#29 integrate
.. //depot/projects/hammer/sys/dev/sound/pcm/dsp.c#39 integrate
.. //depot/projects/hammer/sys/dev/sound/pcm/sndstat.c#17 integrate
.. //depot/projects/hammer/sys/dev/sound/usb/uaudio.c#25 integrate
.. //depot/projects/hammer/sys/dev/ste/if_ste.c#5 integrate
.. //depot/projects/hammer/sys/dev/ste/if_stereg.h#3 integrate
.. //depot/projects/hammer/sys/dev/syscons/syscons.c#56 integrate
.. //depot/projects/hammer/sys/dev/tdfx/tdfx_pci.c#20 integrate
.. //depot/projects/hammer/sys/dev/twe/twe.c#17 integrate
.. //depot/projects/hammer/sys/dev/twe/twe_freebsd.c#20 integrate
.. //depot/projects/hammer/sys/dev/twe/twevar.h#9 integrate
.. //depot/projects/hammer/sys/dev/uart/uart_bus_acpi.c#6 integrate
.. //depot/projects/hammer/sys/dev/uart/uart_bus_ebus.c#11 integrate
.. //depot/projects/hammer/sys/dev/uart/uart_cpu_sparc64.c#20 integrate
.. //depot/projects/hammer/sys/dev/usb/controller/ehci_pci.c#8 integrate
.. //depot/projects/hammer/sys/dev/usb/controller/ohci_pci.c#7 integrate
.. //depot/projects/hammer/sys/dev/usb/net/if_aue.c#7 integrate
.. //depot/projects/hammer/sys/dev/usb/net/if_axe.c#8 integrate
.. //depot/projects/hammer/sys/dev/usb/net/if_cue.c#6 integrate
.. //depot/projects/hammer/sys/dev/usb/net/if_kue.c#6 integrate
.. //depot/projects/hammer/sys/dev/usb/quirk/usb_quirk.c#6 integrate
.. //depot/projects/hammer/sys/dev/usb/quirk/usb_quirk.h#4 integrate
.. //depot/projects/hammer/sys/dev/usb/serial/u3g.c#9 integrate
.. //depot/projects/hammer/sys/dev/usb/serial/uftdi.c#8 integrate
.. //depot/projects/hammer/sys/dev/usb/serial/uipaq.c#7 integrate
.. //depot/projects/hammer/sys/dev/usb/serial/uplcom.c#7 integrate
.. //depot/projects/hammer/sys/dev/usb/serial/uslcom.c#6 integrate
.. //depot/projects/hammer/sys/dev/usb/serial/uvisor.c#6 integrate
.. //depot/projects/hammer/sys/dev/usb/storage/umass.c#10 integrate
.. //depot/projects/hammer/sys/dev/usb/usb_device.c#10 integrate
.. //depot/projects/hammer/sys/dev/usb/usb_dynamic.c#5 integrate
.. //depot/projects/hammer/sys/dev/usb/usb_dynamic.h#5 integrate
.. //depot/projects/hammer/sys/dev/usb/usbdevs#125 integrate
.. //depot/projects/hammer/sys/dev/usb/usbdi.h#22 integrate
.. //depot/projects/hammer/sys/dev/usb/wlan/if_rum.c#7 integrate
.. //depot/projects/hammer/sys/dev/usb/wlan/if_ural.c#6 integrate
.. //depot/projects/hammer/sys/dev/vge/if_vge.c#26 integrate
.. //depot/projects/hammer/sys/dev/vge/if_vgereg.h#4 integrate
.. //depot/projects/hammer/sys/dev/vge/if_vgevar.h#5 integrate
.. //depot/projects/hammer/sys/dev/xen/blkfront/blkfront.c#9 integrate
.. //depot/projects/hammer/sys/fs/devfs/devfs_vnops.c#68 integrate
.. //depot/projects/hammer/sys/fs/nfs/nfs_commonacl.c#6 integrate
.. //depot/projects/hammer/sys/fs/nfs/nfs_var.h#4 integrate
.. //depot/projects/hammer/sys/fs/nfsclient/nfs.h#2 integrate
.. //depot/projects/hammer/sys/fs/nfsclient/nfs_clbio.c#5 integrate
.. //depot/projects/hammer/sys/fs/nfsclient/nfs_clrpcops.c#4 integrate
.. //depot/projects/hammer/sys/fs/nfsclient/nfs_clvnops.c#7 integrate
.. //depot/projects/hammer/sys/fs/nfsserver/nfs_nfsdport.c#6 integrate
.. //depot/projects/hammer/sys/fs/nfsserver/nfs_nfsdserv.c#4 integrate
.. //depot/projects/hammer/sys/geom/concat/g_concat.c#22 integrate
.. //depot/projects/hammer/sys/geom/gate/g_gate.c#16 integrate
.. //depot/projects/hammer/sys/geom/geom_dev.c#44 integrate
.. //depot/projects/hammer/sys/geom/geom_io.c#46 integrate
.. //depot/projects/hammer/sys/geom/mirror/g_mirror.c#39 integrate
.. //depot/projects/hammer/sys/geom/raid3/g_raid3.c#31 integrate
.. //depot/projects/hammer/sys/geom/raid3/g_raid3.h#15 integrate
.. //depot/projects/hammer/sys/geom/stripe/g_stripe.c#21 integrate
.. //depot/projects/hammer/sys/i386/conf/DEFAULTS#16 integrate
.. //depot/projects/hammer/sys/i386/conf/NOTES#118 integrate
.. //depot/projects/hammer/sys/i386/i386/elan-mmcr.c#24 integrate
.. //depot/projects/hammer/sys/i386/i386/mem.c#15 integrate
.. //depot/projects/hammer/sys/i386/xbox/xboxfb.c#6 integrate
.. //depot/projects/hammer/sys/ia64/conf/DEFAULTS#12 integrate
.. //depot/projects/hammer/sys/ia64/ia64/bus_machdep.c#1 branch
.. //depot/projects/hammer/sys/ia64/ia64/clock.c#17 integrate
.. //depot/projects/hammer/sys/ia64/ia64/machdep.c#78 integrate
.. //depot/projects/hammer/sys/ia64/ia64/mem.c#13 integrate
.. //depot/projects/hammer/sys/ia64/ia64/mp_machdep.c#30 integrate
.. //depot/projects/hammer/sys/ia64/ia64/nexus.c#17 integrate
.. //depot/projects/hammer/sys/ia64/ia64/sscdisk.c#15 integrate
.. //depot/projects/hammer/sys/ia64/ia64/sys_machdep.c#5 integrate
.. //depot/projects/hammer/sys/ia64/include/bus.h#19 integrate
.. //depot/projects/hammer/sys/ia64/include/clock.h#8 integrate
.. //depot/projects/hammer/sys/ia64/include/cpufunc.h#13 integrate
.. //depot/projects/hammer/sys/ia64/include/mca.h#4 integrate
.. //depot/projects/hammer/sys/ia64/include/md_var.h#21 integrate
.. //depot/projects/hammer/sys/isa/vga_isa.c#18 integrate
.. //depot/projects/hammer/sys/kern/kern_conf.c#60 integrate
.. //depot/projects/hammer/sys/kern/kern_event.c#57 integrate
.. //depot/projects/hammer/sys/kern/kern_exit.c#85 integrate
.. //depot/projects/hammer/sys/kern/kern_jail.c#48 integrate
.. //depot/projects/hammer/sys/kern/kern_proc.c#89 integrate
.. //depot/projects/hammer/sys/kern/kern_rmlock.c#6 integrate
.. //depot/projects/hammer/sys/kern/sched_4bsd.c#66 integrate
.. //depot/projects/hammer/sys/kern/sched_ule.c#108 integrate
.. //depot/projects/hammer/sys/kern/subr_acl_nfs4.c#3 integrate
.. //depot/projects/hammer/sys/kern/subr_acl_posix1e.c#7 integrate
.. //depot/projects/hammer/sys/kern/subr_bus.c#74 integrate
.. //depot/projects/hammer/sys/kern/subr_devstat.c#15 integrate
.. //depot/projects/hammer/sys/kern/subr_eventhandler.c#7 integrate
.. //depot/projects/hammer/sys/kern/subr_turnstile.c#31 integrate
.. //depot/projects/hammer/sys/kern/subr_witness.c#84 integrate
.. //depot/projects/hammer/sys/kern/tty.c#75 integrate
.. //depot/projects/hammer/sys/kern/tty_pts.c#23 integrate
.. //depot/projects/hammer/sys/kern/uipc_accf.c#11 integrate
.. //depot/projects/hammer/sys/kern/uipc_syscalls.c#81 integrate
.. //depot/projects/hammer/sys/kern/vfs_mount.c#109 integrate
.. //depot/projects/hammer/sys/kern/vfs_subr.c#147 integrate
.. //depot/projects/hammer/sys/mips/conf/DEFAULTS#3 integrate
.. //depot/projects/hammer/sys/mips/mips/mem.c#3 integrate
.. //depot/projects/hammer/sys/modules/ipfw/Makefile#12 integrate
.. //depot/projects/hammer/sys/modules/iwnfw/Makefile#4 integrate
.. //depot/projects/hammer/sys/modules/iwnfw/iwn1000/Makefile#1 branch
.. //depot/projects/hammer/sys/modules/iwnfw/iwn4965/Makefile#2 integrate
.. //depot/projects/hammer/sys/modules/iwnfw/iwn5000/Makefile#2 integrate
.. //depot/projects/hammer/sys/modules/iwnfw/iwn6000/Makefile#1 branch
.. //depot/projects/hammer/sys/net/if.c#95 integrate
.. //depot/projects/hammer/sys/net/if.h#39 integrate
.. //depot/projects/hammer/sys/net/if_bridge.c#53 integrate
.. //depot/projects/hammer/sys/net/if_ethersubr.c#84 integrate
.. //depot/projects/hammer/sys/net/if_llatbl.c#8 integrate
.. //depot/projects/hammer/sys/net/if_llatbl.h#4 integrate
.. //depot/projects/hammer/sys/net/if_var.h#63 integrate
.. //depot/projects/hammer/sys/net/if_vlan.c#54 integrate
.. //depot/projects/hammer/sys/net/netisr.c#22 integrate
.. //depot/projects/hammer/sys/net/route.c#49 integrate
.. //depot/projects/hammer/sys/net/route.h#31 integrate
.. //depot/projects/hammer/sys/net/rtsock.c#52 integrate
.. //depot/projects/hammer/sys/netgraph/atm/uni/ng_uni.c#8 integrate
.. //depot/projects/hammer/sys/netgraph/ng_base.c#70 integrate
.. //depot/projects/hammer/sys/netgraph/ng_bridge.c#21 integrate
.. //depot/projects/hammer/sys/netgraph/ng_ipfw.c#8 integrate
.. //depot/projects/hammer/sys/netgraph/ng_ipfw.h#4 integrate
.. //depot/projects/hammer/sys/netinet/in.c#46 integrate
.. //depot/projects/hammer/sys/netinet/in.h#36 integrate
.. //depot/projects/hammer/sys/netinet/ip_divert.c#54 integrate
.. //depot/projects/hammer/sys/netinet/ip_dummynet.h#21 integrate
.. //depot/projects/hammer/sys/netinet/ip_encap.c#11 integrate
.. //depot/projects/hammer/sys/netinet/ip_fw.h#46 integrate
.. //depot/projects/hammer/sys/netinet/ip_mroute.c#51 integrate
.. //depot/projects/hammer/sys/netinet/ip_output.c#84 integrate
.. //depot/projects/hammer/sys/netinet/ipfw/ip_dummynet.c#3 integrate
.. //depot/projects/hammer/sys/netinet/ipfw/ip_fw2.c#6 integrate
.. //depot/projects/hammer/sys/netinet/ipfw/ip_fw_dynamic.c#1 branch
.. //depot/projects/hammer/sys/netinet/ipfw/ip_fw_log.c#1 branch
.. //depot/projects/hammer/sys/netinet/ipfw/ip_fw_nat.c#3 integrate
.. //depot/projects/hammer/sys/netinet/ipfw/ip_fw_pfil.c#5 integrate
.. //depot/projects/hammer/sys/netinet/ipfw/ip_fw_private.h#1 branch
.. //depot/projects/hammer/sys/netinet/ipfw/ip_fw_sockopt.c#1 branch
.. //depot/projects/hammer/sys/netinet/ipfw/ip_fw_table.c#1 branch
.. //depot/projects/hammer/sys/netinet/libalias/alias_mod.c#3 integrate
.. //depot/projects/hammer/sys/netinet/tcp.h#22 integrate
.. //depot/projects/hammer/sys/netinet/tcp_usrreq.c#70 integrate
.. //depot/projects/hammer/sys/netinet6/in6.c#47 integrate
.. //depot/projects/hammer/sys/netinet6/mld6.c#33 integrate
.. //depot/projects/hammer/sys/netinet6/mld6_var.h#8 integrate
.. //depot/projects/hammer/sys/netinet6/nd6.c#50 integrate
.. //depot/projects/hammer/sys/nfsclient/krpc_subr.c#17 integrate
.. //depot/projects/hammer/sys/pc98/cbus/gdc.c#6 integrate
.. //depot/projects/hammer/sys/pc98/conf/DEFAULTS#10 integrate
.. //depot/projects/hammer/sys/pc98/conf/NOTES#76 integrate
.. //depot/projects/hammer/sys/powerpc/booke/clock.c#7 integrate
.. //depot/projects/hammer/sys/powerpc/conf/DEFAULTS#8 integrate
.. //depot/projects/hammer/sys/powerpc/ofw/ofw_syscons.c#14 integrate
.. //depot/projects/hammer/sys/powerpc/powerpc/mem.c#5 integrate
.. //depot/projects/hammer/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c#4 integrate
.. //depot/projects/hammer/sys/sparc64/central/central.c#13 integrate
.. //depot/projects/hammer/sys/sparc64/conf/DEFAULTS#8 integrate
.. //depot/projects/hammer/sys/sparc64/ebus/ebus.c#23 integrate
.. //depot/projects/hammer/sys/sparc64/fhc/fhc.c#15 integrate
.. //depot/projects/hammer/sys/sparc64/include/bus_common.h#8 integrate
.. //depot/projects/hammer/sys/sparc64/include/intr_machdep.h#11 integrate
.. //depot/projects/hammer/sys/sparc64/include/iommureg.h#8 integrate
.. //depot/projects/hammer/sys/sparc64/include/iommuvar.h#12 integrate
.. //depot/projects/hammer/sys/sparc64/isa/ofw_isa.c#10 integrate
.. //depot/projects/hammer/sys/sparc64/pci/apb.c#15 integrate
.. //depot/projects/hammer/sys/sparc64/pci/fire.c#1 branch
.. //depot/projects/hammer/sys/sparc64/pci/firereg.h#1 branch
.. //depot/projects/hammer/sys/sparc64/pci/firevar.h#1 branch
.. //depot/projects/hammer/sys/sparc64/pci/ofw_pci.h#14 integrate
.. //depot/projects/hammer/sys/sparc64/pci/ofw_pcib.c#12 integrate
.. //depot/projects/hammer/sys/sparc64/pci/ofw_pcibus.c#23 integrate
.. //depot/projects/hammer/sys/sparc64/pci/psycho.c#47 integrate
.. //depot/projects/hammer/sys/sparc64/pci/schizo.c#8 integrate
.. //depot/projects/hammer/sys/sparc64/sbus/dma_sbus.c#8 integrate
.. //depot/projects/hammer/sys/sparc64/sbus/sbus.c#34 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/eeprom.c#13 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/identcpu.c#12 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/interrupt.S#9 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/intr_machdep.c#22 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/iommu.c#27 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/nexus.c#17 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/ofw_machdep.c#14 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/rtc.c#9 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/upa.c#9 integrate
.. //depot/projects/hammer/sys/sun4v/conf/DEFAULTS#5 integrate
.. //depot/projects/hammer/sys/sun4v/conf/NOTES#3 integrate
.. //depot/projects/hammer/sys/sys/acl.h#11 integrate
.. //depot/projects/hammer/sys/sys/ata.h#26 integrate
.. //depot/projects/hammer/sys/sys/conf.h#55 integrate
.. //depot/projects/hammer/sys/sys/disk.h#11 integrate
.. //depot/projects/hammer/sys/sys/event.h#20 integrate
.. //depot/projects/hammer/sys/sys/file.h#23 integrate
.. //depot/projects/hammer/sys/sys/mount.h#67 integrate
.. //depot/projects/hammer/sys/sys/pmc.h#20 integrate
.. //depot/projects/hammer/sys/sys/proc.h#135 integrate
.. //depot/projects/hammer/sys/sys/sysproto.h#76 integrate
.. //depot/projects/hammer/sys/sys/ttydevsw.h#3 integrate
.. //depot/projects/hammer/sys/sys/vnode.h#94 integrate
.. //depot/projects/hammer/sys/ufs/ffs/ffs_rawread.c#24 integrate
.. //depot/projects/hammer/sys/ufs/ffs/ffs_vfsops.c#87 integrate
.. //depot/projects/hammer/sys/ufs/ffs/fs.h#15 integrate
.. //depot/projects/hammer/sys/ufs/ufs/acl.h#3 integrate
.. //depot/projects/hammer/sys/ufs/ufs/ufs_acl.c#10 integrate
.. //depot/projects/hammer/sys/ufs/ufs/ufs_lookup.c#31 integrate
.. //depot/projects/hammer/sys/ufs/ufs/ufs_vnops.c#66 integrate
.. //depot/projects/hammer/sys/vm/device_pager.c#23 integrate
.. //depot/projects/hammer/sys/vm/uma_core.c#59 integrate
.. //depot/projects/hammer/sys/vm/vm_object.c#86 integrate
.. //depot/projects/hammer/sys/vm/vm_object.h#32 integrate
.. //depot/projects/hammer/sys/xen/gnttab.c#6 integrate
.. //depot/projects/hammer/tools/regression/acltools/02.t#1 branch
.. //depot/projects/hammer/tools/regression/acltools/tools-crossfs.test#2 integrate
.. //depot/projects/hammer/tools/regression/bin/sh/builtins/command6.0#1 branch
.. //depot/projects/hammer/tools/regression/bin/sh/builtins/command6.0.stdout#1 branch
.. //depot/projects/hammer/tools/regression/bin/sh/builtins/command7.0#1 branch
.. //depot/projects/hammer/tools/regression/bin/sh/builtins/fc2.0#1 branch
.. //depot/projects/hammer/tools/regression/bin/sh/builtins/type2.0#1 branch
.. //depot/projects/hammer/tools/regression/bin/sh/expansion/arith1.0#1 branch
.. //depot/projects/hammer/tools/regression/fifo/fifo_misc/fifo_misc.c#3 integrate
.. //depot/projects/hammer/tools/regression/geom/ConfCmp/ConfCmp.c#6 integrate
.. //depot/projects/hammer/tools/regression/kqueue/config.h#2 integrate
.. //depot/projects/hammer/tools/regression/kqueue/main.c#2 integrate
.. //depot/projects/hammer/tools/regression/kqueue/user.c#2 integrate
.. //depot/projects/hammer/tools/tools/README#32 integrate
.. //depot/projects/hammer/tools/tools/notescheck/Makefile#1 branch
.. //depot/projects/hammer/tools/tools/notescheck/notescheck.py#1 branch
.. //depot/projects/hammer/usr.bin/ar/acpyacc.y#2 integrate
.. //depot/projects/hammer/usr.bin/ar/read.c#2 integrate
.. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.all#5 integrate
.. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.dutch#5 integrate
.. //depot/projects/hammer/usr.bin/calendar/io.c#7 integrate
.. //depot/projects/hammer/usr.bin/calendar/ostern.c#5 integrate
.. //depot/projects/hammer/usr.bin/comm/comm.c#5 integrate
.. //depot/projects/hammer/usr.bin/fetch/fetch.c#24 integrate
.. //depot/projects/hammer/usr.bin/find/function.c#15 integrate
.. //depot/projects/hammer/usr.bin/finger/Makefile#2 integrate
.. //depot/projects/hammer/usr.bin/finger/extern.h#6 integrate
.. //depot/projects/hammer/usr.bin/finger/finger.c#9 integrate
.. //depot/projects/hammer/usr.bin/finger/finger.h#3 integrate
.. //depot/projects/hammer/usr.bin/finger/lprint.c#6 integrate
.. //depot/projects/hammer/usr.bin/finger/net.c#7 integrate
.. //depot/projects/hammer/usr.bin/finger/sprint.c#5 integrate
.. //depot/projects/hammer/usr.bin/finger/util.c#6 integrate
.. //depot/projects/hammer/usr.bin/gencat/gencat.c#5 integrate
.. //depot/projects/hammer/usr.bin/killall/killall.1#11 integrate
.. //depot/projects/hammer/usr.bin/lex/flex.skl#6 integrate
.. //depot/projects/hammer/usr.bin/lex/initscan.c#4 integrate
.. //depot/projects/hammer/usr.bin/make/arch.c#23 integrate
.. //depot/projects/hammer/usr.bin/make/job.c#39 integrate
.. //depot/projects/hammer/usr.bin/make/make.c#20 integrate
.. //depot/projects/hammer/usr.bin/mklocale/lex.l#5 integrate
.. //depot/projects/hammer/usr.bin/mklocale/yacc.y#18 integrate
.. //depot/projects/hammer/usr.bin/rwho/rwho.c#2 integrate
.. //depot/projects/hammer/usr.bin/sockstat/sockstat.1#8 integrate
.. //depot/projects/hammer/usr.bin/truss/amd64-fbsd32.c#4 integrate
.. //depot/projects/hammer/usr.bin/truss/i386-fbsd.c#16 integrate
.. //depot/projects/hammer/usr.bin/truss/main.c#19 integrate
.. //depot/projects/hammer/usr.bin/truss/syscalls.c#27 integrate
.. //depot/projects/hammer/usr.bin/uniq/uniq.1#8 integrate
.. //depot/projects/hammer/usr.bin/uniq/uniq.c#7 integrate
.. //depot/projects/hammer/usr.bin/unzip/unzip.c#4 integrate
.. //depot/projects/hammer/usr.bin/wall/wall.c#6 integrate
.. //depot/projects/hammer/usr.bin/wc/wc.c#6 integrate
.. //depot/projects/hammer/usr.bin/who/who.c#8 integrate
.. //depot/projects/hammer/usr.bin/yacc/defs.h#3 integrate
.. //depot/projects/hammer/usr.bin/yacc/skeleton.c#4 integrate
.. //depot/projects/hammer/usr.sbin/Makefile#104 integrate
.. //depot/projects/hammer/usr.sbin/apm/apm.8#11 integrate
.. //depot/projects/hammer/usr.sbin/apm/apm.c#12 integrate
.. //depot/projects/hammer/usr.sbin/arp/arp.c#23 integrate
.. //depot/projects/hammer/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile#2 integrate
.. //depot/projects/hammer/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_scalars.c#2 integrate
.. //depot/projects/hammer/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.c#2 integrate
.. //depot/projects/hammer/usr.sbin/burncd/burncd.8#14 integrate
.. //depot/projects/hammer/usr.sbin/burncd/burncd.c#12 integrate
.. //depot/projects/hammer/usr.sbin/config/lang.l#15 integrate
.. //depot/projects/hammer/usr.sbin/cpucontrol/cpucontrol.c#3 integrate
.. //depot/projects/hammer/usr.sbin/crunch/examples/really-big.conf#3 integrate
.. //depot/projects/hammer/usr.sbin/diskinfo/diskinfo.8#8 integrate
.. //depot/projects/hammer/usr.sbin/diskinfo/diskinfo.c#9 integrate
.. //depot/projects/hammer/usr.sbin/eeprom/eeprom.c#2 integrate
.. //depot/projects/hammer/usr.sbin/fifolog/lib/getdate.y#2 integrate
.. //depot/projects/hammer/usr.sbin/lastlogin/lastlogin.c#3 integrate
.. //depot/projects/hammer/usr.sbin/mergemaster/mergemaster.8#14 integrate
.. //depot/projects/hammer/usr.sbin/mergemaster/mergemaster.sh#22 integrate
.. //depot/projects/hammer/usr.sbin/newsyslog/newsyslog.c#27 integrate
.. //depot/projects/hammer/usr.sbin/nfsd/nfsd.c#10 integrate
.. //depot/projects/hammer/usr.sbin/ntp/Makefile#9 integrate
.. //depot/projects/hammer/usr.sbin/ntp/config.h#10 integrate
.. //depot/projects/hammer/usr.sbin/ntp/ntptrace/Makefile#6 delete
.. //depot/projects/hammer/usr.sbin/pkg_install/add/main.c#28 integrate
.. //depot/projects/hammer/usr.sbin/pkg_install/create/main.c#13 integrate
.. //depot/projects/hammer/usr.sbin/pkg_install/delete/main.c#7 integrate
.. //depot/projects/hammer/usr.sbin/pkg_install/info/main.c#14 integrate
.. //depot/projects/hammer/usr.sbin/pkg_install/version/main.c#10 integrate
.. //depot/projects/hammer/usr.sbin/pmcannotate/pmcannotate.c#2 integrate
.. //depot/projects/hammer/usr.sbin/pmcstat/pmcstat_log.c#11 integrate
.. //depot/projects/hammer/usr.sbin/portsnap/portsnap/portsnap.sh#10 integrate
.. //depot/projects/hammer/usr.sbin/powerd/powerd.8#11 integrate
.. //depot/projects/hammer/usr.sbin/powerd/powerd.c#16 integrate
.. //depot/projects/hammer/usr.sbin/ppp/ppp.8.m4#26 integrate
.. //depot/projects/hammer/usr.sbin/rpc.umntall/mounttab.c#4 integrate
.. //depot/projects/hammer/usr.sbin/rwhod/Makefile#3 integrate
.. //depot/projects/hammer/usr.sbin/rwhod/rwhod.c#7 integrate
.. //depot/projects/hammer/usr.sbin/sa/main.c#6 integrate
.. //depot/projects/hammer/usr.sbin/sa/pdb.c#6 integrate
.. //depot/projects/hammer/usr.sbin/sa/usrdb.c#5 integrate
.. //depot/projects/hammer/usr.sbin/service/Makefile#1 branch
.. //depot/projects/hammer/usr.sbin/service/service.8#1 branch
.. //depot/projects/hammer/usr.sbin/service/service.sh#1 branch
.. //depot/projects/hammer/usr.sbin/syslogd/Makefile#7 integrate
.. //depot/projects/hammer/usr.sbin/syslogd/syslogd.c#39 integrate
.. //depot/projects/hammer/usr.sbin/wake/wake.8#3 integrate
.. //depot/projects/hammer/usr.sbin/wake/wake.c#2 integrate
.. //depot/projects/hammer/usr.sbin/watchdogd/watchdogd.c#12 integrate
.. //depot/projects/hammer/usr.sbin/ypserv/yp_main.c#7 integrate
.. //depot/projects/hammer/usr.sbin/ypserv/ypinit.sh#3 integrate
.. //depot/projects/hammer/usr.sbin/zic/Theory#4 integrate

Differences ...

==== //depot/projects/hammer/COPYRIGHT#9 (text+ko) ====

@@ -1,10 +1,10 @@
-# $FreeBSD: src/COPYRIGHT,v 1.11 2008/12/30 04:46:25 imp Exp $
+# $FreeBSD: src/COPYRIGHT,v 1.12 2009/12/31 10:00:37 obrien Exp $
 #	@(#)COPYRIGHT	8.2 (Berkeley) 3/21/94
 
 The compilation of software known as FreeBSD is distributed under the
 following terms:
 
-Copyright (c) 1992-2009 The FreeBSD Project. All rights reserved.
+Copyright (c) 1992-2010 The FreeBSD Project. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions

==== //depot/projects/hammer/MAINTAINERS#54 (text+ko) ====

@@ -1,4 +1,4 @@
-$FreeBSD: src/MAINTAINERS,v 1.155 2009/12/06 23:48:38 cperciva Exp $
+$FreeBSD: src/MAINTAINERS,v 1.156 2009/12/30 14:41:02 mjacob Exp $
 
 Please note that the content of this file is strictly advisory.
 No locks listed here are valid.  The only strict review requirements
@@ -48,7 +48,6 @@
 cd(4)		ken	Pre-commit review requested.
 pass(4)		ken	Pre-commit review requested.
 ch(4)		ken	Pre-commit review requested.
-isp(4)		mjacob	Pre-commit review requested.
 em(4)		jfv	Pre-commit review requested.
 tdfx(4)		cokane  Just keep me informed of changes, try not to break it.
 sendmail	gshapiro	Pre-commit review requested.

==== //depot/projects/hammer/Makefile.inc1#150 (text+ko) ====

@@ -1,14 +1,15 @@
 #
-# $FreeBSD: src/Makefile.inc1,v 1.634 2009/12/11 14:15:55 ed Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.636 2009/12/31 00:07:26 ed Exp $
 #
 # Make command line options:
 #	-DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
 #	-DNO_CLEAN do not clean at all
 #	-DNO_SHARE do not go into share subdir
-#	-DKERNFAST define NO_KERNELCONFIG, NO_KERNELCLEAN and NO_KERNELDEPEND
+#	-DKERNFAST define NO_KERNEL{CONFIG,CLEAN,DEPEND,OBJ}
 #	-DNO_KERNELCONFIG do not run config in ${MAKE} buildkernel
 #	-DNO_KERNELCLEAN do not run ${MAKE} clean in ${MAKE} buildkernel
 #	-DNO_KERNELDEPEND do not run ${MAKE} depend in ${MAKE} buildkernel
+#	-DNO_KERNELOBJ do not run ${MAKE} obj in ${MAKE} buildkernel
 #	-DNO_PORTSUPDATE do not update ports in ${MAKE} update
 #	-DNO_DOCUPDATE do not update doc in ${MAKE} update
 #	-DNO_CTF do not run the DTrace CTF conversion tools on built objects
@@ -702,6 +703,7 @@
 NO_KERNELCLEAN=	t
 NO_KERNELCONFIG=	t
 NO_KERNELDEPEND=	t
+NO_KERNELOBJ=		t
 # Shortcut for KERNCONF=Blah -DKERNFAST is now KERNFAST=Blah
 .if !defined(KERNCONF) && ${KERNFAST} != "1"
 KERNCONF=${KERNFAST}
@@ -771,11 +773,13 @@
 	@echo "--------------------------------------------------------------"
 	cd ${KRNLOBJDIR}/${_kernel}; ${KMAKE} ${CLEANDIR}
 .endif
+.if !defined(NO_KERNELOBJ)
 	@echo
 	@echo "--------------------------------------------------------------"
 	@echo ">>> stage 2.2: rebuilding the object tree"
 	@echo "--------------------------------------------------------------"
 	cd ${KRNLOBJDIR}/${_kernel}; ${KMAKE} obj
+.endif
 	@echo
 	@echo "--------------------------------------------------------------"
 	@echo ">>> stage 2.3: build tools"
@@ -944,6 +948,11 @@
 _sed=		usr.bin/sed
 .endif
 
+.if ${BOOTSTRAPPING} < 900006
+_lex=		usr.bin/lex
+_yacc=		usr.bin/yacc
+.endif
+
 .if ${BOOTSTRAPPING} < 700018
 _gensnmptree=	usr.sbin/bsnmpd/gensnmptree
 .endif
@@ -970,6 +979,8 @@
     ${_mklocale} \
     usr.bin/rpcgen \
     ${_sed} \
+    ${_lex} \

>>> TRUNCATED FOR MAIL (1000 lines) <<<


More information about the p4-projects mailing list