PERFORCE change 222360 for review
Brooks Davis
brooks at FreeBSD.org
Mon Feb 25 19:42:09 UTC 2013
http://p4web.freebsd.org/@@222360?ac=10
Change 222360 by brooks at brooks_zenith on 2013/02/25 19:41:39
IFC at 222359.
Affected files ...
.. //depot/projects/ctsrd/tesla/src/bin/sh/eval.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/bin/sh/jobs.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/bin/sh/main.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/bin/sh/trap.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/bin/sh/trap.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/bin/test/test.1#2 integrate
.. //depot/projects/ctsrd/tesla/src/bin/test/test.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/cddl/contrib/opensolaris/cmd/zinject/translate.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/cddl/contrib/opensolaris/cmd/zinject/zinject.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/contrib/binutils/gas/config/tc-i386.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/contrib/binutils/opcodes/i386-dis.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/contrib/binutils/opcodes/i386-opc.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/contrib/binutils/opcodes/i386-tbl.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/contrib/ldns/Changelog#2 integrate
.. //depot/projects/ctsrd/tesla/src/contrib/ldns/Makefile.in#2 integrate
.. //depot/projects/ctsrd/tesla/src/contrib/ldns/buffer.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/contrib/ldns/configure#2 integrate
.. //depot/projects/ctsrd/tesla/src/contrib/ldns/configure.ac#2 integrate
.. //depot/projects/ctsrd/tesla/src/contrib/ldns/dane.c#1 branch
.. //depot/projects/ctsrd/tesla/src/contrib/ldns/dname.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/contrib/ldns/dnssec.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/contrib/ldns/dnssec_sign.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/contrib/ldns/dnssec_verify.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/contrib/ldns/dnssec_zone.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/contrib/ldns/drill/Makefile.in#2 integrate
.. //depot/projects/ctsrd/tesla/src/contrib/ldns/drill/chasetrace.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/contrib/ldns/drill/config.h.in#2 integrate
.. //depot/projects/ctsrd/tesla/src/contrib/ldns/drill/configure#2 integrate
.. //depot/projects/ctsrd/tesla/src/contrib/ldns/drill/configure.ac#2 integrate
.. //depot/projects/ctsrd/tesla/src/contrib/ldns/drill/dnssec.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/contrib/ldns/drill/drill.1#2 delete
.. //depot/projects/ctsrd/tesla/src/contrib/ldns/drill/drill.1.in#1 branch
.. //depot/projects/ctsrd/tesla/src/contrib/ldns/drill/drill.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/contrib/ldns/drill/drill.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/contrib/ldns/drill/drill_util.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/contrib/ldns/drill/drill_util.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/contrib/ldns/drill/securetrace.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/contrib/ldns/drill/work.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/contrib/ldns/error.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/contrib/ldns/higher.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/contrib/ldns/host2str.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/contrib/ldns/host2wire.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/contrib/ldns/keys.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/contrib/ldns/ldns/buffer.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/contrib/ldns/ldns/common.h#1 branch
.. //depot/projects/ctsrd/tesla/src/contrib/ldns/ldns/common.h.in#2 integrate
.. //depot/projects/ctsrd/tesla/src/contrib/ldns/ldns/config.h#1 branch
.. //depot/projects/ctsrd/tesla/src/contrib/ldns/ldns/config.h.in#2 integrate
.. //depot/projects/ctsrd/tesla/src/contrib/ldns/ldns/dane.h#1 branch
.. //depot/projects/ctsrd/tesla/src/contrib/ldns/ldns/dname.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/contrib/ldns/ldns/dnssec.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/contrib/ldns/ldns/dnssec_verify.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/contrib/ldns/ldns/dnssec_zone.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/contrib/ldns/ldns/error.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/contrib/ldns/ldns/host2str.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/contrib/ldns/ldns/keys.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/contrib/ldns/ldns/ldns.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/contrib/ldns/ldns/net.h#1 branch
.. //depot/projects/ctsrd/tesla/src/contrib/ldns/ldns/rdata.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/contrib/ldns/ldns/resolver.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/contrib/ldns/ldns/rr.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/contrib/ldns/ldns/util.h#1 branch
.. //depot/projects/ctsrd/tesla/src/contrib/ldns/ldns/util.h.in#2 integrate
.. //depot/projects/ctsrd/tesla/src/contrib/ldns/ldns_symbols.def#2 delete
.. //depot/projects/ctsrd/tesla/src/contrib/ldns/libdns.doxygen#2 integrate
.. //depot/projects/ctsrd/tesla/src/contrib/ldns/net.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/contrib/ldns/packet.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/contrib/ldns/parse.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/contrib/ldns/resolver.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/contrib/ldns/rr.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/contrib/ldns/str2host.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/contrib/ldns/tsig.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/contrib/ldns/util.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/contrib/ldns/zone.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/contrib/llvm/lib/MC/MCParser/AsmParser.cpp#2 integrate
.. //depot/projects/ctsrd/tesla/src/contrib/llvm/lib/Target/X86/X86InstrCompiler.td#2 integrate
.. //depot/projects/ctsrd/tesla/src/contrib/llvm/lib/Target/X86/X86SelectionDAGInfo.cpp#2 integrate
.. //depot/projects/ctsrd/tesla/src/contrib/llvm/tools/clang/lib/Driver/Tools.cpp#2 integrate
.. //depot/projects/ctsrd/tesla/src/contrib/llvm/tools/clang/lib/Driver/Tools.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/contrib/nvi/ex/ex_txt.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/contrib/nvi/vi/v_txt.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/contrib/openbsm/bin/auditdistd/token.l#2 integrate
.. //depot/projects/ctsrd/tesla/src/contrib/opie/opiekey.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/contrib/sendmail/src/milter.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/contrib/wpa/src/crypto/md5-internal.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/crypto/heimdal/kcm/cache.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/etc/Makefile#2 integrate
.. //depot/projects/ctsrd/tesla/src/etc/rc.d/rtadvd#2 integrate
.. //depot/projects/ctsrd/tesla/src/etc/rc.resume#2 integrate
.. //depot/projects/ctsrd/tesla/src/gnu/lib/libstdc++/config.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/gnu/usr.bin/gdb/kgdb/kgdb.1#2 integrate
.. //depot/projects/ctsrd/tesla/src/gnu/usr.bin/gdb/kgdb/kgdb.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/gnu/usr.bin/gdb/kgdb/kthr.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/gnu/usr.bin/gdb/kgdb/main.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/gnu/usr.bin/gdb/kgdb/trgt.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/gnu/usr.bin/gdb/kgdb/trgt_amd64.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/gnu/usr.bin/gdb/kgdb/trgt_arm.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/gnu/usr.bin/gdb/kgdb/trgt_i386.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/gnu/usr.bin/gdb/kgdb/trgt_ia64.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/gnu/usr.bin/gdb/kgdb/trgt_mips.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/gnu/usr.bin/gdb/kgdb/trgt_powerpc.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/gnu/usr.bin/gdb/kgdb/trgt_powerpc64.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/gnu/usr.bin/gdb/kgdb/trgt_sparc64.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/lib/libc/gen/Makefile.inc#2 integrate
.. //depot/projects/ctsrd/tesla/src/lib/libc/gen/opendir.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/lib/libc/gen/sem_new.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/lib/libc/stdio/setbuf.3#2 integrate
.. //depot/projects/ctsrd/tesla/src/lib/libc/stdlib/bsearch.3#2 integrate
.. //depot/projects/ctsrd/tesla/src/lib/libc/stdlib/qsort.3#2 integrate
.. //depot/projects/ctsrd/tesla/src/lib/libc/sys/Makefile.inc#2 integrate
.. //depot/projects/ctsrd/tesla/src/lib/libelf/elf_data.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/lib/libelf/elf_getdata.3#2 integrate
.. //depot/projects/ctsrd/tesla/src/lib/libelf/elf_update.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/lib/libldns/Makefile#2 integrate
.. //depot/projects/ctsrd/tesla/src/lib/libsm/Makefile#2 integrate
.. //depot/projects/ctsrd/tesla/src/lib/libstand/Makefile#2 integrate
.. //depot/projects/ctsrd/tesla/src/lib/libstand/stand.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/lib/libstand/strtoul.c#1 branch
.. //depot/projects/ctsrd/tesla/src/libexec/mail.local/Makefile#2 integrate
.. //depot/projects/ctsrd/tesla/src/libexec/smrsh/Makefile#2 integrate
.. //depot/projects/ctsrd/tesla/src/release/picobsd/bridge/crunch.conf#2 integrate
.. //depot/projects/ctsrd/tesla/src/release/picobsd/qemu/crunch.conf#2 integrate
.. //depot/projects/ctsrd/tesla/src/sbin/devd/devd.conf.5#2 integrate
.. //depot/projects/ctsrd/tesla/src/sbin/fsck_ffs/dir.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sbin/fsck_ffs/ea.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sbin/fsck_ffs/fsck.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/sbin/fsck_ffs/fsutil.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sbin/fsck_ffs/inode.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sbin/fsck_ffs/main.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sbin/fsck_ffs/setup.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sbin/fsdb/fsdbutil.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sbin/hastd/hast.conf.5#2 integrate
.. //depot/projects/ctsrd/tesla/src/sbin/hastd/hast.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/sbin/hastd/hast_proto.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sbin/hastd/hastd.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sbin/hastd/parse.y#2 integrate
.. //depot/projects/ctsrd/tesla/src/sbin/hastd/primary.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sbin/hastd/refcnt.h#1 branch
.. //depot/projects/ctsrd/tesla/src/sbin/hastd/secondary.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/share/man/man4/carp.4#2 integrate
.. //depot/projects/ctsrd/tesla/src/share/man/man5/group.5#2 integrate
.. //depot/projects/ctsrd/tesla/src/share/man/man9/VFS_SET.9#2 integrate
.. //depot/projects/ctsrd/tesla/src/share/mk/bsd.lib.mk#3 integrate
.. //depot/projects/ctsrd/tesla/src/share/mk/bsd.libnames.mk#2 integrate
.. //depot/projects/ctsrd/tesla/src/share/mk/bsd.sys.mk#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/amd64/acpica/acpi_machdep.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/amd64/amd64/pmap.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/amd64/include/elf.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/amd64/include/frame.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/amd64/include/sigframe.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/amd64/include/signal.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/amd64/include/ucontext.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/arm/allwinner/a10_clk.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/arm/allwinner/a10_clk.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/arm/allwinner/a10_ehci.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/arm/allwinner/a10_gpio.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/arm/arm/busdma_machdep-v6.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/arm/arm/busdma_machdep.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/arm/arm/machdep.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/arm/arm/pmap-v6.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/arm/arm/pmap.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/arm/at91/at91_machdep.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/arm/broadcom/bcm2835/bcm2835_vcbus.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/arm/econa/econa_machdep.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/arm/include/pmap.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/arm/include/vmparam.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/arm/s3c2xx0/s3c24x0_machdep.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/arm/sa11x0/assabet_machdep.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/arm/ti/ti_cpuid.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/arm/ti/ti_gpio.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/arm/xscale/i80321/ep80219_machdep.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/arm/xscale/i80321/iq31244_machdep.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/arm/xscale/i8134x/crb_machdep.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/arm/xscale/ixp425/avila_machdep.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/arm/xscale/pxa/pxa_machdep.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/boot/common/bootstrap.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/boot/common/module.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/boot/fdt/dts/bcm2835-rpi-b.dts#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/boot/fdt/dts/cubieboard.dts#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/boot/fdt/fdt_loader_cmd.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/boot/uboot/lib/copy.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/boot/uboot/lib/elf_freebsd.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/boot/userboot/userboot/elf32_freebsd.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/cam/ata/ata_pmp.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/cam/scsi/scsi_da.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/cddl/compat/opensolaris/sys/time.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/lzjb.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/refcount.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sa.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_boot.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fuid.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/conf/files#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/changes.txt#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/common/adisasm.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/common/adwalk.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/common/dmextern.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/common/dmtable.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/common/dmtbdump.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/common/dmtbinfo.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/compiler/aslcompile.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/compiler/aslcompiler.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/compiler/asldefine.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/compiler/aslfiles.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/compiler/aslmain.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/compiler/aslmessages.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/compiler/aslpredef.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/compiler/aslprepkg.c#1 branch
.. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/compiler/aslstartup.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/compiler/aslsupport.l#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/compiler/dtcompiler.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/compiler/dttable.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/compiler/dttemplate.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/components/debugger/dbcmds.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/components/debugger/dbinput.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/components/dispatcher/dsutils.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/components/events/evevent.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/components/events/evgpe.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/components/events/evsci.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/components/events/evxface.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/components/events/evxfevnt.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/components/executer/exprep.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/components/executer/exutils.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/components/hardware/hwacpi.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/components/namespace/nsconvert.c#1 branch
.. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/components/namespace/nspredef.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/components/namespace/nsprepkg.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/components/namespace/nsrepair.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/components/namespace/nsrepair2.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/components/namespace/nsutils.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/components/parser/psargs.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/components/resources/rscalc.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/components/resources/rsdump.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/components/resources/rslist.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/components/resources/rsxface.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/components/utilities/utaddress.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/components/utilities/utexcep.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/components/utilities/utglobal.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/include/acdisasm.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/include/acexcep.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/include/acglobal.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/include/aclocal.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/include/acnamesp.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/include/acoutput.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/include/acpixf.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/include/actbl2.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/include/actbl3.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/contrib/dev/acpica/include/acutils.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/crypto/aesni/aesni_wrap.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/dev/ata/ata-all.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/dev/ata/ata-all.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/dev/ata/ata-dma.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/dev/ath/if_ath.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/dev/ath/if_ath_alq.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/dev/ath/if_ath_rx.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/dev/ath/if_ath_sysctl.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/dev/ath/if_ath_tx.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/dev/ath/if_ath_tx.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/dev/ath/if_ath_tx_ht.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/dev/ath/if_athvar.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/dev/ciss/ciss.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/dev/coretemp/coretemp.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/dev/cxgbe/common/t4_hw.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/dev/cxgbe/t4_main.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/dev/cxgbe/t4_sge.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/dev/dcons/dcons_os.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/dev/e1000/e1000_82571.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/dev/e1000/e1000_82575.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/dev/e1000/e1000_82575.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/dev/e1000/e1000_api.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/dev/e1000/e1000_api.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/dev/e1000/e1000_defines.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/dev/e1000/e1000_hw.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/dev/e1000/e1000_i210.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/dev/e1000/e1000_i210.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/dev/e1000/e1000_ich8lan.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/dev/e1000/e1000_ich8lan.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/dev/e1000/e1000_mac.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/dev/e1000/e1000_mac.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/dev/e1000/e1000_manage.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/dev/e1000/e1000_nvm.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/dev/e1000/e1000_nvm.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/dev/e1000/e1000_osdep.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/dev/e1000/e1000_phy.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/dev/e1000/e1000_phy.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/dev/e1000/e1000_regs.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/dev/e1000/if_em.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/dev/e1000/if_igb.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/dev/e1000/if_lem.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/dev/fdt/fdt_common.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/dev/firewire/sbp.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/dev/isp/isp.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/dev/ixgbe/ixgbe_phy.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/dev/led/led.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/dev/mcd/mcd.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/dev/mxge/if_mxge.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/dev/mxge/if_mxge_var.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/dev/mxge/mxge_lro.c#2 delete
.. //depot/projects/ctsrd/tesla/src/sys/dev/ppc/ppc.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/dev/ppc/ppc_isa.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/dev/sdhci/sdhci.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/dev/sdhci/sdhci.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/dev/sdhci/sdhci_if.m#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/dev/si/si.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/dev/sound/pci/hda/hdaa.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/dev/sym/sym_hipd.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/dev/usb/usb_pf.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/dev/usb/usbdevs#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/dev/usb/wlan/if_upgt.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/dev/usb/wlan/if_upgtvar.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/fs/msdosfs/msdosfs_fat.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/fs/msdosfs/msdosfs_vfsops.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/fs/msdosfs/msdosfsmount.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/fs/nfs/nfs_commonkrpc.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/fs/nfsclient/nfs_clstate.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/fs/nfsclient/nfs_clvfsops.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/geom/geom_vfs.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/i386/acpica/acpi_machdep.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/i386/i386/pmap.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/i386/include/elf.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/i386/include/frame.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/i386/include/sigframe.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/i386/include/signal.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/i386/include/ucontext.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/i386/isa/pmtimer.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/i386/xen/pmap.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/ia64/conf/GENERIC#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/ia64/ia64/mem.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/ia64/ia64/pmap.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/ia64/ia64/syscall.S#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/ia64/include/vmparam.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/kern/kern_descrip.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/kern/kern_fork.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/kern/kern_sig.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/kern/kern_thread.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/kern/subr_trap.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/kern/subr_turnstile.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/kern/sys_capability.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/kern/sys_pipe.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/kern/vfs_bio.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/kern/vfs_cluster.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/kern/vfs_export.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/kern/vfs_init.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/kern/vfs_lookup.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/kern/vfs_syscalls.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/modules/acpi/acpi/Makefile#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/modules/mxge/mxge/Makefile#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/net80211/ieee80211_adhoc.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/net80211/ieee80211_mesh.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/netinet/ip_input.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/netinet/tcp_lro.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/nfsclient/nfs_krpc.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/nfsclient/nfs_vfsops.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/opencrypto/xform.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/pci/ncr.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/powerpc/include/vmparam.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/security/audit/audit_bsm.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/sys/buf.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/sys/filedesc.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/sys/mount.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/sys/namei.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/sys/protosw.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/sys/signalvar.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/sys/systm.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/tools/vnode_if.awk#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/ufs/ffs/ffs_alloc.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/vm/vm_kern.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/x86/include/elf.h#1 branch
.. //depot/projects/ctsrd/tesla/src/sys/x86/include/frame.h#1 branch
.. //depot/projects/ctsrd/tesla/src/sys/x86/include/sigframe.h#1 branch
.. //depot/projects/ctsrd/tesla/src/sys/x86/include/signal.h#1 branch
.. //depot/projects/ctsrd/tesla/src/sys/x86/include/ucontext.h#1 branch
.. //depot/projects/ctsrd/tesla/src/sys/x86/isa/atrtc.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/sys/x86/isa/clock.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/tools/regression/bin/sh/builtins/read6.0#1 branch
.. //depot/projects/ctsrd/tesla/src/tools/regression/bin/sh/builtins/wait4.0#1 branch
.. //depot/projects/ctsrd/tesla/src/tools/regression/bin/sh/builtins/wait5.0#1 branch
.. //depot/projects/ctsrd/tesla/src/tools/regression/bin/test/regress.sh#2 integrate
.. //depot/projects/ctsrd/tesla/src/tools/tools/ath/athalq/Makefile#2 integrate
.. //depot/projects/ctsrd/tesla/src/tools/tools/ath/athalq/ar5416_ds.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/tools/tools/ath/athalq/main.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/tools/tools/ath/athalq/tdma.c#1 branch
.. //depot/projects/ctsrd/tesla/src/tools/tools/ath/athalq/tdma.h#1 branch
.. //depot/projects/ctsrd/tesla/src/tools/tools/netmap/Makefile#2 integrate
.. //depot/projects/ctsrd/tesla/src/tools/tools/netmap/bridge.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/tools/tools/netmap/nm_util.c#1 branch
.. //depot/projects/ctsrd/tesla/src/tools/tools/netmap/nm_util.h#1 branch
.. //depot/projects/ctsrd/tesla/src/tools/tools/netmap/pcap.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/tools/tools/netmap/pkt-gen.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/usr.bin/dtc/input_buffer.cc#2 integrate
.. //depot/projects/ctsrd/tesla/src/usr.bin/grep/regex/tre-fastmatch.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/usr.bin/keylogin/keylogin.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/usr.bin/mail/util.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/usr.bin/netstat/inet.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/usr.bin/netstat/inet6.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/usr.bin/netstat/main.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/usr.bin/netstat/netisr.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/usr.bin/netstat/sctp.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/usr.bin/netstat/unix.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/usr.bin/systat/ifcmds.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/usr.bin/systat/ifstat.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/usr.bin/systat/main.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/usr.bin/systat/systat.1#2 integrate
.. //depot/projects/ctsrd/tesla/src/usr.bin/vacation/Makefile#2 integrate
.. //depot/projects/ctsrd/tesla/src/usr.sbin/acpi/acpidb/Makefile#2 integrate
.. //depot/projects/ctsrd/tesla/src/usr.sbin/acpi/iasl/Makefile#2 integrate
.. //depot/projects/ctsrd/tesla/src/usr.sbin/bhyve/mem.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/usr.sbin/bhyve/mem.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/usr.sbin/bhyve/pci_emul.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/usr.sbin/bsdconfig/startup/rcvar#2 integrate
.. //depot/projects/ctsrd/tesla/src/usr.sbin/extattr/rmextattr.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/usr.sbin/makefs/makefs.8#2 integrate
.. //depot/projects/ctsrd/tesla/src/usr.sbin/makefs/makefs.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/usr.sbin/makefs/makefs.h#2 integrate
.. //depot/projects/ctsrd/tesla/src/usr.sbin/makefs/mtree.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/usr.sbin/makefs/walk.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/usr.sbin/mountd/mountd.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/usr.sbin/pkg/pkg.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/usr.sbin/rtadvd/rtadvd.8#2 integrate
.. //depot/projects/ctsrd/tesla/src/usr.sbin/rtadvd/rtadvd.c#2 integrate
.. //depot/projects/ctsrd/tesla/src/usr.sbin/sendmail/Makefile#2 integrate
Differences ...
==== //depot/projects/ctsrd/tesla/src/bin/sh/eval.c#2 (text+ko) ====
@@ -36,7 +36,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/bin/sh/eval.c 246288 2013-02-03 15:54:57Z jilles $");
+__FBSDID("$FreeBSD: head/bin/sh/eval.c 247206 2013-02-23 22:50:57Z jilles $");
#include <paths.h>
#include <signal.h>
@@ -174,6 +174,7 @@
any = 1;
}
popstackmark(&smark);
+ setstackmark(&smark);
}
popfile();
popstackmark(&smark);
@@ -296,10 +297,11 @@
}
n = next;
popstackmark(&smark);
+ setstackmark(&smark);
} while (n != NULL);
out:
popstackmark(&smark);
- if (pendingsigs)
+ if (pendingsig)
dotrap();
if (eflag && exitstatus != 0 && do_etest)
exitshell(exitstatus);
==== //depot/projects/ctsrd/tesla/src/bin/sh/jobs.c#2 (text+ko) ====
@@ -36,7 +36,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/bin/sh/jobs.c 246495 2013-02-07 19:00:54Z delphij $");
+__FBSDID("$FreeBSD: head/bin/sh/jobs.c 247206 2013-02-23 22:50:57Z jilles $");
#include <sys/ioctl.h>
#include <sys/param.h>
@@ -521,7 +521,7 @@
} while (dowait(DOWAIT_BLOCK | DOWAIT_SIG, (struct job *)NULL) != -1);
in_waitcmd--;
- return 0;
+ return pendingsig + 128;
}
==== //depot/projects/ctsrd/tesla/src/bin/sh/main.c#2 (text+ko) ====
@@ -42,7 +42,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/bin/sh/main.c 245689 2013-01-20 12:44:50Z jilles $");
+__FBSDID("$FreeBSD: head/bin/sh/main.c 247206 2013-02-23 22:50:57Z jilles $");
#include <stdio.h>
#include <signal.h>
@@ -196,7 +196,7 @@
TRACE(("cmdloop(%d) called\n", top));
setstackmark(&smark);
for (;;) {
- if (pendingsigs)
+ if (pendingsig)
dotrap();
inter = 0;
if (iflag && top) {
==== //depot/projects/ctsrd/tesla/src/bin/sh/trap.c#2 (text+ko) ====
@@ -36,7 +36,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/bin/sh/trap.c 238888 2012-07-29 18:04:38Z jilles $");
+__FBSDID("$FreeBSD: head/bin/sh/trap.c 247206 2013-02-23 22:50:57Z jilles $");
#include <signal.h>
#include <unistd.h>
@@ -73,7 +73,7 @@
MKINIT char sigmode[NSIG]; /* current value of signal */
-int pendingsigs; /* indicates some signal received */
+volatile sig_atomic_t pendingsig; /* indicates some signal received */
int in_dotrap; /* do we execute in a trap handler? */
static char *volatile trap[NSIG]; /* trap handler commands */
static volatile sig_atomic_t gotsig[NSIG];
@@ -388,22 +388,25 @@
return;
}
- if (signo != SIGCHLD || !ignore_sigchld)
+ /* If we are currently in a wait builtin, prepare to break it */
+ if ((signo == SIGINT || signo == SIGQUIT) && in_waitcmd != 0) {
+ breakwaitcmd = 1;
+ pendingsig = signo;
+ }
+
+ if (trap[signo] != NULL && trap[signo][0] != '\0' &&
+ (signo != SIGCHLD || !ignore_sigchld)) {
gotsig[signo] = 1;
- pendingsigs++;
+ pendingsig = signo;
- /* If we are currently in a wait builtin, prepare to break it */
- if ((signo == SIGINT || signo == SIGQUIT) && in_waitcmd != 0)
- breakwaitcmd = 1;
- /*
- * If a trap is set, not ignored and not the null command, we need
- * to make sure traps are executed even when a child blocks signals.
- */
- if (Tflag &&
- trap[signo] != NULL &&
- ! (trap[signo][0] == '\0') &&
- ! (trap[signo][0] == ':' && trap[signo][1] == '\0'))
- breakwaitcmd = 1;
+ /*
+ * If a trap is set, not ignored and not the null command, we
+ * need to make sure traps are executed even when a child
+ * blocks signals.
+ */
+ if (Tflag && !(trap[signo][0] == ':' && trap[signo][1] == '\0'))
+ breakwaitcmd = 1;
+ }
#ifndef NO_HISTORY
if (signo == SIGWINCH)
@@ -424,7 +427,7 @@
in_dotrap++;
for (;;) {
- pendingsigs = 0;
+ pendingsig = 0;
for (i = 1; i < NSIG; i++) {
if (gotsig[i]) {
gotsig[i] = 0;
==== //depot/projects/ctsrd/tesla/src/bin/sh/trap.h#2 (text+ko) ====
@@ -30,10 +30,10 @@
* SUCH DAMAGE.
*
* @(#)trap.h 8.3 (Berkeley) 6/5/95
- * $FreeBSD: head/bin/sh/trap.h 238888 2012-07-29 18:04:38Z jilles $
+ * $FreeBSD: head/bin/sh/trap.h 247206 2013-02-23 22:50:57Z jilles $
*/
-extern int pendingsigs;
+extern volatile sig_atomic_t pendingsig;
extern int in_dotrap;
extern volatile sig_atomic_t gotwinch;
==== //depot/projects/ctsrd/tesla/src/bin/test/test.1#2 (text+ko) ====
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)test.1 8.1 (Berkeley) 5/31/93
-.\" $FreeBSD: head/bin/test/test.1 244734 2012-12-27 13:21:37Z jilles $
+.\" $FreeBSD: head/bin/test/test.1 247274 2013-02-25 19:05:40Z peterj $
.\"
.Dd December 27, 2012
.Dt TEST 1
@@ -169,15 +169,65 @@
.Ar file
exists and is a socket.
.It Ar file1 Fl nt Ar file2
-True if
+True if both
+.Ar file1
+and
+.Ar file2
+exist and
+.Ar file1
+is newer than
+.Ar file2 .
+.It Ar file1 Fl nt Ns Ar X Ns Ar Y Ar file2
+True if both
+.Ar file1
+and
+.Ar file2
+exist and
.Ar file1
-exists and is newer than
+has a more recent last access time
+.Pq Ar X Ns = Ns Cm a ,
+inode creation time
+.Pq Ar X Ns = Ns Cm b ,
+change time
+.Pq Ar X Ns = Ns Cm c ,
+or modification time
+.Pq Ar X Ns = Ns Cm m
+than the last access time
+.Pq Ar Y Ns = Ns Cm a ,
+inode creation time
+.Pq Ar Y Ns = Ns Cm b ,
+change time
+.Pq Ar Y Ns = Ns Cm c ,
+or modification time
+.Pq Ar Y Ns = Ns Cm m
+of
.Ar file2 .
+Note that
+.Ic -ntmm
+is equivalent to
+.Ic -nt .
.It Ar file1 Fl ot Ar file2
-True if
+True if both
+.Ar file1
+and
+.Ar file2
+exist and
.Ar file1
-exists and is older than
+is older than
.Ar file2 .
+Note that
+.Ar file1
+.Ic -ot
+.Ar file2
+is equivalent to
+.Ar file2
+.Ic -nt
+.Ar file1
+.It Ar file1 Fl ot Ns Ar X Ns Ar Y Ar file2
+Equivalent to
+.Ar file2
+.Ic -nt Ns Ar Y Ns Ar X
+.Ar file1 .
.It Ar file1 Fl ef Ar file2
True if
.Ar file1
==== //depot/projects/ctsrd/tesla/src/bin/test/test.c#2 (text+ko) ====
@@ -15,7 +15,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/bin/test/test.c 227984 2011-11-25 23:45:29Z jilles $");
+__FBSDID("$FreeBSD: head/bin/test/test.c 247274 2013-02-25 19:05:40Z peterj $");
#include <sys/types.h>
#include <sys/stat.h>
@@ -63,7 +63,7 @@
"-u"|"-g"|"-k"|"-s"|"-t"|"-z"|"-n"|"-o"|"-O"|"-G"|"-L"|"-S";
binary-operator ::= "="|"!="|"-eq"|"-ne"|"-ge"|"-gt"|"-le"|"-lt"|
- "-nt"|"-ot"|"-ef";
+ "-nt"|"-nt[abcm][abcm]"|"-ot"|"-ot[abcm][abcm])"|"-ef";
operand ::= <any legal UNIX file name>
*/
@@ -85,8 +85,38 @@
FILSUID,
FILSGID,
FILSTCK,
- FILNT,
- FILOT,
+ FILNTAA,
+ FILNTAB,
+ FILNTAC,
+ FILNTAM,
+ FILNTBA,
+ FILNTBB,
+ FILNTBC,
+ FILNTBM,
+ FILNTCA,
+ FILNTCB,
+ FILNTCC,
+ FILNTCM,
+ FILNTMA,
+ FILNTMB,
+ FILNTMC,
+ FILNTMM,
+ FILOTAA,
+ FILOTAB,
+ FILOTAC,
+ FILOTAM,
+ FILOTBA,
+ FILOTBB,
+ FILOTBC,
+ FILOTBM,
+ FILOTCA,
+ FILOTCB,
+ FILOTCC,
+ FILOTCM,
+ FILOTMA,
+ FILOTMB,
+ FILOTMC,
+ FILOTMM,
FILEQ,
FILUID,
FILGID,
@@ -118,9 +148,16 @@
PAREN
};
+enum time_types {
+ ATIME,
+ BTIME,
+ CTIME,
+ MTIME
+};
+
static struct t_op {
- char op_text[4];
- short op_num, op_type;
+ char op_text[6];
+ char op_num, op_type;
} const ops [] = {
{"-r", FILRD, UNOP},
{"-w", FILWR, UNOP},
@@ -154,8 +191,40 @@
{"-gt", INTGT, BINOP},
{"-le", INTLE, BINOP},
{"-lt", INTLT, BINOP},
- {"-nt", FILNT, BINOP},
- {"-ot", FILOT, BINOP},
+ {"-nt", FILNTMM, BINOP},
+ {"-ntaa", FILNTAA, BINOP},
+ {"-ntab", FILNTAB, BINOP},
+ {"-ntac", FILNTAC, BINOP},
+ {"-ntam", FILNTAM, BINOP},
+ {"-ntba", FILNTBA, BINOP},
+ {"-ntbb", FILNTBB, BINOP},
+ {"-ntbc", FILNTBC, BINOP},
+ {"-ntbm", FILNTBM, BINOP},
+ {"-ntca", FILNTCA, BINOP},
+ {"-ntcb", FILNTCB, BINOP},
+ {"-ntcc", FILNTCC, BINOP},
+ {"-ntcm", FILNTCM, BINOP},
+ {"-ntma", FILNTMA, BINOP},
+ {"-ntmb", FILNTMB, BINOP},
+ {"-ntmc", FILNTMC, BINOP},
+ {"-ntmm", FILNTMM, BINOP},
+ {"-ot", FILOTMM, BINOP},
+ {"-otaa", FILOTAA, BINOP},
+ {"-otab", FILOTBB, BINOP},
+ {"-otac", FILOTAC, BINOP},
+ {"-otam", FILOTAM, BINOP},
+ {"-otba", FILOTBA, BINOP},
+ {"-otbb", FILOTBB, BINOP},
+ {"-otbc", FILOTBC, BINOP},
+ {"-otbm", FILOTBM, BINOP},
+ {"-otca", FILOTCA, BINOP},
+ {"-otcb", FILOTCB, BINOP},
+ {"-otcc", FILOTCC, BINOP},
+ {"-otcm", FILOTCM, BINOP},
+ {"-otma", FILOTMA, BINOP},
+ {"-otmb", FILOTMB, BINOP},
+ {"-otmc", FILOTMC, BINOP},
+ {"-otmm", FILOTMM, BINOP},
{"-ef", FILEQ, BINOP},
{"!", UNOT, BUNOP},
{"-a", BAND, BBINOP},
@@ -180,10 +249,10 @@
static int isunopoperand(void);
static int islparenoperand(void);
static int isrparenoperand(void);
-static int newerf(const char *, const char *);
+static int newerf(const char *, const char *, enum time_types,
+ enum time_types);
static int nexpr(enum token);
static int oexpr(enum token);
-static int olderf(const char *, const char *);
static int primary(enum token);
static void syntax(const char *, const char *);
static enum token t_lex(char *);
@@ -353,10 +422,70 @@
return intcmp(opnd1, opnd2) <= 0;
case INTLT:
return intcmp(opnd1, opnd2) < 0;
- case FILNT:
- return newerf (opnd1, opnd2);
- case FILOT:
- return olderf (opnd1, opnd2);
+ case FILNTAA:
+ return newerf(opnd1, opnd2, ATIME, ATIME);
+ case FILNTAB:
+ return newerf(opnd1, opnd2, ATIME, BTIME);
+ case FILNTAC:
+ return newerf(opnd1, opnd2, ATIME, CTIME);
+ case FILNTAM:
+ return newerf(opnd1, opnd2, ATIME, MTIME);
+ case FILNTBA:
+ return newerf(opnd1, opnd2, BTIME, ATIME);
+ case FILNTBB:
+ return newerf(opnd1, opnd2, BTIME, BTIME);
+ case FILNTBC:
+ return newerf(opnd1, opnd2, BTIME, CTIME);
+ case FILNTBM:
+ return newerf(opnd1, opnd2, BTIME, MTIME);
+ case FILNTCA:
+ return newerf(opnd1, opnd2, CTIME, ATIME);
+ case FILNTCB:
+ return newerf(opnd1, opnd2, CTIME, BTIME);
+ case FILNTCC:
+ return newerf(opnd1, opnd2, CTIME, CTIME);
+ case FILNTCM:
+ return newerf(opnd1, opnd2, CTIME, MTIME);
+ case FILNTMA:
+ return newerf(opnd1, opnd2, MTIME, ATIME);
+ case FILNTMB:
+ return newerf(opnd1, opnd2, MTIME, BTIME);
+ case FILNTMC:
+ return newerf(opnd1, opnd2, MTIME, CTIME);
+ case FILNTMM:
+ return newerf(opnd1, opnd2, MTIME, MTIME);
+ case FILOTAA:
+ return newerf(opnd2, opnd1, ATIME, ATIME);
+ case FILOTAB:
+ return newerf(opnd2, opnd1, BTIME, ATIME);
+ case FILOTAC:
+ return newerf(opnd2, opnd1, CTIME, ATIME);
+ case FILOTAM:
+ return newerf(opnd2, opnd1, MTIME, ATIME);
+ case FILOTBA:
+ return newerf(opnd2, opnd1, ATIME, BTIME);
+ case FILOTBB:
+ return newerf(opnd2, opnd1, BTIME, BTIME);
+ case FILOTBC:
+ return newerf(opnd2, opnd1, CTIME, BTIME);
+ case FILOTBM:
+ return newerf(opnd2, opnd1, MTIME, BTIME);
+ case FILOTCA:
+ return newerf(opnd2, opnd1, ATIME, CTIME);
+ case FILOTCB:
+ return newerf(opnd2, opnd1, BTIME, CTIME);
+ case FILOTCC:
+ return newerf(opnd2, opnd1, CTIME, CTIME);
+ case FILOTCM:
+ return newerf(opnd2, opnd1, MTIME, CTIME);
+ case FILOTMA:
+ return newerf(opnd2, opnd1, ATIME, MTIME);
+ case FILOTMB:
+ return newerf(opnd2, opnd1, BTIME, MTIME);
+ case FILOTMC:
+ return newerf(opnd2, opnd1, CTIME, MTIME);
+ case FILOTMM:
+ return newerf(opnd2, opnd1, MTIME, MTIME);
case FILEQ:
return equalf (opnd1, opnd2);
default:
@@ -570,25 +699,34 @@
}
static int
-newerf (const char *f1, const char *f2)
+newerf (const char *f1, const char *f2, enum time_types t1, enum time_types t2)
{
struct stat b1, b2;
+ struct timespec *ts1, *ts2;
if (stat(f1, &b1) != 0 || stat(f2, &b2) != 0)
return 0;
- if (b1.st_mtim.tv_sec > b2.st_mtim.tv_sec)
+ switch (t1) {
+ case ATIME: ts1 = &b1.st_atim; break;
+ case BTIME: ts1 = &b1.st_birthtim; break;
+ case CTIME: ts1 = &b1.st_ctim; break;
+ default: ts1 = &b1.st_mtim; break;
+ }
+
+ switch (t2) {
+ case ATIME: ts2 = &b2.st_atim; break;
+ case BTIME: ts2 = &b2.st_birthtim; break;
+ case CTIME: ts2 = &b2.st_ctim; break;
+ default: ts2 = &b2.st_mtim; break;
+ }
+
+ if (ts1->tv_sec > ts2->tv_sec)
return 1;
- if (b1.st_mtim.tv_sec < b2.st_mtim.tv_sec)
+ if (ts1->tv_sec < ts2->tv_sec)
return 0;
- return (b1.st_mtim.tv_nsec > b2.st_mtim.tv_nsec);
-}
-
-static int
-olderf (const char *f1, const char *f2)
-{
- return (newerf(f2, f1));
+ return (ts1->tv_nsec > ts2->tv_nsec);
}
static int
==== //depot/projects/ctsrd/tesla/src/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c#2 (text+ko) ====
@@ -195,6 +195,13 @@
verror(fmt, ap);
va_end(ap);
+ /*
+ * Close the DTrace handle to ensure that any controlled processes are
+ * correctly restored and continued.
+ */
+ if (g_dtp)
+ dtrace_close(g_dtp);
+
exit(E_ERROR);
}
==== //depot/projects/ctsrd/tesla/src/cddl/contrib/opensolaris/cmd/zinject/translate.c#2 (text+ko) ====
@@ -20,6 +20,7 @@
*/
/*
* Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012 by Delphix. All rights reserved.
*/
#include <libzfs.h>
@@ -455,6 +456,20 @@
&record->zi_guid) == 0);
}
+ /*
+ * Device faults can take on three different forms:
+ * 1). delayed or hanging I/O
+ * 2). zfs label faults
+ * 3). generic disk faults
+ */
+ if (record->zi_timer != 0) {
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list