Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 22 Apr 2010 06:52:08 GMT
From:      Alexander Motin <mav@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 177203 for review
Message-ID:  <201004220652.o3M6q8ri058087@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@177203?ac=10

Change 177203 by mav@mav_mavtest on 2010/04/22 06:51:33

	IFC

Affected files ...

.. //depot/projects/scottl-camlock/src/MAINTAINERS#11 integrate
.. //depot/projects/scottl-camlock/src/Makefile.inc1#18 integrate
.. //depot/projects/scottl-camlock/src/ObsoleteFiles.inc#27 integrate
.. //depot/projects/scottl-camlock/src/bin/ln/ln.c#4 integrate
.. //depot/projects/scottl-camlock/src/bin/ps/ps.1#5 integrate
.. //depot/projects/scottl-camlock/src/bin/pwait/pwait.1#2 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/cd.c#6 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/cd.h#2 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/main.c#7 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/mksyntax.c#6 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/parser.c#14 integrate
.. //depot/projects/scottl-camlock/src/contrib/binutils/bfd/config.bfd#3 integrate
.. //depot/projects/scottl-camlock/src/contrib/com_err/compile_et.1#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/netcat/nc.1#8 integrate
.. //depot/projects/scottl-camlock/src/contrib/netcat/netcat.c#7 integrate
.. //depot/projects/scottl-camlock/src/contrib/top/utils.c#3 integrate
.. //depot/projects/scottl-camlock/src/contrib/tzdata/africa#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/tzdata/asia#4 integrate
.. //depot/projects/scottl-camlock/src/contrib/tzdata/southamerica#2 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssh/sshd.c#7 integrate
.. //depot/projects/scottl-camlock/src/etc/defaults/rc.conf#19 integrate
.. //depot/projects/scottl-camlock/src/etc/devd.conf#4 integrate
.. //depot/projects/scottl-camlock/src/etc/devd/uath.conf#2 integrate
.. //depot/projects/scottl-camlock/src/etc/mtree/BSD.include.dist#8 integrate
.. //depot/projects/scottl-camlock/src/etc/mtree/BSD.usr.dist#11 integrate
.. //depot/projects/scottl-camlock/src/etc/network.subr#12 integrate
.. //depot/projects/scottl-camlock/src/etc/rc.d/Makefile#12 integrate
.. //depot/projects/scottl-camlock/src/etc/rc.d/ip6addrctl#6 integrate
.. //depot/projects/scottl-camlock/src/etc/rc.d/netif#9 integrate
.. //depot/projects/scottl-camlock/src/etc/rc.d/netoptions#7 integrate
.. //depot/projects/scottl-camlock/src/etc/rc.d/ubthidhci#1 branch
.. //depot/projects/scottl-camlock/src/etc/rc.firewall#9 integrate
.. //depot/projects/scottl-camlock/src/etc/rc.subr#12 integrate
.. //depot/projects/scottl-camlock/src/gnu/usr.bin/gdb/Makefile#5 integrate
.. //depot/projects/scottl-camlock/src/gnu/usr.bin/gdb/gdbserver/Makefile#4 integrate
.. //depot/projects/scottl-camlock/src/gnu/usr.bin/gdb/gdbserver/fbsd-powerpc-low.c#1 branch
.. //depot/projects/scottl-camlock/src/gnu/usr.bin/gdb/gdbserver/fbsd-ppc-low.c#2 delete
.. //depot/projects/scottl-camlock/src/gnu/usr.bin/gdb/gdbserver/reg-amd64.c#1 branch
.. //depot/projects/scottl-camlock/src/gnu/usr.bin/gdb/gdbserver/reg-powerpc.c#1 branch
.. //depot/projects/scottl-camlock/src/gnu/usr.bin/gdb/gdbserver/reg-ppc.c#2 delete
.. //depot/projects/scottl-camlock/src/gnu/usr.bin/gdb/gdbserver/reg-x86-64.c#2 delete
.. //depot/projects/scottl-camlock/src/gnu/usr.bin/gdb/kgdb/kgdb.1#2 integrate
.. //depot/projects/scottl-camlock/src/include/stdlib.h#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/gen/check_utility_compat.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/gen/confstr.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/gen/dladdr.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/gen/dlinfo.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/gen/dllockinit.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/gen/dlopen.3#5 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/gen/fmtcheck.3#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/gen/fnmatch.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/gen/frexp.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/gen/ftok.3#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/gen/getcwd.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/gen/getutxent.3#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/gen/setproctitle.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/gen/stringlist.3#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/gen/sysconf.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/gen/sysctl.3#5 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/locale/isalnum.3#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/locale/isalpha.3#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/net/getservent.c#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/posix1e/mac_prepare.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/softfloat/softfloat-specialize#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/stdlib/hcreate.3#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/stdlib/ptsname.3#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/stdlib/realpath.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/stdlib/realpath.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/sys/sigaction.2#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libcam/cam.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libcam/cam_cdbparse.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libcompat/4.1/cftime.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libcompat/4.4/cuserid.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libedit/editline.3#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libedit/editrc.5#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libelf/elf.3#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libelf/elf_begin.3#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libelf/elf_cntl.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libelf/elf_end.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libelf/elf_errmsg.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libelf/elf_fill.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libelf/elf_flagdata.3#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libelf/elf_getarhdr.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libelf/elf_getarsym.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libelf/elf_getbase.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libelf/elf_getdata.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libelf/elf_getident.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libelf/elf_getphnum.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libelf/elf_getscn.3#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libelf/elf_getshnum.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libelf/elf_getshstrndx.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libelf/elf_hash.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libelf/elf_kind.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libelf/elf_memory.3#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libelf/elf_next.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libelf/elf_rand.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libelf/elf_rawfile.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libelf/elf_strptr.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libelf/elf_update.3#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libelf/elf_version.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libelf/gelf.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libelf/gelf_checksum.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libelf/gelf_fsize.3#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libelf/gelf_getcap.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libelf/gelf_getclass.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libelf/gelf_getdyn.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libelf/gelf_getehdr.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libelf/gelf_getmove.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libelf/gelf_getphdr.3#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libelf/gelf_getrel.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libelf/gelf_getrela.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libelf/gelf_getshdr.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libelf/gelf_getsym.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libelf/gelf_getsyminfo.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libelf/gelf_getsymshndx.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libelf/gelf_newehdr.3#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libelf/gelf_newphdr.3#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libelf/gelf_update_ehdr.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libelf/gelf_xlatetof.3#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_accept_sec_context.3#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_acquire_cred.3#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_add_cred.3#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_add_oid_set_member.3#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_canonicalize_name.3#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_compare_name.3#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_context_time.3#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_create_empty_oid_set.3#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_delete_sec_context.3#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_display_name.3#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_display_status.3#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_duplicate_name.3#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_export_name.3#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_export_sec_context.3#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_get_mic.3#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_import_name.3#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_import_sec_context.3#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_indicate_mechs.3#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_init_sec_context.3#5 integrate
.. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_inquire_context.3#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_inquire_cred.3#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_inquire_cred_by_mech.3#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_inquire_mechs_for_name.3#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_inquire_names_for_mech.3#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_process_context_token.3#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_release_buffer.3#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_release_cred.3#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_release_name.3#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_release_oid_set.3#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_test_oid_set_member.3#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_unwrap.3#5 integrate
.. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_verify_mic.3#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_wrap.3#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_wrap_size_limit.3#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libmemstat/libmemstat.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libpmc/pmc.3#5 integrate
.. //depot/projects/scottl-camlock/src/lib/libpmc/pmc.atom.3#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libpmc/pmc.core.3#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libpmc/pmc.core2.3#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libpmc/pmc.corei7.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libpmc/pmc.corei7uc.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libpmc/pmc.iaf.3#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libpmc/pmc.k7.3#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libpmc/pmc.k8.3#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libpmc/pmc.p4.3#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libpmc/pmc.p5.3#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libpmc/pmc.p6.3#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libpmc/pmc.tsc.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libpmc/pmc.ucf.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libpmc/pmc.westmere.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libpmc/pmc.westmereuc.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libpmc/pmc_allocate.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libpmc/pmc_attach.3#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libpmc/pmc_capabilities.3#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libpmc/pmc_configure_logfile.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libpmc/pmc_disable.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libpmc/pmc_event_names_of_class.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libpmc/pmc_get_driver_stats.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libpmc/pmc_get_msr.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libpmc/pmc_init.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libpmc/pmc_name_of_capability.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libpmc/pmc_read.3#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libpmc/pmc_set.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libpmc/pmc_start.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libpmc/pmclog.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libthr/libthr.3#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libugidfw/bsde_get_rule.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libugidfw/bsde_get_rule_count.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libugidfw/bsde_parse_rule.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libugidfw/bsde_rule_to_string.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libugidfw/libugidfw.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libulog/ulog_login.3#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libulog/utempter_add_record.3#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libutil/_secure_path.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libutil/auth.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libutil/hexdump.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libutil/kinfo_getfile.3#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libutil/kinfo_getvmmap.3#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libutil/kld.3#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libutil/login_auth.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libutil/login_cap.3#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libutil/login_class.3#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libutil/login_ok.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libutil/login_times.3#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libutil/login_tty.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libutil/property.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libutil/pty.3#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libutil/realhostname.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libutil/realhostname_sa.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libutil/trimdomain.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libutil/uucplock.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/ChangeLog#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/README#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/Symbol.map#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/crc32.c#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/deflate.c#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/deflate.h#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/gzguts.h#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/gzlib.c#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/inffast.c#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/inffast.h#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/inftrees.c#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/inftrees.h#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/minigzip.c#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/trees.c#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/trees.h#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/zconf.h#5 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/zlib.3#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/zlib.h#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/zutil.c#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/zutil.h#4 integrate
.. //depot/projects/scottl-camlock/src/release/Makefile#10 integrate
.. //depot/projects/scottl-camlock/src/release/Makefile.inc.docports#4 integrate
.. //depot/projects/scottl-camlock/src/release/powerpc/boot_crunch.conf#5 integrate
.. //depot/projects/scottl-camlock/src/sbin/geom/class/Makefile#4 integrate
.. //depot/projects/scottl-camlock/src/sbin/geom/class/sched/Makefile#1 branch
.. //depot/projects/scottl-camlock/src/sbin/geom/class/sched/geom_sched.c#1 branch
.. //depot/projects/scottl-camlock/src/sbin/geom/class/sched/gsched.8#1 branch
.. //depot/projects/scottl-camlock/src/sbin/geom/misc/subr.c#3 integrate
.. //depot/projects/scottl-camlock/src/sbin/hastd/hastd.c#2 integrate
.. //depot/projects/scottl-camlock/src/sbin/hastd/pjdlog.c#2 integrate
.. //depot/projects/scottl-camlock/src/sbin/hastd/primary.c#3 integrate
.. //depot/projects/scottl-camlock/src/sbin/ifconfig/ifconfig.c#10 integrate
.. //depot/projects/scottl-camlock/src/sbin/ipfw/dummynet.c#7 integrate
.. //depot/projects/scottl-camlock/src/sbin/ipfw/ipfw2.c#8 integrate
.. //depot/projects/scottl-camlock/src/sbin/ipfw/ipfw2.h#5 integrate
.. //depot/projects/scottl-camlock/src/sbin/ipfw/main.c#3 integrate
.. //depot/projects/scottl-camlock/src/sbin/iscontrol/iscsi.conf.5#2 integrate
.. //depot/projects/scottl-camlock/src/sbin/mca/mca.c#2 integrate
.. //depot/projects/scottl-camlock/src/sbin/ping6/ping6.8#3 integrate
.. //depot/projects/scottl-camlock/src/sbin/ping6/ping6.c#3 integrate
.. //depot/projects/scottl-camlock/src/sbin/spppcontrol/spppcontrol.8#2 integrate
.. //depot/projects/scottl-camlock/src/share/examples/Makefile#6 integrate
.. //depot/projects/scottl-camlock/src/share/man/man3/sysexits.3#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man3/tgmath.3#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/Makefile#24 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/altq.4#6 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/audit.4#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/auditpipe.4#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/coda.4#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/gbde.4#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/geom.4#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/geom_fox.4#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/geom_linux_lvm.4#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/geom_uzip.4#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/ipw.4#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/iscsi_initiator.4#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/iwi.4#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/iwn.4#6 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/kbdmux.4#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/ktr.4#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/lp.4#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/mac.4#4 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/mac_biba.4#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/mac_bsdextended.4#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/mac_ifoff.4#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/mac_lomac.4#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/mac_mls.4#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/mac_none.4#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/mac_partition.4#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/mac_seeotheruids.4#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/mac_stub.4#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/mac_test.4#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/miibus.4#4 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/netintro.4#4 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/ng_netflow.4#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/orm.4#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/ral.4#6 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/rp.4#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/rum.4#4 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/run.4#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/sched_4bsd.4#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/sched_ule.4#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/sge.4#1 branch
.. //depot/projects/scottl-camlock/src/share/man/man4/si.4#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/splash.4#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/tap.4#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/uhso.4#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/upgt.4#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/ural.4#5 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/vkbd.4#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/vlan.4#4 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/wpi.4#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man5/ar.5#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man5/rc.conf.5#16 integrate
.. //depot/projects/scottl-camlock/src/share/man/man7/clocks.7#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man7/maclabel.7#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man8/picobsd.8#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man8/rescue.8#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/CTASSERT.9#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/DELAY.9#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/KASSERT.9#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/VFS.9#4 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/VFS_CHECKEXP.9#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/VFS_FHTOVP.9#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/VFS_MOUNT.9#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/VFS_QUOTACTL.9#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/VFS_ROOT.9#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/VFS_STATFS.9#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/VFS_SYNC.9#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/VFS_UNMOUNT.9#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/VFS_VGET.9#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/VOP_ACCESS.9#5 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/VOP_ACLCHECK.9#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/VOP_ADVLOCK.9#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/VOP_ATTRIB.9#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/VOP_BWRITE.9#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/VOP_CREATE.9#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/VOP_FSYNC.9#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/VOP_GETACL.9#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/VOP_GETEXTATTR.9#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/VOP_GETPAGES.9#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/VOP_GETVOBJECT.9#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/VOP_INACTIVE.9#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/VOP_IOCTL.9#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/VOP_LINK.9#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/VOP_LISTEXTATTR.9#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/VOP_LOCK.9#4 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/VOP_LOOKUP.9#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/VOP_OPENCLOSE.9#4 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/VOP_PATHCONF.9#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/VOP_PRINT.9#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/VOP_RDWR.9#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/VOP_READDIR.9#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/VOP_READLINK.9#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/VOP_REALLOCBLKS.9#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/VOP_REMOVE.9#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/VOP_RENAME.9#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/VOP_REVOKE.9#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/VOP_SETACL.9#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/VOP_SETEXTATTR.9#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/VOP_STRATEGY.9#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/VOP_VPTOCNP.9#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/VOP_VPTOFH.9#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/accept_filter.9#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/accf_data.9#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/accf_dns.9#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/accf_http.9#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/acl.9#4 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/atomic.9#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/cr_cansee.9#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/cr_seeothergids.9#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/cr_seeotheruids.9#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/devfs_set_cdevpriv.9#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/devtoname.9#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/extattr.9#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/firmware.9#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/hexdump.9#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/ifnet.9#5 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/make_dev.9#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/namei.9#4 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/p_candebug.9#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/p_cansee.9#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/pfind.9#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/pgfind.9#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/prison_check.9#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/random.9#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/rijndael.9#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/rtalloc.9#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/rtentry.9#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/sleep.9#5 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/spl.9#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/stack.9#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/uio.9#4 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/usbdi.9#4 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/vaccess.9#4 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/vaccess_acl_nfs4.9#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/vaccess_acl_posix1e.9#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/vcount.9#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/vget.9#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/vm_map_entry_resize_free.9#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/vnode.9#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/vput.9#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/vref.9#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/vrefcnt.9#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/vrele.9#3 integrate
.. //depot/projects/scottl-camlock/src/share/misc/committers-ports.dot#11 integrate
.. //depot/projects/scottl-camlock/src/share/misc/committers-src.dot#13 integrate
.. //depot/projects/scottl-camlock/src/share/mk/bsd.cpu.mk#5 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/exception.S#13 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/local_apic.c#28 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/machdep.c#36 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/trap.c#26 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/conf/GENERIC#35 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/ia32/ia32_signal.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/include/md_var.h#13 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/include/bus.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/forth/loader.conf#25 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/i386/efi/Makefile#1 branch
.. //depot/projects/scottl-camlock/src/sys/boot/i386/efi/autoload.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/boot/i386/efi/bootinfo.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/boot/i386/efi/conf.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/boot/i386/efi/devicename.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/boot/i386/efi/efimd.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/boot/i386/efi/elf32_freebsd.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/boot/i386/efi/exec.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/boot/i386/efi/i386_copy.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/boot/i386/efi/ldscript.amd64#1 branch
.. //depot/projects/scottl-camlock/src/sys/boot/i386/efi/ldscript.i386#1 branch
.. //depot/projects/scottl-camlock/src/sys/boot/i386/efi/main.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/boot/i386/efi/reloc.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/boot/i386/efi/start.S#1 branch
.. //depot/projects/scottl-camlock/src/sys/boot/i386/efi/version#1 branch
.. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_cd.c#40 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/kern/opensolaris_taskq.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/dev/cyclic/amd64/cyclic_machdep.c#2 delete
.. //depot/projects/scottl-camlock/src/sys/cddl/dev/cyclic/i386/cyclic_machdep.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32.h#10 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_misc.c#25 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_util.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/linprocfs/linprocfs.c#31 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/NOTES#55 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/files#71 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/files.mips#6 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/files.sparc64#19 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/iwn/LICENSE#3 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/iwn/iwlwifi-6000-9.176.4.1.fw.uu#2 delete
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/iwn/iwlwifi-6000-9.193.4.1.fw.uu#1 branch
.. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_compat.h#10 integrate
.. //depot/projects/scottl-camlock/src/sys/ddb/db_sym.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/aac/aac.c#21 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/aac/aac_cam.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/aac/aac_debug.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/aac/aac_disk.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/aac/aac_pci.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/aac/aac_tables.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/aac/aacreg.h#10 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/aac/aacvar.h#13 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/age/if_age.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#107 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/alc/if_alc.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ale/if_ale.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-acerlabs.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5416/ar9285_attach.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ath/if_ath.c#36 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/bce/if_bce.c#19 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/bce/if_bcereg.h#14 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/bwi/if_bwi.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/bwi/if_bwivar.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/bwn/if_bwn.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/bwn/if_bwnvar.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/if_em.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/if_em.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/if_igb.c#19 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/if_lem.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/fb/vesa.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/fxp/if_fxp.c#24 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/hwpmc/hwpmc_core.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/hwpmc/pmc_events.h#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ipw/if_ipw.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ipw/if_ipwvar.h#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/iwn/if_iwn.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/iwn/if_iwnreg.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/iwn/if_iwnvar.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ixgbe/ixgbe.c#19 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mii/miidevs#19 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mii/truephy.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/msk/if_msk.c#20 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mxge/if_mxge.c#29 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mxge/if_mxge_var.h#17 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/nfe/if_nfe.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ral/rt2560.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ral/rt2560var.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ral/rt2661.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ral/rt2661var.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/re/if_re.c#31 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sge/if_sge.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/sge/if_sgereg.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/siis/siis.c#45 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sis/if_sis.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/syscons/logo/beastie.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/syscons/logo/logo.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/syscons/logo/logo_saver.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/uart/uart.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/uart/uart_cpu_sparc64.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/input/ukbd.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/u3g.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_device.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usbdevs#47 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_rum.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_rumvar.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_run.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_runvar.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_ural.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_uralvar.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_urtw.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_zyd.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_zydreg.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/wpi/if_wpi.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/wpi/if_wpivar.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/devfs/devfs_devs.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/devfs/devfs_int.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nfs/nfs_commonport.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nfs/nfsclstate.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs_clport.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs_clrpcops.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs_clstate.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nwfs/nwfs.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nwfs/nwfs_io.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nwfs/nwfs_ioctl.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nwfs/nwfs_mount.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nwfs/nwfs_node.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nwfs/nwfs_node.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nwfs/nwfs_subr.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nwfs/nwfs_subr.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nwfs/nwfs_vfsops.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nwfs/nwfs_vnops.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/pseudofs/pseudofs_vnops.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/smbfs/smbfs.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/smbfs/smbfs_io.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/smbfs/smbfs_node.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/smbfs/smbfs_node.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/smbfs/smbfs_smb.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/smbfs/smbfs_subr.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/smbfs/smbfs_subr.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/smbfs/smbfs_vfsops.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/smbfs/smbfs_vnops.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/geom/eli/g_eli.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/geom/geom_io.c#21 integrate
.. //depot/projects/scottl-camlock/src/sys/geom/geom_subr.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/geom/sched/README#1 branch
.. //depot/projects/scottl-camlock/src/sys/geom/sched/g_sched.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/geom/sched/g_sched.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/geom/sched/gs_rr.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/geom/sched/gs_scheduler.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/geom/sched/subr_disk.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/i386/conf/GENERIC#34 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/local_apic.c#29 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/machdep.c#34 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/mpboot.s#3 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/trap.c#24 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/include/bootinfo.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/ia64/mca.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/ia64/mp_machdep.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/include/mca.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/include/pal.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/init_main.c#23 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_clock.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_ktr.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_proc.c#21 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_shutdown.c#22 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_sig.c#32 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/subr_bus.c#41 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/tty_pts.c#19 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/vfs_cache.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/vfs_syscalls.c#34 integrate
.. //depot/projects/scottl-camlock/src/sys/libkern/iconv.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/libkern/iconv_converter_if.m#4 integrate
.. //depot/projects/scottl-camlock/src/sys/libkern/iconv_xlat.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/libkern/strcasecmp.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/atheros/if_arge.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/cavium/asm_octeon.S#3 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/cavium/dev/rgmii/octeon_fau.c#3 delete
.. //depot/projects/scottl-camlock/src/sys/mips/cavium/dev/rgmii/octeon_fau.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/cavium/dev/rgmii/octeon_rgmx.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/cavium/files.octeon1#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/cavium/octeon_machdep.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/cavium/octeon_mp.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/mips/cavium/octeon_pcmap_regs.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/conf/SWARM#6 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/include/_inttypes.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/include/_limits.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/include/archtype.h#2 delete
.. //depot/projects/scottl-camlock/src/sys/mips/include/asm.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/include/bus.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/include/cpu.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/include/cpufunc.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/include/cpuregs.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/include/db_machdep.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/include/defs.h#2 delete
.. //depot/projects/scottl-camlock/src/sys/mips/include/param.h#8 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/include/pcb.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/include/pmap.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/include/proc.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/include/profile.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/include/psl.h#3 delete
.. //depot/projects/scottl-camlock/src/sys/mips/include/pte.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/include/queue.h#2 delete
.. //depot/projects/scottl-camlock/src/sys/mips/include/regnum.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/include/rm7000.h#2 delete
.. //depot/projects/scottl-camlock/src/sys/mips/include/segments.h#2 delete
.. //depot/projects/scottl-camlock/src/sys/mips/include/sf_buf.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/include/trap.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/include/vmparam.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/malta/gt_pci.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/mips/autoconf.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/mips/busdma_machdep.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/mips/copystr.S#3 delete
.. //depot/projects/scottl-camlock/src/sys/mips/mips/exception.S#9 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/mips/fp.S#3 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/mips/genassym.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/mips/locore.S#7 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/mips/machdep.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/mips/mem.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/mips/mp_machdep.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/mips/mpboot.S#3 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/mips/nexus.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/mips/pmap.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/mips/psraccess.S#3 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/mips/support.S#5 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/mips/swtch.S#6 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/mips/tick.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/mips/tlb.S#3 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/mips/trap.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/mips/uio_machdep.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/mips/vm_machdep.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/rmi/clock.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/Makefile#49 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/cyclic/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/dummynet/Makefile#7 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/geom/Makefile#11 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/geom/geom_sched/Makefile#1 branch
.. //depot/projects/scottl-camlock/src/sys/modules/geom/geom_sched/Makefile.inc#1 branch
.. //depot/projects/scottl-camlock/src/sys/modules/geom/geom_sched/gs_sched/Makefile#1 branch
.. //depot/projects/scottl-camlock/src/sys/modules/geom/geom_sched/gsched_rr/Makefile#1 branch
.. //depot/projects/scottl-camlock/src/sys/modules/iwnfw/iwn6000/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/sge/Makefile#1 branch
.. //depot/projects/scottl-camlock/src/sys/modules/syscons/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/syscons/beastie/Makefile#1 branch
.. //depot/projects/scottl-camlock/src/sys/modules/uart/Makefile#9 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/wlan/Makefile#13 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if.c#45 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if_clone.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if_llatbl.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/net/vnet.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/net/vnet.h#14 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211.c#26 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_amrr.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_amrr.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_crypto_ccmp.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_crypto_tkip.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_freebsd.h#13 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_ioctl.c#20 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_node.c#19 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_node.h#15 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_ratectl.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_ratectl.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_rssadapt.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_rssadapt.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_scan_sta.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_var.h#23 integrate
.. //depot/projects/scottl-camlock/src/sys/netgraph/ng_pipe.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/netgraph/ng_pipe.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/if_ether.c#30 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/in.c#33 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/in_mcast.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ip_dummynet.h#15 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ip_input.c#31 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/dn_sched.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/dn_sched_rr.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/dn_sched_wf2q.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_dn_glue.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_dn_io.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_dn_private.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_dummynet.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_fw_pfil.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_fw_private.h#8 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_fw_sockopt.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctp_indata.c#21 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctputil.c#24 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/tcp_input.c#33 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/tcp_output.c#23 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/in6.c#32 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/mld6.c#21 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/nd6.c#31 integrate
.. //depot/projects/scottl-camlock/src/sys/netipsec/key.c#21 integrate
.. //depot/projects/scottl-camlock/src/sys/netncp/ncp_conn.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/netncp/ncp_conn.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/netncp/ncp_file.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/netncp/ncp_lib.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/netncp/ncp_login.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/netncp/ncp_ncp.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/netncp/ncp_ncp.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/netncp/ncp_nls.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/netncp/ncp_nls.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/netncp/ncp_rcfile.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/netncp/ncp_rq.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/netncp/ncp_rq.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/netncp/ncp_sock.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/netncp/ncp_sock.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/netncp/ncp_subr.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/netncp/ncp_subr.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/netncp/ncp_user.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/netsmb/netbios.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/netsmb/smb.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/netsmb/smb_conn.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/netsmb/smb_conn.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/netsmb/smb_dev.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/netsmb/smb_dev.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/netsmb/smb_iod.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/netsmb/smb_rq.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/netsmb/smb_rq.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/netsmb/smb_smb.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/netsmb/smb_subr.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/netsmb/smb_subr.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/netsmb/smb_tran.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/netsmb/smb_trantcp.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/netsmb/smb_trantcp.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/netsmb/smb_usr.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/pc98/cbus/clock.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/pci/if_rlreg.h#20 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/conf/GENERIC#32 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/conf/NOTES#14 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/include/dcr.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/include/lsu.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/pci/sbbc.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/ofw_machdep.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/trap.c#21 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/dtrace_bsd.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/iconv.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/mchain.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/proc.h#32 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/thr.h#12 integrate
.. //depot/projects/scottl-camlock/src/sys/ufs/ufs/ufs_lookup.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/memguard.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/memguard.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/pmap.h#14 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/swap_pager.c#23 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/vm_contig.c#20 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/vm_extern.h#18 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/vm_fault.c#31 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/vm_glue.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/vm_kern.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/vm_map.c#30 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/vm_map.h#14 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/vm_object.c#22 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/vm_pageout.c#20 integrate
.. //depot/projects/scottl-camlock/src/sys/x86/isa/clock.c#2 integrate
.. //depot/projects/scottl-camlock/src/tools/regression/bin/sh/expansion/plus-minus3.0#1 branch
.. //depot/projects/scottl-camlock/src/tools/regression/bin/sh/parameters/pwd1.0#1 branch
.. //depot/projects/scottl-camlock/src/tools/regression/bin/sh/parameters/pwd2.0#1 branch
.. //depot/projects/scottl-camlock/src/tools/regression/lib/libc/gen/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/tools/regression/lib/libc/gen/test-fnmatch.c#1 branch
.. //depot/projects/scottl-camlock/src/tools/tools/ath/common/dumpregs_5416.c#2 integrate
.. //depot/projects/scottl-camlock/src/tools/tools/nanobsd/nanobsd.sh#7 integrate
.. //depot/projects/scottl-camlock/src/tools/tools/netrate/tcpp/tcpp_client.c#2 integrate
.. //depot/projects/scottl-camlock/src/tools/tools/netrate/tcpp/tcpp_server.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/ar/ar.1#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/c89/c89.1#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/c99/c99.1#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/calendar/calendars/calendar.dutch#4 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/column/column.1#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/comm/comm.1#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/csup/cpasswd.1#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/csup/csup.1#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/enigma/enigma.1#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/gzip/gzip.1#4 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/gzip/gzip.c#7 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/gzip/unbzip2.c#5 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/hexdump/od.1#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/indent/lexi.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/killall/killall.1#6 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/lockf/lockf.1#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/tar/bsdtar.1#4 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/tar/bsdtar.c#4 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/tar/bsdtar_platform.h#5 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/tar/matching.c#4 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/tar/subst.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/tar/tree.h#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/tar/write.c#6 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/wtmpcvt/wtmpcvt.1#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/xlint/lint1/decl.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/xlint/lint1/lint1.h#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/xlint/lint1/mem1.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/asf/asf.8#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/burncd/burncd.8#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/config/config.h#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/config/configvers.h#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/config/mkoptions.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/ctm/ctm/ctm.1#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/ctm/ctm/ctm.5#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/devinfo/devinfo.8#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/fdformat/fdformat.1#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/fdread/fdread.1#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/fdwrite/fdwrite.1#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/fifolog/fifolog_create/fifolog.1#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/flowctl/flowctl.8#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/lastlogin/lastlogin.8#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/lastlogin/lastlogin.c#7 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/mtest/mtest.8#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/periodic/periodic.8#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/pmcannotate/pmcannotate.8#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/pmccontrol/pmccontrol.8#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/pmcstat/pmcpl_callgraph.c#4 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/pmcstat/pmcpl_calltree.c#5 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/pmcstat/pmcpl_gprof.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/pmcstat/pmcstat.8#5 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/pmcstat/pmcstat_log.c#8 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/pppctl/pppctl.8#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/sade/disks.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/sade/menus.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/setfmac/setfsmac.8#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/setpmac/setpmac.8#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/sysinstall/devices.c#8 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/sysinstall/disks.c#5 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/sysinstall/menus.c#8 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/sysinstall/tcpip.c#4 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/uhsoctl/uhsoctl.1#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5#4 integrate

Differences ...

==== //depot/projects/scottl-camlock/src/MAINTAINERS#11 (text+ko) ====

@@ -1,4 +1,4 @@
-$FreeBSD: src/MAINTAINERS,v 1.160 2010/03/26 12:59:15 des Exp $
+$FreeBSD: src/MAINTAINERS,v 1.162 2010/04/10 12:29:09 bms Exp $
 
 Please note that the content of this file is strictly advisory.
 No locks listed here are valid.  The only strict review requirements
@@ -123,6 +123,9 @@
 				maintained by a third party source.
 lib/libc/stdtime	edwin   Heads-up appreciated, since parts of this code
 				is maintained by a third party source.
+sysinstall	randi	Please contact about any major changes so that
+			they can be co-ordinated.
+sbin/routed	bms	Pre-commit review; notify vendor at rhyolite.com
 
 Following are the entries from the Makefiles, and a few other sources.
 Please remove stale entries from both their origin, and this file.

==== //depot/projects/scottl-camlock/src/Makefile.inc1#18 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile.inc1,v 1.642 2010/03/24 18:40:57 delphij Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.643 2010/04/14 18:56:07 imp Exp $
 #
 # Make command line options:
 #	-DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -15,6 +15,7 @@
 #	-DNO_CTF do not run the DTrace CTF conversion tools on built objects
 #	LOCAL_DIRS="list of dirs" to add additional dirs to the SUBDIR list
 #	TARGET="machine" to crossbuild world for a different machine type
+#	TARGET_ARCH= may be required when a TARGET supports multiple endians
 
 #
 # The intended user-driven targets are:

==== //depot/projects/scottl-camlock/src/ObsoleteFiles.inc#27 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.232 2010/03/27 03:17:39 marcel Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.234 2010/04/17 01:17:31 jmallett Exp $
 #
 # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
 # directories (OLD_DIRS) which should get removed at an update. Recently
@@ -14,6 +14,18 @@
 # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
 #
 
+# 20100416: [mips] removed <machine/psl.h>
+.if ${TARGET_ARCH} == "mips"
+OLD_FILES+=usr/include/machine/psl.h
+.endif
+# 20100415: [mips] removed unused headers
+.if ${TARGET_ARCH} == "mips"
+OLD_FILES+=usr/include/machine/archtype.h
+OLD_FILES+=usr/include/machine/segments.h
+OLD_FILES+=usr/include/machine/rm7000.h
+OLD_FILES+=usr/include/machine/defs.h
+OLD_FILES+=usr/include/machine/queue.h
+.endif
 # 20100326: [ia64] removed <machine/nexusvar.h>
 .if ${TARGET_ARCH} == "ia64"
 OLD_FILES+=usr/include/machine/nexusvar.h

==== //depot/projects/scottl-camlock/src/bin/ln/ln.c#4 (text+ko) ====

@@ -39,7 +39,7 @@
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/ln/ln.c,v 1.39 2009/07/19 17:35:23 jilles Exp $");
+__FBSDID("$FreeBSD: src/bin/ln/ln.c,v 1.41 2010/04/21 21:57:03 jilles Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
@@ -47,6 +47,7 @@
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <libgen.h>
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -172,6 +173,52 @@
 	exit(exitval);
 }
 
+/*
+ * Two pathnames refer to the same directory entry if the directories match
+ * and the final components' names match.
+ */
+static int
+samedirent(const char *path1, const char *path2)
+{
+	const char *file1, *file2;
+	char pathbuf[PATH_MAX];
+	struct stat sb1, sb2;
+
+	if (strcmp(path1, path2) == 0)
+		return 1;
+	file1 = strrchr(path1, '/');
+	if (file1 != NULL)
+		file1++;
+	else
+		file1 = path1;
+	file2 = strrchr(path2, '/');
+	if (file2 != NULL)
+		file2++;
+	else
+		file2 = path2;
+	if (strcmp(file1, file2) != 0)
+		return 0;
+	if (file1 - path1 >= PATH_MAX || file2 - path2 >= PATH_MAX)
+		return 0;
+	if (file1 == path1)
+		memcpy(pathbuf, ".", 2);
+	else {
+		memcpy(pathbuf, path1, file1 - path1);
+		pathbuf[file1 - path1] = '\0';
+	}
+	if (stat(pathbuf, &sb1) != 0)
+		return 0;
+	if (file2 == path2)
+		memcpy(pathbuf, ".", 2);
+	else {
+		memcpy(pathbuf, path2, file2 - path2);
+		pathbuf[file2 - path2] = '\0';
+	}
+	if (stat(pathbuf, &sb2) != 0)
+		return 0;
+	return sb1.st_dev == sb2.st_dev && sb1.st_ino == sb2.st_ino;
+}
+
 int
 linkit(const char *source, const char *target, int isdir)
 {
@@ -180,6 +227,7 @@
 	int ch, exists, first;
 	char path[PATH_MAX];
 	char wbuf[PATH_MAX];
+	char bbuf[PATH_MAX];
 
 	if (!sflag) {
 		/* If source doesn't exist, quit now. */
@@ -202,11 +250,9 @@
 	if (isdir ||
 	    (lstat(target, &sb) == 0 && S_ISDIR(sb.st_mode)) ||
 	    (!hflag && stat(target, &sb) == 0 && S_ISDIR(sb.st_mode))) {
-		if ((p = strrchr(source, '/')) == NULL)
-			p = source;
-		else
-			++p;
-		if (snprintf(path, sizeof(path), "%s/%s", target, p) >=
+		if (strlcpy(bbuf, source, sizeof(bbuf)) >= sizeof(bbuf) ||
+		    (p = basename(bbuf)) == NULL ||
+		    snprintf(path, sizeof(path), "%s/%s", target, p) >=
 		    (ssize_t)sizeof(path)) {
 			errno = ENAMETOOLONG;
 			warn("%s", source);
@@ -215,7 +261,6 @@
 		target = path;
 	}
 
-	exists = !lstat(target, &sb);
 	/*
 	 * If the link source doesn't exist, and a symbolic link was

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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201004220652.o3M6q8ri058087>