Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 18 Apr 2008 17:58:10 GMT
From:      Peter Wemm <peter@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 140211 for review
Message-ID:  <200804181758.m3IHwArD055267@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=140211

Change 140211 by peter@peter_overcee on 2008/04/18 17:58:03

	IFC @140209

Affected files ...

.. //depot/projects/hammer/Makefile.inc1#134 integrate
.. //depot/projects/hammer/ObsoleteFiles.inc#50 integrate
.. //depot/projects/hammer/UPDATING#115 integrate
.. //depot/projects/hammer/bin/ls/ls.1#27 integrate
.. //depot/projects/hammer/bin/ls/ls.c#18 integrate
.. //depot/projects/hammer/bin/ls/ls.h#7 integrate
.. //depot/projects/hammer/bin/ls/print.c#18 integrate
.. //depot/projects/hammer/bin/ls/util.c#12 integrate
.. //depot/projects/hammer/contrib/netcat/nc.1#6 integrate
.. //depot/projects/hammer/contrib/netcat/netcat.c#5 integrate
.. //depot/projects/hammer/contrib/top/machine.h#7 integrate
.. //depot/projects/hammer/etc/defaults/rc.conf#84 integrate
.. //depot/projects/hammer/etc/rc.d/Makefile#60 integrate
.. //depot/projects/hammer/etc/rc.d/dhclient#22 integrate
.. //depot/projects/hammer/etc/rc.d/ppp#10 integrate
.. //depot/projects/hammer/etc/rc.d/rfcomm_pppd_server#1 branch
.. //depot/projects/hammer/etc/rc.d/wpa_supplicant#3 integrate
.. //depot/projects/hammer/etc/rc.d/zfs#4 integrate
.. //depot/projects/hammer/games/fortune/datfiles/fortunes#79 integrate
.. //depot/projects/hammer/gnu/usr.bin/binutils/libbfd/Makefile.i386#7 integrate
.. //depot/projects/hammer/include/dirent.h#6 integrate
.. //depot/projects/hammer/include/stdio.h#14 integrate
.. //depot/projects/hammer/include/string.h#10 integrate
.. //depot/projects/hammer/include/unistd.h#23 integrate
.. //depot/projects/hammer/lib/libc/gdtoa/Makefile.inc#10 integrate
.. //depot/projects/hammer/lib/libc/gdtoa/_hdtoa.c#5 integrate
.. //depot/projects/hammer/lib/libc/gdtoa/_hldtoa.c#1 branch
.. //depot/projects/hammer/lib/libc/gen/Makefile.inc#35 integrate
.. //depot/projects/hammer/lib/libc/gen/Symbol.map#8 integrate
.. //depot/projects/hammer/lib/libc/gen/directory.3#5 integrate
.. //depot/projects/hammer/lib/libc/gen/err.c#3 integrate
.. //depot/projects/hammer/lib/libc/gen/msgctl.3#5 integrate
.. //depot/projects/hammer/lib/libc/gen/opendir.c#7 integrate
.. //depot/projects/hammer/lib/libc/gen/tcgetsid.3#1 branch
.. //depot/projects/hammer/lib/libc/gen/termios.c#3 integrate
.. //depot/projects/hammer/lib/libc/include/libc_private.h#16 integrate
.. //depot/projects/hammer/lib/libc/include/namespace.h#13 integrate
.. //depot/projects/hammer/lib/libc/include/un-namespace.h#12 integrate
.. //depot/projects/hammer/lib/libc/sparc64/fpu/fpu_qp.c#8 integrate
.. //depot/projects/hammer/lib/libc/sparc64/fpu/fpu_sqrt.c#3 integrate
.. //depot/projects/hammer/lib/libc/stdio/_flock_stub.c#4 integrate
.. //depot/projects/hammer/lib/libc/stdio/asprintf.c#4 integrate
.. //depot/projects/hammer/lib/libc/stdio/fgetwc.c#9 integrate
.. //depot/projects/hammer/lib/libc/stdio/fgetws.c#5 integrate
.. //depot/projects/hammer/lib/libc/stdio/findfp.c#10 integrate
.. //depot/projects/hammer/lib/libc/stdio/fputwc.c#9 integrate
.. //depot/projects/hammer/lib/libc/stdio/fputws.c#4 integrate
.. //depot/projects/hammer/lib/libc/stdio/freopen.c#8 integrate
.. //depot/projects/hammer/lib/libc/stdio/fseek.c#5 integrate
.. //depot/projects/hammer/lib/libc/stdio/fwide.c#2 integrate
.. //depot/projects/hammer/lib/libc/stdio/local.h#17 integrate
.. //depot/projects/hammer/lib/libc/stdio/printf.3#12 integrate
.. //depot/projects/hammer/lib/libc/stdio/refill.c#4 integrate
.. //depot/projects/hammer/lib/libc/stdio/snprintf.c#4 integrate
.. //depot/projects/hammer/lib/libc/stdio/sprintf.c#4 integrate
.. //depot/projects/hammer/lib/libc/stdio/sscanf.c#4 integrate
.. //depot/projects/hammer/lib/libc/stdio/ungetc.c#5 integrate
.. //depot/projects/hammer/lib/libc/stdio/ungetwc.c#10 integrate
.. //depot/projects/hammer/lib/libc/stdio/vasprintf.c#4 integrate
.. //depot/projects/hammer/lib/libc/stdio/vfprintf.c#25 integrate
.. //depot/projects/hammer/lib/libc/stdio/vfwprintf.c#21 integrate
.. //depot/projects/hammer/lib/libc/stdio/vsnprintf.c#6 integrate
.. //depot/projects/hammer/lib/libc/stdio/vsprintf.c#4 integrate
.. //depot/projects/hammer/lib/libc/stdio/vsscanf.c#5 integrate
.. //depot/projects/hammer/lib/libc/stdio/vswprintf.c#7 integrate
.. //depot/projects/hammer/lib/libc/stdio/vswscanf.c#5 integrate
.. //depot/projects/hammer/lib/libc/stdio/xprintf.c#5 integrate
.. //depot/projects/hammer/lib/libc/stdlib/strfmon.c#7 integrate
.. //depot/projects/hammer/lib/libc/stdtime/localtime.c#10 integrate
.. //depot/projects/hammer/lib/libc/string/Makefile.inc#12 integrate
.. //depot/projects/hammer/lib/libc/string/Symbol.map#3 integrate
.. //depot/projects/hammer/lib/libc/string/memchr.3#4 integrate
.. //depot/projects/hammer/lib/libc/string/memrchr.c#1 branch
.. //depot/projects/hammer/lib/libc/sys/Makefile.inc#34 integrate
.. //depot/projects/hammer/lib/libc/sys/Symbol.map#10 integrate
.. //depot/projects/hammer/lib/libc/sys/access.2#6 integrate
.. //depot/projects/hammer/lib/libc/sys/aio_cancel.2#4 integrate
.. //depot/projects/hammer/lib/libc/sys/aio_suspend.2#6 integrate
.. //depot/projects/hammer/lib/libc/sys/chmod.2#9 integrate
.. //depot/projects/hammer/lib/libc/sys/chown.2#5 integrate
.. //depot/projects/hammer/lib/libc/sys/execve.2#5 integrate
.. //depot/projects/hammer/lib/libc/sys/fcntl.c#1 branch
.. //depot/projects/hammer/lib/libc/sys/link.2#6 integrate
.. //depot/projects/hammer/lib/libc/sys/mkdir.2#5 integrate
.. //depot/projects/hammer/lib/libc/sys/mkfifo.2#5 integrate
.. //depot/projects/hammer/lib/libc/sys/mknod.2#4 integrate
.. //depot/projects/hammer/lib/libc/sys/open.2#11 integrate
.. //depot/projects/hammer/lib/libc/sys/readlink.2#6 integrate
.. //depot/projects/hammer/lib/libc/sys/rename.2#7 integrate
.. //depot/projects/hammer/lib/libc/sys/stat.2#15 integrate
.. //depot/projects/hammer/lib/libc/sys/symlink.2#5 integrate
.. //depot/projects/hammer/lib/libc/sys/unlink.2#7 integrate
.. //depot/projects/hammer/lib/libc/sys/utimes.2#6 integrate
.. //depot/projects/hammer/lib/libfetch/common.c#13 integrate
.. //depot/projects/hammer/lib/libstand/nfs.c#4 integrate
.. //depot/projects/hammer/lib/libthr/arch/amd64/Makefile.inc#4 integrate
.. //depot/projects/hammer/lib/libthr/arch/amd64/amd64/_umtx_op_err.S#1 branch
.. //depot/projects/hammer/lib/libthr/arch/amd64/include/pthread_md.h#4 integrate
.. //depot/projects/hammer/lib/libthr/arch/i386/Makefile.inc#4 integrate
.. //depot/projects/hammer/lib/libthr/arch/i386/i386/_umtx_op_err.S#1 branch
.. //depot/projects/hammer/lib/libthr/arch/i386/include/pthread_md.h#7 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_affinity.c#3 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_cond.c#17 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_init.c#29 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_private.h#41 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_rtld.c#5 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_rwlock.c#10 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_umtx.c#6 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_umtx.h#6 integrate
.. //depot/projects/hammer/lib/msun/src/s_fma.c#4 integrate
.. //depot/projects/hammer/lib/msun/src/s_fmal.c#4 integrate
.. //depot/projects/hammer/libexec/rtld-elf/mips/reloc.c#1 branch
.. //depot/projects/hammer/libexec/rtld-elf/mips/rtld_machdep.h#1 branch
.. //depot/projects/hammer/libexec/rtld-elf/mips/rtld_start.S#1 branch
.. //depot/projects/hammer/libexec/rtld-elf/rtld.c#40 integrate
.. //depot/projects/hammer/libexec/rtld-elf/rtld.h#12 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/article.sgml#32 integrate
.. //depot/projects/hammer/release/ia64/mkisoimages.sh#9 integrate
.. //depot/projects/hammer/sbin/ddb/ddb.8#3 integrate
.. //depot/projects/hammer/sbin/ddb/ddb.c#3 integrate
.. //depot/projects/hammer/sbin/dhclient/bpf.c#6 integrate
.. //depot/projects/hammer/sbin/fsck_ffs/fsck.h#13 integrate
.. //depot/projects/hammer/sbin/fsck_ffs/fsck_ffs.8#9 integrate
.. //depot/projects/hammer/sbin/fsck_ffs/fsutil.c#11 integrate
.. //depot/projects/hammer/sbin/fsck_ffs/inode.c#7 integrate
.. //depot/projects/hammer/sbin/fsck_ffs/main.c#15 integrate
.. //depot/projects/hammer/sbin/geom/class/journal/gjournal.8#3 integrate
.. //depot/projects/hammer/sbin/geom/class/part/geom_part.c#4 integrate
.. //depot/projects/hammer/sbin/gpt/gpt.c#15 integrate
.. //depot/projects/hammer/sbin/restore/dirs.c#9 integrate
.. //depot/projects/hammer/sbin/restore/interactive.c#9 integrate
.. //depot/projects/hammer/sbin/restore/tape.c#9 integrate
.. //depot/projects/hammer/sbin/route/route.c#15 integrate
.. //depot/projects/hammer/share/man/man4/Makefile#104 integrate
.. //depot/projects/hammer/share/man/man4/asmc.4#2 integrate
.. //depot/projects/hammer/share/man/man4/bpf.4#14 integrate
.. //depot/projects/hammer/share/man/man4/ddb.4#14 integrate
.. //depot/projects/hammer/share/man/man4/k8temp.4#1 branch
.. //depot/projects/hammer/share/man/man4/nfe.4#7 integrate
.. //depot/projects/hammer/share/man/man4/psm.4#11 integrate
.. //depot/projects/hammer/share/man/man5/rc.conf.5#88 integrate
.. //depot/projects/hammer/share/man/man9/Makefile#82 integrate
.. //depot/projects/hammer/share/man/man9/lock.9#15 integrate
.. //depot/projects/hammer/share/man/man9/rwlock.9#8 integrate
.. //depot/projects/hammer/share/man/man9/sleep.9#15 integrate
.. //depot/projects/hammer/share/mk/bsd.lib.mk#33 integrate
.. //depot/projects/hammer/share/mk/sys.mk#29 integrate
.. //depot/projects/hammer/sys/amd64/amd64/intr_machdep.c#53 integrate
.. //depot/projects/hammer/sys/amd64/amd64/pmap.c#177 integrate
.. //depot/projects/hammer/sys/amd64/conf/NOTES#111 integrate
.. //depot/projects/hammer/sys/amd64/include/clock.h#28 integrate
.. //depot/projects/hammer/sys/amd64/include/cpufunc.h#36 integrate
.. //depot/projects/hammer/sys/amd64/isa/clock.c#70 integrate
.. //depot/projects/hammer/sys/amd64/linux32/linux.h#8 integrate
.. //depot/projects/hammer/sys/amd64/linux32/linux32_dummy.c#6 integrate
.. //depot/projects/hammer/sys/amd64/linux32/linux32_proto.h#15 integrate
.. //depot/projects/hammer/sys/amd64/linux32/linux32_syscall.h#15 integrate
.. //depot/projects/hammer/sys/amd64/linux32/linux32_sysent.c#15 integrate
.. //depot/projects/hammer/sys/amd64/linux32/linux32_sysvec.c#21 integrate
.. //depot/projects/hammer/sys/amd64/linux32/syscalls.master#15 integrate
.. //depot/projects/hammer/sys/arm/arm/bus_space_generic.c#1 branch
.. //depot/projects/hammer/sys/arm/arm/elf_trampoline.c#11 integrate
.. //depot/projects/hammer/sys/arm/arm/exception.S#6 integrate
.. //depot/projects/hammer/sys/arm/arm/intr.c#18 integrate
.. //depot/projects/hammer/sys/arm/arm/locore.S#18 integrate
.. //depot/projects/hammer/sys/arm/arm/machdep.c#22 integrate
.. //depot/projects/hammer/sys/arm/at91/kb920x_machdep.c#12 integrate
.. //depot/projects/hammer/sys/arm/include/machdep.h#3 integrate
.. //depot/projects/hammer/sys/arm/sa11x0/assabet_machdep.c#13 integrate
.. //depot/projects/hammer/sys/arm/sa11x0/files.sa11x0#3 integrate
.. //depot/projects/hammer/sys/arm/sa11x0/sa11x0_io.c#9 integrate
.. //depot/projects/hammer/sys/arm/xscale/i80321/ep80219_machdep.c#5 integrate
.. //depot/projects/hammer/sys/arm/xscale/i80321/files.ep80219#2 integrate
.. //depot/projects/hammer/sys/arm/xscale/i80321/files.i80219#2 integrate
.. //depot/projects/hammer/sys/arm/xscale/i80321/files.i80321#4 integrate
.. //depot/projects/hammer/sys/arm/xscale/i80321/files.iq31244#3 integrate
.. //depot/projects/hammer/sys/arm/xscale/i80321/iq31244_machdep.c#23 integrate
.. //depot/projects/hammer/sys/arm/xscale/i80321/obio_space.c#5 integrate
.. //depot/projects/hammer/sys/arm/xscale/i8134x/crb_machdep.c#5 integrate
.. //depot/projects/hammer/sys/arm/xscale/i8134x/files.i81342#2 integrate
.. //depot/projects/hammer/sys/arm/xscale/i8134x/obio_space.c#2 integrate
.. //depot/projects/hammer/sys/arm/xscale/ixp425/avila_machdep.c#6 integrate
.. //depot/projects/hammer/sys/arm/xscale/ixp425/files.avila#2 integrate
.. //depot/projects/hammer/sys/arm/xscale/ixp425/files.ixp425#4 integrate
.. //depot/projects/hammer/sys/arm/xscale/ixp425/ixp425_a4x_space.c#2 integrate
.. //depot/projects/hammer/sys/arm/xscale/ixp425/ixp425_space.c#2 integrate
.. //depot/projects/hammer/sys/boot/forth/loader.conf#37 integrate
.. //depot/projects/hammer/sys/boot/i386/pxeldr/pxeldr.S#7 integrate
.. //depot/projects/hammer/sys/cddl/contrib/opensolaris/common/atomic/sparc64/atomic.S#1 branch
.. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#2 integrate
.. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#2 integrate
.. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#2 integrate
.. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/sys/asm_linkage.h#2 integrate
.. //depot/projects/hammer/sys/compat/linux/linux_file.c#29 integrate
.. //depot/projects/hammer/sys/compat/linux/linux_file.h#1 branch
.. //depot/projects/hammer/sys/compat/linux/linux_misc.c#48 integrate
.. //depot/projects/hammer/sys/compat/linux/linux_stats.c#32 integrate
.. //depot/projects/hammer/sys/compat/linux/linux_util.c#14 integrate
.. //depot/projects/hammer/sys/compat/linux/linux_util.h#11 integrate
.. //depot/projects/hammer/sys/compat/svr4/svr4_sysvec.c#19 integrate
.. //depot/projects/hammer/sys/conf/Makefile.arm#25 integrate
.. //depot/projects/hammer/sys/conf/Makefile.mips#1 branch
.. //depot/projects/hammer/sys/conf/NOTES#142 integrate
.. //depot/projects/hammer/sys/conf/files#179 integrate
.. //depot/projects/hammer/sys/conf/files.amd64#103 integrate
.. //depot/projects/hammer/sys/conf/files.i386#90 integrate
.. //depot/projects/hammer/sys/conf/files.mips#1 branch
.. //depot/projects/hammer/sys/conf/files.pc98#65 integrate
.. //depot/projects/hammer/sys/conf/ldscript.mips#1 branch
.. //depot/projects/hammer/sys/conf/ldscript.mips.cfe#1 branch
.. //depot/projects/hammer/sys/conf/options#128 integrate
.. //depot/projects/hammer/sys/conf/options.mips#1 branch
.. //depot/projects/hammer/sys/contrib/pf/net/pf.c#36 integrate
.. //depot/projects/hammer/sys/dev/aac/aac.c#48 integrate
.. //depot/projects/hammer/sys/dev/aac/aac_disk.c#14 integrate
.. //depot/projects/hammer/sys/dev/acpi_support/acpi_asus.c#11 integrate
.. //depot/projects/hammer/sys/dev/acpi_support/acpi_ibm.c#13 integrate
.. //depot/projects/hammer/sys/dev/acpica/Osd/OsdSynch.c#13 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi.c#83 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_cpu.c#42 integrate
.. //depot/projects/hammer/sys/dev/asmc/asmc.c#3 integrate
.. //depot/projects/hammer/sys/dev/asmc/asmcvar.h#2 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-all.c#67 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-all.h#49 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-card.c#27 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-cbus.c#15 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#86 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-disk.c#48 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-disk.h#11 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-dma.c#31 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-isa.c#16 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-lowlevel.c#40 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-pci.c#45 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-pci.h#52 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-queue.c#37 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-raid.c#42 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-raid.h#24 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-usb.c#7 integrate
.. //depot/projects/hammer/sys/dev/ata/ata_if.m#5 integrate
.. //depot/projects/hammer/sys/dev/ata/atapi-cam.c#29 integrate
.. //depot/projects/hammer/sys/dev/ata/atapi-cd.c#40 integrate
.. //depot/projects/hammer/sys/dev/ata/atapi-cd.h#12 integrate
.. //depot/projects/hammer/sys/dev/ata/atapi-fd.c#23 integrate
.. //depot/projects/hammer/sys/dev/ata/atapi-fd.h#10 integrate
.. //depot/projects/hammer/sys/dev/ata/atapi-tape.c#23 integrate
.. //depot/projects/hammer/sys/dev/ata/atapi-tape.h#9 integrate
.. //depot/projects/hammer/sys/dev/atkbdc/psm.c#10 integrate
.. //depot/projects/hammer/sys/dev/bce/if_bce.c#12 integrate
.. //depot/projects/hammer/sys/dev/bce/if_bcefw.h#6 integrate
.. //depot/projects/hammer/sys/dev/bce/if_bcereg.h#10 integrate
.. //depot/projects/hammer/sys/dev/bge/if_bge.c#80 integrate
.. //depot/projects/hammer/sys/dev/cxgb/cxgb_adapter.h#16 integrate
.. //depot/projects/hammer/sys/dev/cxgb/sys/cxgb_support.c#5 integrate
.. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#6 integrate
.. //depot/projects/hammer/sys/dev/de/if_de.c#6 integrate
.. //depot/projects/hammer/sys/dev/em/e1000_80003es2lan.c#5 integrate
.. //depot/projects/hammer/sys/dev/em/e1000_82540.c#5 integrate
.. //depot/projects/hammer/sys/dev/em/e1000_82541.c#5 integrate
.. //depot/projects/hammer/sys/dev/em/e1000_82542.c#5 integrate
.. //depot/projects/hammer/sys/dev/em/e1000_82543.c#5 integrate
.. //depot/projects/hammer/sys/dev/em/e1000_82571.c#5 integrate
.. //depot/projects/hammer/sys/dev/em/e1000_82571.h#5 integrate
.. //depot/projects/hammer/sys/dev/em/e1000_api.c#5 integrate
.. //depot/projects/hammer/sys/dev/em/e1000_api.h#5 integrate
.. //depot/projects/hammer/sys/dev/em/e1000_defines.h#5 integrate
.. //depot/projects/hammer/sys/dev/em/e1000_hw.h#5 integrate
.. //depot/projects/hammer/sys/dev/em/e1000_ich8lan.c#5 integrate
.. //depot/projects/hammer/sys/dev/em/e1000_ich8lan.h#5 integrate
.. //depot/projects/hammer/sys/dev/em/e1000_mac.c#5 integrate
.. //depot/projects/hammer/sys/dev/em/e1000_mac.h#5 integrate
.. //depot/projects/hammer/sys/dev/em/e1000_manage.c#5 integrate
.. //depot/projects/hammer/sys/dev/em/e1000_nvm.c#5 integrate
.. //depot/projects/hammer/sys/dev/em/e1000_nvm.h#5 integrate
.. //depot/projects/hammer/sys/dev/em/e1000_osdep.c#1 branch
.. //depot/projects/hammer/sys/dev/em/e1000_osdep.h#5 integrate
.. //depot/projects/hammer/sys/dev/em/e1000_phy.c#5 integrate
.. //depot/projects/hammer/sys/dev/em/e1000_phy.h#5 integrate
.. //depot/projects/hammer/sys/dev/em/if_em.c#73 integrate
.. //depot/projects/hammer/sys/dev/em/if_em.h#37 integrate
.. //depot/projects/hammer/sys/dev/fb/vga.c#24 integrate
.. //depot/projects/hammer/sys/dev/ieee488/ibfoo.c#3 integrate
.. //depot/projects/hammer/sys/dev/if_ndis/if_ndis.c#60 integrate
.. //depot/projects/hammer/sys/dev/if_ndis/if_ndisvar.h#22 integrate
.. //depot/projects/hammer/sys/dev/igb/e1000_mac.c#2 integrate
.. //depot/projects/hammer/sys/dev/igb/e1000_osdep.c#1 branch
.. //depot/projects/hammer/sys/dev/igb/if_igb.c#2 integrate
.. //depot/projects/hammer/sys/dev/k8temp/k8temp.c#1 branch
.. //depot/projects/hammer/sys/dev/malo/if_malohal.c#2 integrate
.. //depot/projects/hammer/sys/dev/mfi/mfi.c#13 integrate
.. //depot/projects/hammer/sys/dev/mii/ip1000phy.c#2 integrate
.. //depot/projects/hammer/sys/dev/mii/ip1000phyreg.h#2 integrate
.. //depot/projects/hammer/sys/dev/mii/miidevs#22 integrate
.. //depot/projects/hammer/sys/dev/mpt/mpt.c#23 integrate
.. //depot/projects/hammer/sys/dev/mxge/if_mxge.c#15 integrate
.. //depot/projects/hammer/sys/dev/nfe/if_nfe.c#11 integrate
.. //depot/projects/hammer/sys/dev/nfe/if_nfereg.h#5 integrate
.. //depot/projects/hammer/sys/dev/nvram/nvram.c#3 integrate
.. //depot/projects/hammer/sys/dev/pci/pcivar.h#17 integrate
.. //depot/projects/hammer/sys/dev/ral/rt2661.c#11 integrate
.. //depot/projects/hammer/sys/dev/re/if_re.c#60 integrate
.. //depot/projects/hammer/sys/dev/sound/midi/mpu401.c#4 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/hda/hdac.c#15 integrate
.. //depot/projects/hammer/sys/dev/sound/pcm/dsp.c#34 integrate
.. //depot/projects/hammer/sys/dev/usb/ehci_pci.c#27 integrate
.. //depot/projects/hammer/sys/dev/usb/if_aue.c#36 integrate
.. //depot/projects/hammer/sys/dev/usb/ubsa.c#20 integrate
.. //depot/projects/hammer/sys/dev/usb/uhci_pci.c#18 integrate
.. //depot/projects/hammer/sys/dev/usb/uipaq.c#4 integrate
.. //depot/projects/hammer/sys/dev/usb/usbdevs#100 integrate
.. //depot/projects/hammer/sys/fs/fdescfs/fdesc_vnops.c#23 integrate
.. //depot/projects/hammer/sys/fs/msdosfs/denode.h#15 integrate
.. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_vnops.c#37 integrate
.. //depot/projects/hammer/sys/fs/smbfs/smbfs_node.h#7 integrate
.. //depot/projects/hammer/sys/fs/smbfs/smbfs_vnops.c#31 integrate
.. //depot/projects/hammer/sys/fs/tmpfs/tmpfs.h#7 integrate
.. //depot/projects/hammer/sys/fs/tmpfs/tmpfs_vfsops.c#13 integrate
.. //depot/projects/hammer/sys/fs/tmpfs/tmpfs_vnops.c#12 integrate
.. //depot/projects/hammer/sys/fs/unionfs/union_subr.c#29 integrate
.. //depot/projects/hammer/sys/geom/part/g_part.c#12 integrate
.. //depot/projects/hammer/sys/geom/part/g_part.h#9 integrate
.. //depot/projects/hammer/sys/geom/part/g_part_gpt.c#7 integrate
.. //depot/projects/hammer/sys/geom/part/g_part_if.m#2 integrate
.. //depot/projects/hammer/sys/geom/part/g_part_mbr.c#4 integrate
.. //depot/projects/hammer/sys/geom/part/g_part_pc98.c#2 integrate
.. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_vnops.c#11 integrate
.. //depot/projects/hammer/sys/gnu/fs/ext2fs/inode.h#2 integrate
.. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#6 integrate
.. //depot/projects/hammer/sys/i386/conf/GENERIC.hints#11 integrate
.. //depot/projects/hammer/sys/i386/i386/intr_machdep.c#27 integrate
.. //depot/projects/hammer/sys/i386/i386/mp_machdep.c#74 integrate
.. //depot/projects/hammer/sys/i386/i386/pmap.c#111 integrate
.. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_util.c#8 integrate
.. //depot/projects/hammer/sys/i386/include/clock.h#18 integrate
.. //depot/projects/hammer/sys/i386/include/cpufunc.h#14 integrate
.. //depot/projects/hammer/sys/i386/isa/clock.c#44 integrate
.. //depot/projects/hammer/sys/i386/linux/linux.h#11 integrate
.. //depot/projects/hammer/sys/i386/linux/linux_dummy.c#10 integrate
.. //depot/projects/hammer/sys/i386/linux/linux_proto.h#26 integrate
.. //depot/projects/hammer/sys/i386/linux/linux_syscall.h#26 integrate
.. //depot/projects/hammer/sys/i386/linux/linux_sysent.c#27 integrate
.. //depot/projects/hammer/sys/i386/linux/linux_sysvec.c#33 integrate
.. //depot/projects/hammer/sys/i386/linux/syscalls.master#26 integrate
.. //depot/projects/hammer/sys/ia64/conf/DEFAULTS#9 integrate
.. //depot/projects/hammer/sys/ia64/conf/GENERIC#35 integrate
.. //depot/projects/hammer/sys/ia64/conf/SKI#17 integrate
.. //depot/projects/hammer/sys/ia64/ia64/clock.c#14 integrate
.. //depot/projects/hammer/sys/ia64/ia64/interrupt.c#30 integrate
.. //depot/projects/hammer/sys/ia64/ia64/machdep.c#70 integrate
.. //depot/projects/hammer/sys/ia64/ia64/nexus.c#15 integrate
.. //depot/projects/hammer/sys/ia64/ia64/sapic.c#8 integrate
.. //depot/projects/hammer/sys/ia64/ia64/sscdisk.c#13 integrate
.. //depot/projects/hammer/sys/ia64/include/vmparam.h#15 integrate
.. //depot/projects/hammer/sys/isa/atrtc.c#1 branch
.. //depot/projects/hammer/sys/isa/rtc.h#3 integrate
.. //depot/projects/hammer/sys/kern/kern_clock.c#46 integrate
.. //depot/projects/hammer/sys/kern/kern_conf.c#49 integrate
.. //depot/projects/hammer/sys/kern/kern_cpuset.c#5 integrate
.. //depot/projects/hammer/sys/kern/kern_event.c#51 integrate
.. //depot/projects/hammer/sys/kern/kern_intr.c#49 integrate
.. //depot/projects/hammer/sys/kern/kern_jail.c#30 integrate
.. //depot/projects/hammer/sys/kern/kern_linker.c#35 integrate
.. //depot/projects/hammer/sys/kern/kern_lock.c#39 integrate
.. //depot/projects/hammer/sys/kern/kern_lockf.c#19 integrate
.. //depot/projects/hammer/sys/kern/kern_mbuf.c#31 integrate
.. //depot/projects/hammer/sys/kern/kern_rwlock.c#17 integrate
.. //depot/projects/hammer/sys/kern/kern_subr.c#25 integrate
.. //depot/projects/hammer/sys/kern/kern_switch.c#62 integrate
.. //depot/projects/hammer/sys/kern/kern_synch.c#67 integrate
.. //depot/projects/hammer/sys/kern/kern_thread.c#107 integrate
.. //depot/projects/hammer/sys/kern/kern_timeout.c#30 integrate
.. //depot/projects/hammer/sys/kern/kern_umtx.c#30 integrate
.. //depot/projects/hammer/sys/kern/sched_4bsd.c#60 integrate
.. //depot/projects/hammer/sys/kern/sched_ule.c#95 integrate
.. //depot/projects/hammer/sys/kern/subr_clock.c#9 integrate
.. //depot/projects/hammer/sys/kern/subr_firmware.c#6 integrate
.. //depot/projects/hammer/sys/kern/subr_sleepqueue.c#30 integrate
.. //depot/projects/hammer/sys/kern/subr_taskqueue.c#24 integrate
.. //depot/projects/hammer/sys/kern/subr_trap.c#44 integrate
.. //depot/projects/hammer/sys/kern/subr_turnstile.c#28 integrate
.. //depot/projects/hammer/sys/kern/subr_witness.c#70 integrate
.. //depot/projects/hammer/sys/kern/tty.c#58 integrate
.. //depot/projects/hammer/sys/kern/uipc_shm.c#3 integrate
.. //depot/projects/hammer/sys/kern/uipc_socket.c#81 integrate
.. //depot/projects/hammer/sys/kern/vfs_cache.c#30 integrate
.. //depot/projects/hammer/sys/kern/vfs_default.c#55 integrate
.. //depot/projects/hammer/sys/kern/vfs_lookup.c#36 integrate
.. //depot/projects/hammer/sys/kern/vfs_mount.c#92 integrate
.. //depot/projects/hammer/sys/kern/vfs_subr.c#130 integrate
.. //depot/projects/hammer/sys/kern/vfs_syscalls.c#81 integrate
.. //depot/projects/hammer/sys/mips/compile/.cvsignore#1 branch
.. //depot/projects/hammer/sys/mips/conf/ADM5120#1 branch
.. //depot/projects/hammer/sys/mips/conf/ADM5120.hints#1 branch
.. //depot/projects/hammer/sys/mips/conf/IDT#1 branch
.. //depot/projects/hammer/sys/mips/conf/IDT.hints#1 branch
.. //depot/projects/hammer/sys/mips/conf/MALTA#1 branch
.. //depot/projects/hammer/sys/mips/conf/MALTA.hints#1 branch
.. //depot/projects/hammer/sys/mips/conf/QEMU#1 branch
.. //depot/projects/hammer/sys/mips/conf/SENTRY5#1 branch
.. //depot/projects/hammer/sys/mips/conf/SENTRY5.hints#1 branch
.. //depot/projects/hammer/sys/mips/include/_bus.h#1 branch
.. //depot/projects/hammer/sys/mips/include/_bus_octeon.h#1 branch
.. //depot/projects/hammer/sys/mips/include/_inttypes.h#1 branch
.. //depot/projects/hammer/sys/mips/include/_limits.h#1 branch
.. //depot/projects/hammer/sys/mips/include/_stdint.h#1 branch
.. //depot/projects/hammer/sys/mips/include/_types.h#1 branch
.. //depot/projects/hammer/sys/mips/include/am29lv081b.h#1 branch
.. //depot/projects/hammer/sys/mips/include/archtype.h#1 branch
.. //depot/projects/hammer/sys/mips/include/asm.h#1 branch
.. //depot/projects/hammer/sys/mips/include/asmacros.h#1 branch
.. //depot/projects/hammer/sys/mips/include/atomic.h#1 branch
.. //depot/projects/hammer/sys/mips/include/bootinfo.h#1 branch
.. //depot/projects/hammer/sys/mips/include/bswap.h#1 branch
.. //depot/projects/hammer/sys/mips/include/bus.h#1 branch
.. //depot/projects/hammer/sys/mips/include/bus_dma.h#1 branch
.. //depot/projects/hammer/sys/mips/include/bus_octeon.h#1 branch
.. //depot/projects/hammer/sys/mips/include/cache.h#1 branch
.. //depot/projects/hammer/sys/mips/include/cache_mipsNN.h#1 branch
.. //depot/projects/hammer/sys/mips/include/cache_r4k.h#1 branch
.. //depot/projects/hammer/sys/mips/include/clock.h#1 branch
.. //depot/projects/hammer/sys/mips/include/clockvar.h#1 branch
.. //depot/projects/hammer/sys/mips/include/cp0.h#1 branch
.. //depot/projects/hammer/sys/mips/include/cpu.h#1 branch
.. //depot/projects/hammer/sys/mips/include/cpufunc.h#1 branch
.. //depot/projects/hammer/sys/mips/include/cpuinfo.h#1 branch
.. //depot/projects/hammer/sys/mips/include/cpuregs.h#1 branch
.. //depot/projects/hammer/sys/mips/include/cputypes.h#1 branch
.. //depot/projects/hammer/sys/mips/include/db_machdep.h#1 branch
.. //depot/projects/hammer/sys/mips/include/defs.h#1 branch
.. //depot/projects/hammer/sys/mips/include/elf.h#1 branch
.. //depot/projects/hammer/sys/mips/include/endian.h#1 branch
.. //depot/projects/hammer/sys/mips/include/exec.h#1 branch
.. //depot/projects/hammer/sys/mips/include/float.h#1 branch
.. //depot/projects/hammer/sys/mips/include/floatingpoint.h#1 branch
.. //depot/projects/hammer/sys/mips/include/fpu.h#1 branch
.. //depot/projects/hammer/sys/mips/include/frame.h#1 branch
.. //depot/projects/hammer/sys/mips/include/gdb_machdep.h#1 branch
.. //depot/projects/hammer/sys/mips/include/hwfunc.h#1 branch
.. //depot/projects/hammer/sys/mips/include/ieee.h#1 branch
.. //depot/projects/hammer/sys/mips/include/ieeefp.h#1 branch
.. //depot/projects/hammer/sys/mips/include/in_cksum.h#1 branch
.. //depot/projects/hammer/sys/mips/include/intr.h#1 branch
.. //depot/projects/hammer/sys/mips/include/intr_machdep.h#1 branch
.. //depot/projects/hammer/sys/mips/include/iodev.h#1 branch
.. //depot/projects/hammer/sys/mips/include/kdb.h#1 branch
.. //depot/projects/hammer/sys/mips/include/limits.h#1 branch
.. //depot/projects/hammer/sys/mips/include/locore.h#1 branch
.. //depot/projects/hammer/sys/mips/include/md_var.h#1 branch
.. //depot/projects/hammer/sys/mips/include/memdev.h#1 branch
.. //depot/projects/hammer/sys/mips/include/metadata.h#1 branch
.. //depot/projects/hammer/sys/mips/include/minidump.h#1 branch
.. //depot/projects/hammer/sys/mips/include/mips_opcode.h#1 branch
.. //depot/projects/hammer/sys/mips/include/mp_watchdog.h#1 branch
.. //depot/projects/hammer/sys/mips/include/mutex.h#1 branch
.. //depot/projects/hammer/sys/mips/include/param.h#1 branch
.. //depot/projects/hammer/sys/mips/include/pcb.h#1 branch
.. //depot/projects/hammer/sys/mips/include/pci_cfgreg.h#1 branch
.. //depot/projects/hammer/sys/mips/include/pcpu.h#1 branch
.. //depot/projects/hammer/sys/mips/include/pltfm.h#1 branch
.. //depot/projects/hammer/sys/mips/include/pmap.h#1 branch
.. //depot/projects/hammer/sys/mips/include/pmc_mdep.h#1 branch
.. //depot/projects/hammer/sys/mips/include/ppireg.h#1 branch
.. //depot/projects/hammer/sys/mips/include/proc.h#1 branch
.. //depot/projects/hammer/sys/mips/include/profile.h#1 branch
.. //depot/projects/hammer/sys/mips/include/psl.h#1 branch
.. //depot/projects/hammer/sys/mips/include/pte.h#1 branch
.. //depot/projects/hammer/sys/mips/include/ptrace.h#1 branch
.. //depot/projects/hammer/sys/mips/include/queue.h#1 branch
.. //depot/projects/hammer/sys/mips/include/reg.h#1 branch
.. //depot/projects/hammer/sys/mips/include/regdef.h#1 branch
.. //depot/projects/hammer/sys/mips/include/regnum.h#1 branch
.. //depot/projects/hammer/sys/mips/include/reloc.h#1 branch
.. //depot/projects/hammer/sys/mips/include/resource.h#1 branch
.. //depot/projects/hammer/sys/mips/include/rm7000.h#1 branch
.. //depot/projects/hammer/sys/mips/include/runq.h#1 branch
.. //depot/projects/hammer/sys/mips/include/segments.h#1 branch
.. //depot/projects/hammer/sys/mips/include/setjmp.h#1 branch
.. //depot/projects/hammer/sys/mips/include/sf_buf.h#1 branch
.. //depot/projects/hammer/sys/mips/include/sigframe.h#1 branch
.. //depot/projects/hammer/sys/mips/include/signal.h#1 branch
.. //depot/projects/hammer/sys/mips/include/smp.h#1 branch
.. //depot/projects/hammer/sys/mips/include/stdarg.h#1 branch
.. //depot/projects/hammer/sys/mips/include/sysarch.h#1 branch
.. //depot/projects/hammer/sys/mips/include/timerreg.h#1 branch
.. //depot/projects/hammer/sys/mips/include/trap.h#1 branch
.. //depot/projects/hammer/sys/mips/include/ucontext.h#1 branch
.. //depot/projects/hammer/sys/mips/include/varargs.h#1 branch
.. //depot/projects/hammer/sys/mips/include/vmparam.h#1 branch
.. //depot/projects/hammer/sys/mips/mips/autoconf.c#1 branch
.. //depot/projects/hammer/sys/mips/mips/busdma_machdep.c#1 branch
.. //depot/projects/hammer/sys/mips/mips/cache.c#1 branch
.. //depot/projects/hammer/sys/mips/mips/cache_mipsNN.c#1 branch
.. //depot/projects/hammer/sys/mips/mips/copystr.S#1 branch
.. //depot/projects/hammer/sys/mips/mips/cpu.c#1 branch
.. //depot/projects/hammer/sys/mips/mips/db_disasm.c#1 branch
.. //depot/projects/hammer/sys/mips/mips/db_interface.c#1 branch
.. //depot/projects/hammer/sys/mips/mips/db_trace.c#1 branch
.. //depot/projects/hammer/sys/mips/mips/dump_machdep.c#1 branch
.. //depot/projects/hammer/sys/mips/mips/elf_machdep.c#1 branch
.. //depot/projects/hammer/sys/mips/mips/exception.S#1 branch
.. //depot/projects/hammer/sys/mips/mips/fp.S#1 branch
.. //depot/projects/hammer/sys/mips/mips/gdb_machdep.c#1 branch
.. //depot/projects/hammer/sys/mips/mips/genassym.c#1 branch
.. //depot/projects/hammer/sys/mips/mips/in_cksum.c#1 branch
.. //depot/projects/hammer/sys/mips/mips/intr_machdep.c#1 branch
.. //depot/projects/hammer/sys/mips/mips/locore.S#1 branch
.. //depot/projects/hammer/sys/mips/mips/machdep.c#1 branch
.. //depot/projects/hammer/sys/mips/mips/mainbus.c#1 branch
.. //depot/projects/hammer/sys/mips/mips/mem.c#1 branch
.. //depot/projects/hammer/sys/mips/mips/mips_subr.c#1 branch
.. //depot/projects/hammer/sys/mips/mips/mp_machdep.c#1 branch
.. //depot/projects/hammer/sys/mips/mips/nexus.c#1 branch
.. //depot/projects/hammer/sys/mips/mips/pm_machdep.c#1 branch
.. //depot/projects/hammer/sys/mips/mips/pmap.c#1 branch
.. //depot/projects/hammer/sys/mips/mips/psraccess.S#1 branch
.. //depot/projects/hammer/sys/mips/mips/stack_machdep.c#1 branch
.. //depot/projects/hammer/sys/mips/mips/support.S#1 branch
.. //depot/projects/hammer/sys/mips/mips/swtch.S#1 branch
.. //depot/projects/hammer/sys/mips/mips/tick.c#1 branch
.. //depot/projects/hammer/sys/mips/mips/tlb.S#1 branch
.. //depot/projects/hammer/sys/mips/mips/trap.c#1 branch
.. //depot/projects/hammer/sys/mips/mips/uio_machdep.c#1 branch
.. //depot/projects/hammer/sys/mips/mips/vm_machdep.c#1 branch
.. //depot/projects/hammer/sys/mips/mips32/adm5120/adm5120_machdep.c#1 branch
.. //depot/projects/hammer/sys/mips/mips32/adm5120/adm5120reg.h#1 branch
.. //depot/projects/hammer/sys/mips/mips32/adm5120/admpci.c#1 branch
.. //depot/projects/hammer/sys/mips/mips32/adm5120/console.c#1 branch
.. //depot/projects/hammer/sys/mips/mips32/adm5120/files.adm5120#1 branch
.. //depot/projects/hammer/sys/mips/mips32/adm5120/if_admsw.c#1 branch
.. //depot/projects/hammer/sys/mips/mips32/adm5120/if_admswreg.h#1 branch
.. //depot/projects/hammer/sys/mips/mips32/adm5120/if_admswvar.h#1 branch
.. //depot/projects/hammer/sys/mips/mips32/adm5120/obio.c#1 branch
.. //depot/projects/hammer/sys/mips/mips32/adm5120/obiovar.h#1 branch
.. //depot/projects/hammer/sys/mips/mips32/adm5120/std.adm5120#1 branch
.. //depot/projects/hammer/sys/mips/mips32/adm5120/uart_bus_adm5120.c#1 branch
.. //depot/projects/hammer/sys/mips/mips32/adm5120/uart_cpu_adm5120.c#1 branch
.. //depot/projects/hammer/sys/mips/mips32/adm5120/uart_dev_adm5120.c#1 branch
.. //depot/projects/hammer/sys/mips/mips32/adm5120/uart_dev_adm5120.h#1 branch
.. //depot/projects/hammer/sys/mips/mips32/idt/files.idt#1 branch
.. //depot/projects/hammer/sys/mips/mips32/idt/idt_machdep.c#1 branch
.. //depot/projects/hammer/sys/mips/mips32/idt/idtpci.c#1 branch
.. //depot/projects/hammer/sys/mips/mips32/idt/idtreg.h#1 branch
.. //depot/projects/hammer/sys/mips/mips32/idt/if_kr.c#1 branch
.. //depot/projects/hammer/sys/mips/mips32/idt/if_krreg.h#1 branch
.. //depot/projects/hammer/sys/mips/mips32/idt/obio.c#1 branch
.. //depot/projects/hammer/sys/mips/mips32/idt/obiovar.h#1 branch
.. //depot/projects/hammer/sys/mips/mips32/idt/std.idt#1 branch
.. //depot/projects/hammer/sys/mips/mips32/idt/uart_bus_rc32434.c#1 branch
.. //depot/projects/hammer/sys/mips/mips32/idt/uart_cpu_rc32434.c#1 branch
.. //depot/projects/hammer/sys/mips/mips32/malta/files.malta#1 branch
.. //depot/projects/hammer/sys/mips/mips32/malta/gt.c#1 branch
.. //depot/projects/hammer/sys/mips/mips32/malta/gt_pci.c#1 branch
.. //depot/projects/hammer/sys/mips/mips32/malta/gtreg.h#1 branch
.. //depot/projects/hammer/sys/mips/mips32/malta/gtvar.h#1 branch
.. //depot/projects/hammer/sys/mips/mips32/malta/malta_machdep.c#1 branch
.. //depot/projects/hammer/sys/mips/mips32/malta/maltareg.h#1 branch
.. //depot/projects/hammer/sys/mips/mips32/malta/obio.c#1 branch
.. //depot/projects/hammer/sys/mips/mips32/malta/obiovar.h#1 branch
.. //depot/projects/hammer/sys/mips/mips32/malta/std.malta#1 branch
.. //depot/projects/hammer/sys/mips/mips32/malta/uart_bus_maltausart.c#1 branch
.. //depot/projects/hammer/sys/mips/mips32/malta/uart_cpu_maltausart.c#1 branch
.. //depot/projects/hammer/sys/mips/mips32/malta/yamon.c#1 branch
.. //depot/projects/hammer/sys/mips/mips32/malta/yamon.h#1 branch
.. //depot/projects/hammer/sys/mips/mips32/sentry5/files.sentry5#1 branch
.. //depot/projects/hammer/sys/mips/mips32/sentry5/obio.c#1 branch
.. //depot/projects/hammer/sys/mips/mips32/sentry5/obiovar.h#1 branch
.. //depot/projects/hammer/sys/mips/mips32/sentry5/s5_machdep.c#1 branch
.. //depot/projects/hammer/sys/mips/mips32/sentry5/s5reg.h#1 branch
.. //depot/projects/hammer/sys/mips/mips32/sentry5/siba_cc.c#1 branch
.. //depot/projects/hammer/sys/mips/mips32/sentry5/siba_mips.c#1 branch
.. //depot/projects/hammer/sys/mips/mips32/sentry5/siba_sdram.c#1 branch
.. //depot/projects/hammer/sys/mips/mips32/sentry5/uart_bus_sbusart.c#1 branch
.. //depot/projects/hammer/sys/mips/mips32/sentry5/uart_cpu_sbusart.c#1 branch
.. //depot/projects/hammer/sys/modules/Makefile#123 integrate
.. //depot/projects/hammer/sys/modules/asmc/Makefile#2 integrate
.. //depot/projects/hammer/sys/modules/em/Makefile#8 integrate
.. //depot/projects/hammer/sys/modules/igb/Makefile#3 integrate
.. //depot/projects/hammer/sys/modules/k8temp/Makefile#1 branch
.. //depot/projects/hammer/sys/modules/zfs/Makefile#9 integrate
.. //depot/projects/hammer/sys/net/bpf.c#59 integrate
.. //depot/projects/hammer/sys/net/bpf_zerocopy.c#3 integrate
.. //depot/projects/hammer/sys/net/bpf_zerocopy.h#2 integrate
.. //depot/projects/hammer/sys/net/if_loop.c#33 integrate
.. //depot/projects/hammer/sys/net/if_tap.c#33 integrate
.. //depot/projects/hammer/sys/net/radix.c#12 integrate
.. //depot/projects/hammer/sys/net/radix.h#7 integrate
.. //depot/projects/hammer/sys/net/radix_mpath.c#1 branch
.. //depot/projects/hammer/sys/net/radix_mpath.h#1 branch
.. //depot/projects/hammer/sys/net/route.c#33 integrate
.. //depot/projects/hammer/sys/net/route.h#19 integrate
.. //depot/projects/hammer/sys/net/rtsock.c#36 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/include/ng_bluetooth.h#5 integrate
.. //depot/projects/hammer/sys/netgraph/netflow/ng_netflow.c#12 integrate
.. //depot/projects/hammer/sys/netgraph/netgraph.h#34 integrate
.. //depot/projects/hammer/sys/netgraph/ng_base.c#58 integrate
.. //depot/projects/hammer/sys/netinet/in.h#28 integrate
.. //depot/projects/hammer/sys/netinet/in_mcast.c#4 integrate
.. //depot/projects/hammer/sys/netinet/in_pcb.c#56 integrate
.. //depot/projects/hammer/sys/netinet/in_pcb.h#38 integrate
.. //depot/projects/hammer/sys/netinet/in_proto.c#25 integrate
.. //depot/projects/hammer/sys/netinet/ip_divert.c#41 integrate
.. //depot/projects/hammer/sys/netinet/ip_fw2.c#94 integrate
.. //depot/projects/hammer/sys/netinet/ip_icmp.c#39 integrate
.. //depot/projects/hammer/sys/netinet/ip_input.c#71 integrate
.. //depot/projects/hammer/sys/netinet/ip_ipsec.c#9 integrate
.. //depot/projects/hammer/sys/netinet/ip_ipsec.h#3 integrate
.. //depot/projects/hammer/sys/netinet/ip_options.c#7 integrate
.. //depot/projects/hammer/sys/netinet/ip_output.c#69 integrate
.. //depot/projects/hammer/sys/netinet/raw_ip.c#51 integrate
.. //depot/projects/hammer/sys/netinet/sctp_asconf.c#16 integrate
.. //depot/projects/hammer/sys/netinet/sctp_bsd_addr.c#11 integrate
.. //depot/projects/hammer/sys/netinet/sctp_bsd_addr.h#7 integrate
.. //depot/projects/hammer/sys/netinet/sctp_constants.h#17 integrate
.. //depot/projects/hammer/sys/netinet/sctp_indata.c#19 integrate
.. //depot/projects/hammer/sys/netinet/sctp_input.c#18 integrate
.. //depot/projects/hammer/sys/netinet/sctp_output.c#22 integrate
.. //depot/projects/hammer/sys/netinet/sctp_pcb.c#20 integrate
.. //depot/projects/hammer/sys/netinet/sctp_pcb.h#14 integrate
.. //depot/projects/hammer/sys/netinet/sctp_sysctl.c#10 integrate
.. //depot/projects/hammer/sys/netinet/sctp_usrreq.c#21 integrate
.. //depot/projects/hammer/sys/netinet/sctp_var.h#12 integrate
.. //depot/projects/hammer/sys/netinet/sctputil.c#25 integrate
.. //depot/projects/hammer/sys/netinet/sctputil.h#13 integrate
.. //depot/projects/hammer/sys/netinet/tcp.h#20 integrate
.. //depot/projects/hammer/sys/netinet/tcp_input.c#83 integrate
.. //depot/projects/hammer/sys/netinet/tcp_output.c#50 integrate
.. //depot/projects/hammer/sys/netinet/tcp_reass.c#3 integrate
.. //depot/projects/hammer/sys/netinet/tcp_sack.c#29 integrate
.. //depot/projects/hammer/sys/netinet/tcp_subr.c#81 integrate
.. //depot/projects/hammer/sys/netinet/tcp_syncache.c#58 integrate
.. //depot/projects/hammer/sys/netinet/tcp_timer.c#31 integrate
.. //depot/projects/hammer/sys/netinet/tcp_timewait.c#4 integrate
.. //depot/projects/hammer/sys/netinet/tcp_usrreq.c#55 integrate
.. //depot/projects/hammer/sys/netinet/udp_usrreq.c#53 integrate
.. //depot/projects/hammer/sys/netinet6/icmp6.c#33 integrate
.. //depot/projects/hammer/sys/netinet6/in6_pcb.c#35 integrate
.. //depot/projects/hammer/sys/netinet6/in6_proto.c#22 integrate
.. //depot/projects/hammer/sys/netinet6/in6_src.c#27 integrate
.. //depot/projects/hammer/sys/netinet6/nd6_nbr.c#26 integrate
.. //depot/projects/hammer/sys/netinet6/raw_ip6.c#35 integrate
.. //depot/projects/hammer/sys/netinet6/sctp6_usrreq.c#16 integrate
.. //depot/projects/hammer/sys/netinet6/udp6_usrreq.c#36 integrate
.. //depot/projects/hammer/sys/nfs4client/nfs4_vnops.c#32 integrate
.. //depot/projects/hammer/sys/nfsclient/nfs_lock.c#18 integrate
.. //depot/projects/hammer/sys/nfsclient/nfs_vnops.c#60 integrate
.. //depot/projects/hammer/sys/nfsclient/nfsnode.h#21 integrate
.. //depot/projects/hammer/sys/nlm/nlm_prot_impl.c#3 integrate
.. //depot/projects/hammer/sys/pc98/cbus/clock.c#14 integrate
.. //depot/projects/hammer/sys/pc98/cbus/sc_machdep.h#2 integrate
.. //depot/projects/hammer/sys/pc98/cbus/syscons_cbus.c#6 integrate
.. //depot/projects/hammer/sys/pc98/conf/GENERIC.hints#14 integrate
.. //depot/projects/hammer/sys/pci/if_rl.c#60 integrate
.. //depot/projects/hammer/sys/powerpc/aim/locore.S#3 integrate
.. //depot/projects/hammer/sys/powerpc/aim/machdep.c#6 integrate
.. //depot/projects/hammer/sys/powerpc/aim/mmu_oea.c#2 integrate
.. //depot/projects/hammer/sys/powerpc/booke/clock.c#3 integrate
.. //depot/projects/hammer/sys/powerpc/conf/MPC85XX#2 integrate
.. //depot/projects/hammer/sys/powerpc/fpu/fpu_add.c#2 integrate
.. //depot/projects/hammer/sys/powerpc/fpu/fpu_compare.c#2 integrate
.. //depot/projects/hammer/sys/powerpc/fpu/fpu_div.c#2 integrate
.. //depot/projects/hammer/sys/powerpc/fpu/fpu_explode.c#2 integrate
.. //depot/projects/hammer/sys/powerpc/fpu/fpu_implode.c#2 integrate
.. //depot/projects/hammer/sys/powerpc/fpu/fpu_mul.c#2 integrate
.. //depot/projects/hammer/sys/powerpc/fpu/fpu_sqrt.c#2 integrate
.. //depot/projects/hammer/sys/powerpc/fpu/fpu_subr.c#2 integrate
.. //depot/projects/hammer/sys/powerpc/include/asm.h#6 integrate
.. //depot/projects/hammer/sys/powerpc/include/atomic.h#13 integrate
.. //depot/projects/hammer/sys/powerpc/powerpc/intr_machdep.c#18 integrate
.. //depot/projects/hammer/sys/powerpc/psim/openpic_iobus.c#10 integrate
.. //depot/projects/hammer/sys/rpc/clnt_rc.c#3 integrate
.. //depot/projects/hammer/sys/security/audit/audit.c#17 integrate
.. //depot/projects/hammer/sys/security/audit/audit_arg.c#13 integrate
.. //depot/projects/hammer/sys/security/audit/audit_bsm.c#13 integrate
.. //depot/projects/hammer/sys/security/audit/audit_bsm_klib.c#11 integrate
.. //depot/projects/hammer/sys/security/audit/audit_bsm_token.c#7 integrate
.. //depot/projects/hammer/sys/security/audit/audit_pipe.c#9 integrate
.. //depot/projects/hammer/sys/security/audit/audit_syscalls.c#13 integrate
.. //depot/projects/hammer/sys/security/audit/audit_trigger.c#7 integrate
.. //depot/projects/hammer/sys/security/audit/audit_worker.c#9 integrate
.. //depot/projects/hammer/sys/security/mac/mac_framework.h#10 integrate
.. //depot/projects/hammer/sys/security/mac/mac_inet.c#7 integrate
.. //depot/projects/hammer/sys/security/mac/mac_internal.h#14 integrate
.. //depot/projects/hammer/sys/security/mac/mac_policy.h#11 integrate
.. //depot/projects/hammer/sys/sparc64/include/intr_machdep.h#8 integrate
.. //depot/projects/hammer/sys/sparc64/include/smp.h#10 integrate
.. //depot/projects/hammer/sys/sparc64/pci/apb.c#12 integrate
.. //depot/projects/hammer/sys/sparc64/pci/ofw_pci_if.m#8 integrate
.. //depot/projects/hammer/sys/sparc64/pci/ofw_pcib.c#9 integrate
.. //depot/projects/hammer/sys/sparc64/pci/ofw_pcib_subr.c#9 integrate
.. //depot/projects/hammer/sys/sparc64/pci/ofw_pcib_subr.h#4 integrate
.. //depot/projects/hammer/sys/sparc64/pci/ofw_pcibus.c#18 integrate
.. //depot/projects/hammer/sys/sparc64/pci/psycho.c#39 integrate
.. //depot/projects/hammer/sys/sparc64/pci/psychovar.h#14 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/intr_machdep.c#18 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/mp_machdep.c#23 integrate
.. //depot/projects/hammer/sys/sun4v/sun4v/intr_machdep.c#7 integrate
.. //depot/projects/hammer/sys/sys/_lockmgr.h#1 branch
.. //depot/projects/hammer/sys/sys/_stack.h#1 branch
.. //depot/projects/hammer/sys/sys/ata.h#22 integrate
.. //depot/projects/hammer/sys/sys/callout.h#10 integrate
.. //depot/projects/hammer/sys/sys/cpuset.h#5 integrate
.. //depot/projects/hammer/sys/sys/eventhandler.h#14 integrate
.. //depot/projects/hammer/sys/sys/interrupt.h#18 integrate
.. //depot/projects/hammer/sys/sys/jail.h#13 integrate
.. //depot/projects/hammer/sys/sys/kernel.h#25 integrate
.. //depot/projects/hammer/sys/sys/lock.h#23 integrate
.. //depot/projects/hammer/sys/sys/lockf.h#8 integrate
.. //depot/projects/hammer/sys/sys/lockmgr.h#20 integrate
.. //depot/projects/hammer/sys/sys/param.h#110 integrate
.. //depot/projects/hammer/sys/sys/proc.h#118 integrate
.. //depot/projects/hammer/sys/sys/protosw.h#15 integrate
.. //depot/projects/hammer/sys/sys/rwlock.h#12 integrate
.. //depot/projects/hammer/sys/sys/sched.h#27 integrate
.. //depot/projects/hammer/sys/sys/sleepqueue.h#12 integrate
.. //depot/projects/hammer/sys/sys/socket.h#27 integrate
.. //depot/projects/hammer/sys/sys/stack.h#4 integrate
.. //depot/projects/hammer/sys/sys/syscallsubr.h#32 integrate
.. //depot/projects/hammer/sys/sys/sysctl.h#41 integrate
.. //depot/projects/hammer/sys/sys/termios.h#4 integrate
.. //depot/projects/hammer/sys/sys/ttycom.h#10 integrate
.. //depot/projects/hammer/sys/sys/umtx.h#17 integrate
.. //depot/projects/hammer/sys/sys/vnode.h#79 integrate
.. //depot/projects/hammer/sys/ufs/ffs/ffs_softdep.c#54 integrate
.. //depot/projects/hammer/sys/ufs/ufs/dirhash.h#4 integrate
.. //depot/projects/hammer/sys/ufs/ufs/inode.h#13 integrate
.. //depot/projects/hammer/sys/ufs/ufs/ufs_dirhash.c#10 integrate
.. //depot/projects/hammer/sys/ufs/ufs/ufs_gjournal.c#3 integrate
.. //depot/projects/hammer/sys/ufs/ufs/ufs_lookup.c#21 integrate
.. //depot/projects/hammer/sys/ufs/ufs/ufs_vnops.c#54 integrate
.. //depot/projects/hammer/sys/vm/uma.h#18 integrate
.. //depot/projects/hammer/sys/vm/uma_core.c#55 integrate
.. //depot/projects/hammer/sys/vm/vm_glue.c#52 integrate
.. //depot/projects/hammer/sys/vm/vm_map.c#69 integrate
.. //depot/projects/hammer/sys/vm/vm_page.c#71 integrate
.. //depot/projects/hammer/sys/vm/vm_phys.c#5 integrate
.. //depot/projects/hammer/sys/vm/vm_reserv.c#2 integrate
.. //depot/projects/hammer/sys/vm/vm_reserv.h#2 integrate
.. //depot/projects/hammer/sys/vm/vm_zeroidle.c#31 integrate
.. //depot/projects/hammer/tools/regression/lib/libc/stdio/test-printfloat.c#10 integrate
.. //depot/projects/hammer/tools/regression/lib/msun/Makefile#10 integrate
.. //depot/projects/hammer/tools/regression/lib/msun/test-fma.c#1 branch
.. //depot/projects/hammer/tools/regression/lib/msun/test-fma.t#1 branch
.. //depot/projects/hammer/tools/tools/README#27 integrate
.. //depot/projects/hammer/tools/tools/mctest/Makefile#1 branch
.. //depot/projects/hammer/tools/tools/mctest/mctest.1#1 branch
.. //depot/projects/hammer/tools/tools/mctest/mctest.cc#2 integrate
.. //depot/projects/hammer/tools/tools/mctest/mctest.h#2 integrate
.. //depot/projects/hammer/usr.bin/cpuset/cpuset.c#3 integrate
.. //depot/projects/hammer/usr.bin/env/env.1#8 integrate
.. //depot/projects/hammer/usr.bin/env/env.c#7 integrate
.. //depot/projects/hammer/usr.bin/fstat/zfs.c#1 branch
.. //depot/projects/hammer/usr.bin/gprof/gprof.h#10 integrate
.. //depot/projects/hammer/usr.bin/kdump/kdump.1#12 integrate
.. //depot/projects/hammer/usr.bin/kdump/kdump.c#25 integrate
.. //depot/projects/hammer/usr.bin/ktrace/ktrace.1#5 integrate
.. //depot/projects/hammer/usr.bin/ktrace/ktrace.c#6 integrate
.. //depot/projects/hammer/usr.bin/netstat/sctp.c#7 integrate
.. //depot/projects/hammer/usr.bin/top/machine.c#24 integrate
.. //depot/projects/hammer/usr.bin/vmstat/vmstat.c#30 integrate
.. //depot/projects/hammer/usr.bin/xlint/lint1/param.h#6 integrate
.. //depot/projects/hammer/usr.sbin/btxld/btxld.c#7 integrate
.. //depot/projects/hammer/usr.sbin/config/main.c#18 integrate
.. //depot/projects/hammer/usr.sbin/fifolog/Makefile#2 integrate
.. //depot/projects/hammer/usr.sbin/fifolog/Makefile.inc#2 integrate
.. //depot/projects/hammer/usr.sbin/fifolog/fifolog_create/Makefile#2 integrate
.. //depot/projects/hammer/usr.sbin/fifolog/fifolog_create/fifolog.1#2 integrate
.. //depot/projects/hammer/usr.sbin/fifolog/fifolog_reader/Makefile#3 integrate
.. //depot/projects/hammer/usr.sbin/fifolog/fifolog_writer/Makefile#2 integrate
.. //depot/projects/hammer/usr.sbin/fifolog/lib/Makefile#2 integrate
.. //depot/projects/hammer/usr.sbin/ndiscvt/inf.c#8 integrate
.. //depot/projects/hammer/usr.sbin/ndiscvt/ndiscvt.c#9 integrate
.. //depot/projects/hammer/usr.sbin/ndiscvt/ndisgen.sh#3 integrate
.. //depot/projects/hammer/usr.sbin/pkg_install/Makefile#11 integrate
.. //depot/projects/hammer/usr.sbin/pkg_install/add/perform.c#11 integrate
.. //depot/projects/hammer/usr.sbin/pkg_install/delete/perform.c#5 integrate
.. //depot/projects/hammer/usr.sbin/pkg_install/info/main.c#11 integrate
.. //depot/projects/hammer/usr.sbin/pkg_install/info/perform.c#6 integrate
.. //depot/projects/hammer/usr.sbin/pkg_install/lib/lib.h#16 integrate
.. //depot/projects/hammer/usr.sbin/pkg_install/lib/match.c#8 integrate
.. //depot/projects/hammer/usr.sbin/rpc.lockd/lockd.c#11 integrate
.. //depot/projects/hammer/usr.sbin/rpc.statd/statd.c#8 integrate
.. //depot/projects/hammer/usr.sbin/sysinstall/devices.c#22 integrate
.. //depot/projects/hammer/usr.sbin/sysinstall/menus.c#48 integrate

Differences ...

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

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile.inc1,v 1.602 2008/03/29 17:44:38 ru Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.603 2008/04/15 05:14:42 ru Exp $
 #
 # Make command line options:
 #	-DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -975,10 +975,12 @@
 #
 # cross-tools: Build cross-building tools
 #
-.if ${TARGET_ARCH} != ${MACHINE_ARCH}
+.if ${TARGET_ARCH} != ${MACHINE_ARCH} || ${BOOTSTRAPPING} < 800035
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386"
 _btxld=		usr.sbin/btxld
 .endif
+.endif
+.if ${TARGET_ARCH} != ${MACHINE_ARCH}
 .if ${MK_RESCUE} != "no" || defined(RELEASEDIR)
 _crunchide=	usr.sbin/crunch/crunchide
 .endif

==== //depot/projects/hammer/ObsoleteFiles.inc#50 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.135 2008/03/29 17:44:38 ru Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.136 2008/04/01 11:05:26 flz 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,11 @@
 # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
 #
 
+# 20080331: pkg_sign has been removed
+OLD_FILES+=usr/sbin/pkg_check
+OLD_FILES+=usr/sbin/pkg_sign
+OLD_FILES+=usr/share/man/man1/pkg_check.1.gz
+OLD_FILES+=usr/share/man/man1/pkg_sign.1.gz
 # 20080220: geom_lvm rename to geom_linux_lvm
 OLD_FILES+=usr/share/man/man4/geom_lvm.4.gz
 # 20080126: oldcard.4 removal

==== //depot/projects/hammer/UPDATING#115 (text+ko) ====

@@ -22,6 +22,13 @@
 	to maximize performance.  (To disable malloc debugging, run
 	ln -s aj /etc/malloc.conf.)
 
+20080408:
+	psm(4) has gained write(2) support in native operation level.
+	Arbitrary commands can be written to /dev/psm%d and status can
+	be read back from it.  Therefore, an application is responsible
+	for status validation and error recovery.  It is a no-op in
+	other operation levels.
+
 20080312:
 	Support for KSE threading has been removed from the kernel.  To
 	run legacy applications linked against KSE libmap.conf may
@@ -1007,4 +1014,4 @@
 Contact Warner Losh if you have any questions about your use of
 this document.
 
-$FreeBSD: src/UPDATING,v 1.523 2008/03/12 09:48:42 jeff Exp $
+$FreeBSD: src/UPDATING,v 1.524 2008/04/08 17:55:25 jkim Exp $

==== //depot/projects/hammer/bin/ls/ls.1#27 (text+ko) ====

@@ -30,9 +30,9 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ls.1	8.7 (Berkeley) 7/29/94
-.\" $FreeBSD: src/bin/ls/ls.1,v 1.100 2006/10/12 10:08:52 ru Exp $
+.\" $FreeBSD: src/bin/ls/ls.1,v 1.102 2008/04/04 05:55:42 ru Exp $
 .\"
-.Dd October 12, 2006
+.Dd April 4, 2008
 .Dt LS 1
 .Os
 .Sh NAME
@@ -41,6 +41,7 @@
 .Sh SYNOPSIS
 .Nm
 .Op Fl ABCFGHILPRSTUWZabcdfghiklmnopqrstuwx1
+.Op Fl D Ar format
 .Op Ar
 .Sh DESCRIPTION
 For each operand that names a
@@ -88,6 +89,21 @@
 is the numeric value of the character in octal.
 .It Fl C
 Force multi-column output; this is the default when output is to a terminal.
+.It Fl D Ar format
+When printing in the long
+.Pq Fl l
+format, use
+.Ar format
+to format the date and time output.
+The argument
+.Ar format
+is a string used by
+.Xr strftime 3 .
+Depending on the choice of format string, this may result in a
+different number of columns in the output.
+This option overrides the
+.Fl T
+option.
 .It Fl F
 Display a slash
 .Pq Ql /
@@ -146,12 +162,13 @@
 Sort by size (largest file first) before sorting the operands in
 lexicographical order.
 .It Fl T
-When used with the
-.Fl l
-(lowercase letter
-.Dq ell )
-option, display complete time information for the file, including
+When printing in the long
+.Pq Fl l
+format, display complete time information for the file, including
 month, day, hour, minute, second, and year.
+The
+.Fl D
+option gives even more control over the output format.
 .It Fl U
 Use time when file was created for sorting or printing.
 .It Fl W
@@ -325,7 +342,12 @@
 modified, and the pathname.
 .Pp
 If the modification time of the file is more than 6 months
-in the past or future, then the year of the last modification
+in the past or future, and the
+.Fl D
+or
+.Fl T
+are not specified,
+then the year of the last modification
 is displayed in place of the hour and minute fields.
 .Pp
 If the owner or group names are not a known user or group name,
@@ -657,6 +679,7 @@
 .Xr getfacl 1 ,
 .Xr sort 1 ,
 .Xr xterm 1 ,
+.Xr strftime 3 ,
 .Xr termcap 5 ,
 .Xr maclabel 7 ,
 .Xr symlink 7 ,

==== //depot/projects/hammer/bin/ls/ls.c#18 (text+ko) ====

@@ -42,7 +42,7 @@
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.85 2006/03/24 17:09:03 jhb Exp $");
+__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.86 2008/04/04 03:57:46 grog Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -125,10 +125,11 @@
 static int f_singlecol;		/* use single column output */
        int f_size;		/* list size in short listing */
        int f_slash;		/* similar to f_type, but only for dirs */
-       int f_sortacross;	/* sort across rows, not down columns */ 
+       int f_sortacross;	/* sort across rows, not down columns */
        int f_statustime;	/* use time of last mode change */
 static int f_stream;		/* stream the output, separate with commas */
 static int f_timesort;		/* sort by time vice name */
+       char *f_timeformat;      /* user-specified time format */
 static int f_sizesort;
        int f_type;		/* add type character for non-regular files */
 static int f_whiteout;		/* show whiteout entries */
@@ -179,7 +180,7 @@
 
 	fts_options = FTS_PHYSICAL;
  	while ((ch = getopt(argc, argv,
-	    "1ABCFGHILPRSTUWZabcdfghiklmnopqrstuwx")) != -1) {
+	    "1ABCD:FGHILPRSTUWZabcdfghiklmnopqrstuwx")) != -1) {
 		switch (ch) {
 		/*
 		 * The -1, -C, -x and -l options all override each other so
@@ -198,6 +199,9 @@
 		case 'C':
 			f_sortacross = f_longform = f_singlecol = 0;
 			break;
+                case 'D':
+                        f_timeformat = optarg;
+                        break;
 		case 'l':
 			f_longform = 1;
 			f_singlecol = 0;

==== //depot/projects/hammer/bin/ls/ls.h#7 (text+ko) ====

@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)ls.h	8.1 (Berkeley) 5/31/93
- * $FreeBSD: src/bin/ls/ls.h,v 1.22 2006/03/24 16:38:02 jhb Exp $
+ * $FreeBSD: src/bin/ls/ls.h,v 1.23 2008/04/04 03:57:46 grog Exp $
  */
 

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



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