Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 5 Jan 2004 13:36:12 -0800 (PST)
From:      Peter Wemm <peter@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 44821 for review
Message-ID:  <200401052136.i05LaC4O058969@repoman.freebsd.org>

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

Change 44821 by peter@peter_daintree on 2004/01/05 13:35:50

	IFC @44820

Affected files ...

.. //depot/projects/hammer/COPYRIGHT#2 integrate
.. //depot/projects/hammer/bin/rm/rm.c#6 integrate
.. //depot/projects/hammer/bin/sh/eval.c#4 integrate
.. //depot/projects/hammer/contrib/amd/fsinfo/fsinfo.8#4 integrate
.. //depot/projects/hammer/contrib/gcc/c-lex.h#2 delete
.. //depot/projects/hammer/contrib/gcc/config/alpha/linux-ecoff.h#2 delete
.. //depot/projects/hammer/contrib/gcc/config/alpha/osf12.h#2 delete
.. //depot/projects/hammer/contrib/gcc/config/alpha/osf2or3.h#2 delete
.. //depot/projects/hammer/contrib/gcc/config/arm/arm-wince-pe.h#2 delete
.. //depot/projects/hammer/contrib/gcc/config/arm/riscix.h#2 delete
.. //depot/projects/hammer/contrib/gcc/config/arm/riscix1-1.h#2 delete
.. //depot/projects/hammer/contrib/gcc/config/arm/rix-gas.h#2 delete
.. //depot/projects/hammer/contrib/gcc/config/arm/t-riscix#2 delete
.. //depot/projects/hammer/contrib/gcc/config/float-c4x.h#2 delete
.. //depot/projects/hammer/contrib/gcc/config/float-i128.h#2 delete
.. //depot/projects/hammer/contrib/gcc/config/float-i32.h#2 delete
.. //depot/projects/hammer/contrib/gcc/config/float-i386.h#2 delete
.. //depot/projects/hammer/contrib/gcc/config/float-i64.h#2 delete
.. //depot/projects/hammer/contrib/gcc/config/float-m68k.h#2 delete
.. //depot/projects/hammer/contrib/gcc/config/float-sh.h#2 delete
.. //depot/projects/hammer/contrib/gcc/config/float-sparc.h#2 delete
.. //depot/projects/hammer/contrib/gcc/config/float-vax.h#2 delete
.. //depot/projects/hammer/contrib/gcc/config/i386/386bsd.h#2 delete
.. //depot/projects/hammer/contrib/gcc/config/i386/aix386.h#2 delete
.. //depot/projects/hammer/contrib/gcc/config/i386/aix386ng.h#2 delete
.. //depot/projects/hammer/contrib/gcc/config/i386/bsd386.h#2 delete
.. //depot/projects/hammer/contrib/gcc/config/i386/dgux.h#2 delete
.. //depot/projects/hammer/contrib/gcc/config/i386/djgpp-rtems.h#2 delete
.. //depot/projects/hammer/contrib/gcc/config/i386/interix.c#2 delete
.. //depot/projects/hammer/contrib/gcc/config/i386/isc.h#2 delete
.. //depot/projects/hammer/contrib/gcc/config/i386/isccoff.h#2 delete
.. //depot/projects/hammer/contrib/gcc/config/i386/iscdbx.h#2 delete
.. //depot/projects/hammer/contrib/gcc/config/i386/linux-oldld.h#2 delete
.. //depot/projects/hammer/contrib/gcc/config/i386/next.h#2 delete
.. //depot/projects/hammer/contrib/gcc/config/i386/osf1-ci.asm#2 delete
.. //depot/projects/hammer/contrib/gcc/config/i386/osf1-cn.asm#2 delete
.. //depot/projects/hammer/contrib/gcc/config/i386/osf1elf.h#2 delete
.. //depot/projects/hammer/contrib/gcc/config/i386/osf1elfgdb.h#2 delete
.. //depot/projects/hammer/contrib/gcc/config/i386/osfelf.h#2 delete
.. //depot/projects/hammer/contrib/gcc/config/i386/osfrose.h#2 delete
.. //depot/projects/hammer/contrib/gcc/config/i386/rtems.h#2 delete
.. //depot/projects/hammer/contrib/gcc/config/i386/seq-gas.h#2 delete
.. //depot/projects/hammer/contrib/gcc/config/i386/seq-sysv3.h#2 delete
.. //depot/projects/hammer/contrib/gcc/config/i386/seq2-sysv3.h#2 delete
.. //depot/projects/hammer/contrib/gcc/config/i386/sequent.h#2 delete
.. //depot/projects/hammer/contrib/gcc/config/i386/sol2gas.h#2 delete
.. //depot/projects/hammer/contrib/gcc/config/i386/sun.h#2 delete
.. //depot/projects/hammer/contrib/gcc/config/i386/sun386.h#2 delete
.. //depot/projects/hammer/contrib/gcc/config/i386/t-dgux#2 delete
.. //depot/projects/hammer/contrib/gcc/config/i386/t-next#2 delete
.. //depot/projects/hammer/contrib/gcc/config/i386/t-osf#2 delete
.. //depot/projects/hammer/contrib/gcc/config/i386/t-osf1elf#2 delete
.. //depot/projects/hammer/contrib/gcc/config/i386/t-sco5gas#3 delete
.. //depot/projects/hammer/contrib/gcc/config/i386/v3gas.h#2 delete
.. //depot/projects/hammer/contrib/gcc/config/nextstep-protos.h#2 delete
.. //depot/projects/hammer/contrib/gcc/config/nextstep.c#2 delete
.. //depot/projects/hammer/contrib/gcc/config/nextstep.h#2 delete
.. //depot/projects/hammer/contrib/gcc/config/nextstep21.h#2 delete
.. //depot/projects/hammer/contrib/gcc/config/rs6000/softfloat.h#2 delete
.. //depot/projects/hammer/contrib/gcc/config/s390/t-linux#2 delete
.. //depot/projects/hammer/contrib/gcc/config/sparc/rtems.h#2 delete
.. //depot/projects/hammer/contrib/gcc/config/sparc/sol2-g1.asm#2 delete
.. //depot/projects/hammer/contrib/gcc/config/sparc/sol27-sld.h#2 delete
.. //depot/projects/hammer/contrib/gcc/config/t-install-cpp#2 delete
.. //depot/projects/hammer/contrib/gcc/cp/mpw-config.in#2 delete
.. //depot/projects/hammer/contrib/gcc/cp/mpw-make.sed#2 delete
.. //depot/projects/hammer/contrib/gcc/dependence.c#2 delete
.. //depot/projects/hammer/contrib/gcc/doc/vms.texi#2 delete
.. //depot/projects/hammer/contrib/gcc/enquire.c#2 delete
.. //depot/projects/hammer/contrib/gcc/f/version.c#6 delete
.. //depot/projects/hammer/contrib/gcc/f/version.h#2 delete
.. //depot/projects/hammer/contrib/gcc/ggc-callbacks.c#2 delete
.. //depot/projects/hammer/contrib/gcc/halfpic.c#2 delete
.. //depot/projects/hammer/contrib/gcc/halfpic.h#2 delete
.. //depot/projects/hammer/contrib/gcc/hash.c#2 delete
.. //depot/projects/hammer/contrib/gcc/hash.h#2 delete
.. //depot/projects/hammer/contrib/gcc/tradcif.y#2 delete
.. //depot/projects/hammer/contrib/gcc/tradcpp.c#4 delete
.. //depot/projects/hammer/contrib/gcc/tradcpp.h#2 delete
.. //depot/projects/hammer/contrib/ipfilter/ipmon.c#4 integrate
.. //depot/projects/hammer/contrib/pnpinfo/pnpinfo.c#2 integrate
.. //depot/projects/hammer/contrib/tcp_wrappers/socket.c#2 integrate
.. //depot/projects/hammer/etc/apmd.conf#2 integrate
.. //depot/projects/hammer/etc/defaults/rc.conf#19 integrate
.. //depot/projects/hammer/etc/periodic/daily/150.clean-hoststat#4 integrate
.. //depot/projects/hammer/etc/rc.d/cron#3 integrate
.. //depot/projects/hammer/etc/rc.d/diskless#8 integrate
.. //depot/projects/hammer/etc/rc.resume#2 integrate
.. //depot/projects/hammer/etc/rc.suspend#2 integrate
.. //depot/projects/hammer/etc/sendmail/freebsd.mc#4 integrate
.. //depot/projects/hammer/games/fortune/datfiles/fortunes#16 integrate
.. //depot/projects/hammer/games/fortune/datfiles/fortunes2#10 integrate
.. //depot/projects/hammer/games/fortune/datfiles/fortunes2-o#5 integrate
.. //depot/projects/hammer/games/fortune/datfiles/murphy#4 integrate
.. //depot/projects/hammer/games/fortune/datfiles/startrek#6 integrate
.. //depot/projects/hammer/games/fortune/fortune/fortune.c#3 integrate
.. //depot/projects/hammer/gnu/usr.bin/cc/cc_int/Makefile#8 integrate
.. //depot/projects/hammer/gnu/usr.bin/cc/f77/Makefile#3 integrate
.. //depot/projects/hammer/gnu/usr.bin/cc/f771/Makefile#2 integrate
.. //depot/projects/hammer/include/paths.h#7 integrate
.. //depot/projects/hammer/lib/libc/gen/opendir.c#4 integrate
.. //depot/projects/hammer/lib/libc/gen/sysconf.3#3 integrate
.. //depot/projects/hammer/lib/libc/locale/setlocale.c#7 integrate
.. //depot/projects/hammer/lib/libc/sys/accept.2#4 integrate
.. //depot/projects/hammer/lib/libc/sys/getpeername.2#3 integrate
.. //depot/projects/hammer/lib/libc/sys/getsockname.2#4 integrate
.. //depot/projects/hammer/lib/libc/sys/getsockopt.2#4 integrate
.. //depot/projects/hammer/lib/libc/sys/recv.2#4 integrate
.. //depot/projects/hammer/lib/libc/sys/sendfile.2#5 integrate
.. //depot/projects/hammer/lib/libc_r/man/pthread_mutex_init.3#3 integrate
.. //depot/projects/hammer/lib/libc_r/uthread/uthread_join.c#3 integrate
.. //depot/projects/hammer/lib/libpthread/man/Makefile.inc#3 integrate
.. //depot/projects/hammer/lib/libpthread/man/pthread_attr.3#3 integrate
.. //depot/projects/hammer/lib/libpthread/man/pthread_equal.3#2 integrate
.. //depot/projects/hammer/lib/libpthread/man/pthread_exit.3#2 integrate
.. //depot/projects/hammer/lib/libpthread/man/pthread_getspecific.3#2 integrate
.. //depot/projects/hammer/lib/libpthread/man/pthread_join.3#2 integrate
.. //depot/projects/hammer/lib/libpthread/man/pthread_key_create.3#2 integrate
.. //depot/projects/hammer/lib/libpthread/man/pthread_key_delete.3#2 integrate
.. //depot/projects/hammer/lib/libpthread/man/pthread_kill.3#2 integrate
.. //depot/projects/hammer/lib/libpthread/man/pthread_mutex_destroy.3#2 integrate
.. //depot/projects/hammer/lib/libpthread/man/pthread_mutex_init.3#3 integrate
.. //depot/projects/hammer/lib/libpthread/man/pthread_mutex_lock.3#2 integrate
.. //depot/projects/hammer/lib/libpthread/man/pthread_mutex_trylock.3#2 integrate
.. //depot/projects/hammer/lib/libpthread/man/pthread_mutex_unlock.3#2 integrate
.. //depot/projects/hammer/lib/libpthread/man/pthread_mutexattr.3#3 integrate
.. //depot/projects/hammer/lib/libpthread/man/pthread_once.3#3 integrate
.. //depot/projects/hammer/lib/libpthread/man/pthread_rwlock_wrlock.3#3 integrate
.. //depot/projects/hammer/lib/libpthread/man/pthread_rwlockattr_destroy.3#2 integrate
.. //depot/projects/hammer/lib/libpthread/man/pthread_rwlockattr_getpshared.3#2 integrate
.. //depot/projects/hammer/lib/libpthread/man/pthread_rwlockattr_init.3#2 integrate
.. //depot/projects/hammer/lib/libpthread/man/pthread_rwlockattr_setpshared.3#3 integrate
.. //depot/projects/hammer/lib/libpthread/man/pthread_schedparam.3#2 integrate
.. //depot/projects/hammer/lib/libpthread/man/pthread_self.3#2 integrate
.. //depot/projects/hammer/lib/libpthread/man/pthread_setspecific.3#2 integrate
.. //depot/projects/hammer/lib/libpthread/man/pthread_sigmask.3#2 integrate
.. //depot/projects/hammer/lib/libpthread/man/pthread_testcancel.3#2 integrate
.. //depot/projects/hammer/lib/libpthread/man/sem_destroy.3#3 integrate
.. //depot/projects/hammer/lib/libpthread/man/sem_getvalue.3#2 integrate
.. //depot/projects/hammer/lib/libpthread/man/sem_init.3#2 integrate
.. //depot/projects/hammer/lib/libpthread/man/sem_post.3#2 integrate
.. //depot/projects/hammer/lib/libpthread/man/sem_wait.3#2 integrate
.. //depot/projects/hammer/lib/libpthread/man/sigwait.3#3 integrate
.. //depot/projects/hammer/lib/libpthread/pthread.map#7 integrate
.. //depot/projects/hammer/lib/libpthread/thread/Makefile.inc#10 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_create.c#12 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_private.h#22 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_sig.c#19 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_sigaltstack.c#1 branch
.. //depot/projects/hammer/lib/libthr/thread/thr_create.c#8 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_init.c#8 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_kern.c#9 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_mutex.c#14 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_private.h#11 integrate
.. //depot/projects/hammer/libexec/rtld-elf/rtld.c#14 integrate
.. //depot/projects/hammer/release/doc/ja_JP.eucJP/early-adopter/article.sgml#6 integrate
.. //depot/projects/hammer/release/scripts/mkpkgindex.sh#1 branch
.. //depot/projects/hammer/rescue/rescue/Makefile#12 integrate
.. //depot/projects/hammer/sbin/comcontrol/comcontrol.8#2 integrate
.. //depot/projects/hammer/sbin/dump/main.c#11 integrate
.. //depot/projects/hammer/sbin/fsck/fsutil.c#2 integrate
.. //depot/projects/hammer/sbin/fsck/fsutil.h#3 integrate
.. //depot/projects/hammer/sbin/fsck_msdosfs/Makefile#2 integrate
.. //depot/projects/hammer/sbin/fsck_msdosfs/boot.c#3 integrate
.. //depot/projects/hammer/sbin/fsck_msdosfs/check.c#4 integrate
.. //depot/projects/hammer/sbin/fsck_msdosfs/dir.c#2 integrate
.. //depot/projects/hammer/sbin/fsck_msdosfs/dosfs.h#3 integrate
.. //depot/projects/hammer/sbin/fsck_msdosfs/ext.h#4 integrate
.. //depot/projects/hammer/sbin/fsck_msdosfs/fat.c#3 integrate
.. //depot/projects/hammer/sbin/fsck_msdosfs/fsck_msdosfs.8#4 integrate
.. //depot/projects/hammer/sbin/fsck_msdosfs/main.c#3 integrate
.. //depot/projects/hammer/sbin/growfs/growfs.8#5 integrate
.. //depot/projects/hammer/sbin/ip6fw/ip6fw.8#5 integrate
.. //depot/projects/hammer/sbin/ipfw/ipfw.8#16 integrate
.. //depot/projects/hammer/sbin/ipfw/ipfw2.c#18 integrate
.. //depot/projects/hammer/sbin/mdconfig/mdconfig.8#9 integrate
.. //depot/projects/hammer/sbin/mknod/mknod.8#5 integrate
.. //depot/projects/hammer/share/man/man3/Makefile#3 integrate
.. //depot/projects/hammer/share/man/man3/pthread.3#3 integrate
.. //depot/projects/hammer/share/man/man3/pthread_mutex_timedlock.3#1 branch
.. //depot/projects/hammer/share/man/man4/Makefile#32 integrate
.. //depot/projects/hammer/share/man/man4/acpi.4#16 integrate
.. //depot/projects/hammer/share/man/man4/acpi_thermal.4#1 branch
.. //depot/projects/hammer/share/man/man4/amr.4#6 integrate
.. //depot/projects/hammer/share/man/man4/crypto.4#3 integrate
.. //depot/projects/hammer/share/man/man4/dcons.4#2 integrate
.. //depot/projects/hammer/share/man/man4/dcons_crom.4#2 integrate
.. //depot/projects/hammer/share/man/man4/digi.4#2 integrate
.. //depot/projects/hammer/share/man/man4/ef.4#2 integrate
.. //depot/projects/hammer/share/man/man4/gdb.4#1 branch
.. //depot/projects/hammer/share/man/man4/harp.4#2 integrate
.. //depot/projects/hammer/share/man/man4/mac_stub.4#2 integrate
.. //depot/projects/hammer/share/man/man4/man4.i386/cx.4#5 integrate
.. //depot/projects/hammer/share/man/man4/man4.i386/ndis.4#2 integrate
.. //depot/projects/hammer/share/man/man4/matcd.4#3 integrate
.. //depot/projects/hammer/share/man/man4/meteor.4#2 integrate
.. //depot/projects/hammer/share/man/man4/miibus.4#5 integrate
.. //depot/projects/hammer/share/man/man4/ng_atm.4#4 integrate
.. //depot/projects/hammer/share/man/man4/ng_atmpif.4#2 integrate
.. //depot/projects/hammer/share/man/man4/ng_sscfu.4#2 integrate
.. //depot/projects/hammer/share/man/man4/ng_sscop.4#2 integrate
.. //depot/projects/hammer/share/man/man4/ng_uni.4#2 integrate
.. //depot/projects/hammer/share/man/man4/rndtest.4#3 integrate
.. //depot/projects/hammer/share/man/man4/safe.4#2 integrate
.. //depot/projects/hammer/share/man/man4/ste.4#3 integrate
.. //depot/projects/hammer/share/man/man4/utopia.4#4 integrate
.. //depot/projects/hammer/share/man/man4/vinumdebug.4#1 branch
.. //depot/projects/hammer/share/man/man4/vpo.4#4 integrate
.. //depot/projects/hammer/share/man/man4/xe.4#3 integrate
.. //depot/projects/hammer/share/man/man5/devfs.5#3 integrate
.. //depot/projects/hammer/share/man/man5/rc.conf.5#18 integrate
.. //depot/projects/hammer/share/man/man7/release.7#15 integrate
.. //depot/projects/hammer/share/man/man9/mutex.9#7 integrate
.. //depot/projects/hammer/share/man/man9/sx.9#4 integrate
.. //depot/projects/hammer/share/man/man9/taskqueue.9#3 integrate
.. //depot/projects/hammer/share/mk/bsd.obj.mk#3 integrate
.. //depot/projects/hammer/sys/alpha/alpha/db_instruction.h#2 integrate
.. //depot/projects/hammer/sys/alpha/alpha/db_trace.c#6 integrate
.. //depot/projects/hammer/sys/alpha/alpha/machdep.c#20 integrate
.. //depot/projects/hammer/sys/alpha/alpha/vm_machdep.c#12 integrate
.. //depot/projects/hammer/sys/alpha/include/kse.h#2 delete
.. //depot/projects/hammer/sys/alpha/linux/linux_proto.h#4 integrate
.. //depot/projects/hammer/sys/alpha/linux/linux_syscall.h#4 integrate
.. //depot/projects/hammer/sys/alpha/linux/linux_sysent.c#4 integrate
.. //depot/projects/hammer/sys/alpha/linux/syscalls.conf#2 integrate
.. //depot/projects/hammer/sys/alpha/linux/syscalls.master#4 integrate
.. //depot/projects/hammer/sys/alpha/osf1/osf1_proto.h#3 integrate
.. //depot/projects/hammer/sys/alpha/osf1/osf1_signal.c#12 integrate
.. //depot/projects/hammer/sys/alpha/osf1/osf1_syscall.h#3 integrate
.. //depot/projects/hammer/sys/alpha/osf1/osf1_sysent.c#3 integrate
.. //depot/projects/hammer/sys/alpha/osf1/syscalls.conf#2 integrate
.. //depot/projects/hammer/sys/alpha/osf1/syscalls.master#3 integrate
.. //depot/projects/hammer/sys/amd64/amd64/machdep.c#77 integrate
.. //depot/projects/hammer/sys/amd64/amd64/pmap.c#51 integrate
.. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#25 integrate
.. //depot/projects/hammer/sys/amd64/ia32/ia32_signal.c#11 integrate
.. //depot/projects/hammer/sys/amd64/include/kse.h#6 delete
.. //depot/projects/hammer/sys/boot/alpha/common/conf.c#3 integrate
.. //depot/projects/hammer/sys/boot/alpha/common/main.c#2 integrate
.. //depot/projects/hammer/sys/boot/alpha/libalpha/OSFpal.c#2 integrate
.. //depot/projects/hammer/sys/boot/alpha/libalpha/alpha_copy.c#2 integrate
.. //depot/projects/hammer/sys/boot/alpha/libalpha/alpha_module.c#2 integrate
.. //depot/projects/hammer/sys/boot/alpha/libalpha/bootinfo.c#3 integrate
.. //depot/projects/hammer/sys/boot/alpha/libalpha/delay.c#2 integrate
.. //depot/projects/hammer/sys/boot/alpha/libalpha/devicename.c#2 integrate
.. //depot/projects/hammer/sys/boot/alpha/libalpha/elf_freebsd.c#4 integrate
.. //depot/projects/hammer/sys/boot/alpha/libalpha/getsecs.c#2 integrate
.. //depot/projects/hammer/sys/boot/alpha/libalpha/prom.c#2 integrate
.. //depot/projects/hammer/sys/boot/alpha/libalpha/reboot.c#2 integrate
.. //depot/projects/hammer/sys/boot/alpha/libalpha/srmdisk.c#3 integrate
.. //depot/projects/hammer/sys/boot/alpha/libalpha/srmnet.c#2 integrate
.. //depot/projects/hammer/sys/boot/alpha/libalpha/time.c#2 integrate
.. //depot/projects/hammer/sys/boot/arc/lib/abort.c#2 integrate
.. //depot/projects/hammer/sys/boot/arc/lib/arcconsole.c#2 integrate
.. //depot/projects/hammer/sys/boot/arc/lib/arcdisk.c#4 integrate
.. //depot/projects/hammer/sys/boot/arc/lib/bootinfo.c#3 integrate
.. //depot/projects/hammer/sys/boot/arc/lib/delay.c#2 integrate
.. //depot/projects/hammer/sys/boot/arc/lib/devicename.c#3 integrate
.. //depot/projects/hammer/sys/boot/arc/lib/elf_freebsd.c#4 integrate
.. //depot/projects/hammer/sys/boot/arc/lib/module.c#2 integrate
.. //depot/projects/hammer/sys/boot/arc/lib/prom.c#2 integrate
.. //depot/projects/hammer/sys/boot/arc/lib/setjmperr.c#2 integrate
.. //depot/projects/hammer/sys/boot/arc/lib/time.c#2 integrate
.. //depot/projects/hammer/sys/boot/arc/loader/conf.c#3 integrate
.. //depot/projects/hammer/sys/boot/arc/loader/main.c#2 integrate
.. //depot/projects/hammer/sys/boot/efi/libefi/bootinfo.c#4 integrate
.. //depot/projects/hammer/sys/boot/efi/libefi/devicename.c#2 integrate
.. //depot/projects/hammer/sys/boot/efi/libefi/efifpswa.c#2 integrate
.. //depot/projects/hammer/sys/boot/efi/libefi/efinet.c#2 integrate
.. //depot/projects/hammer/sys/boot/efi/libefi/elf_freebsd.c#6 integrate
.. //depot/projects/hammer/sys/boot/ofw/common/main.c#4 integrate
.. //depot/projects/hammer/sys/boot/ofw/libofw/devicename.c#6 integrate
.. //depot/projects/hammer/sys/boot/ofw/libofw/elf_freebsd.c#5 integrate
.. //depot/projects/hammer/sys/boot/ofw/libofw/ofw_console.c#2 integrate
.. //depot/projects/hammer/sys/boot/ofw/libofw/ofw_copy.c#3 integrate
.. //depot/projects/hammer/sys/boot/ofw/libofw/ofw_disk.c#5 integrate
.. //depot/projects/hammer/sys/boot/ofw/libofw/ofw_memory.c#2 integrate
.. //depot/projects/hammer/sys/boot/ofw/libofw/ofw_module.c#2 integrate
.. //depot/projects/hammer/sys/boot/ofw/libofw/ofw_net.c#2 integrate
.. //depot/projects/hammer/sys/boot/ofw/libofw/ofw_reboot.c#2 integrate
.. //depot/projects/hammer/sys/boot/ofw/libofw/ofw_time.c#2 integrate
.. //depot/projects/hammer/sys/boot/ofw/libofw/openfirm.c#2 integrate
.. //depot/projects/hammer/sys/boot/powerpc/loader/conf.c#4 integrate
.. //depot/projects/hammer/sys/boot/powerpc/loader/metadata.c#7 integrate
.. //depot/projects/hammer/sys/boot/powerpc/loader/start.c#3 integrate
.. //depot/projects/hammer/sys/boot/sparc64/boot1/boot1.c#4 integrate
.. //depot/projects/hammer/sys/boot/sparc64/loader/main.c#9 integrate
.. //depot/projects/hammer/sys/boot/sparc64/loader/metadata.c#9 integrate
.. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_misc.c#8 integrate
.. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_proto.h#7 integrate
.. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscall.h#7 integrate
.. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscalls.c#7 integrate
.. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_sysent.c#7 integrate
.. //depot/projects/hammer/sys/compat/freebsd32/syscalls.conf#2 integrate
.. //depot/projects/hammer/sys/compat/freebsd32/syscalls.master#10 integrate
.. //depot/projects/hammer/sys/compat/linprocfs/linprocfs.c#18 integrate
.. //depot/projects/hammer/sys/compat/linux/linux_misc.c#16 integrate
.. //depot/projects/hammer/sys/compat/linux/linux_socket.c#9 integrate
.. //depot/projects/hammer/sys/compat/ndis/kern_ndis.c#2 integrate
.. //depot/projects/hammer/sys/compat/ndis/ndis_var.h#2 integrate
.. //depot/projects/hammer/sys/compat/ndis/ntoskrnl_var.h#2 integrate
.. //depot/projects/hammer/sys/compat/ndis/subr_hal.c#2 integrate
.. //depot/projects/hammer/sys/compat/ndis/subr_ndis.c#2 integrate
.. //depot/projects/hammer/sys/compat/ndis/subr_ntoskrnl.c#2 integrate
.. //depot/projects/hammer/sys/compat/ndis/subr_pe.c#2 integrate
.. //depot/projects/hammer/sys/compat/svr4/svr4_proto.h#2 integrate
.. //depot/projects/hammer/sys/compat/svr4/svr4_syscall.h#2 integrate
.. //depot/projects/hammer/sys/compat/svr4/svr4_syscallnames.c#2 integrate
.. //depot/projects/hammer/sys/compat/svr4/svr4_sysent.c#2 integrate
.. //depot/projects/hammer/sys/compat/svr4/syscalls.conf#2 integrate
.. //depot/projects/hammer/sys/compat/svr4/syscalls.master#2 integrate
.. //depot/projects/hammer/sys/conf/Makefile.alpha#4 integrate
.. //depot/projects/hammer/sys/conf/kern.post.mk#17 integrate
.. //depot/projects/hammer/sys/conf/kern.pre.mk#15 integrate
.. //depot/projects/hammer/sys/conf/kmod.mk#16 integrate
.. //depot/projects/hammer/sys/conf/options.i386#21 integrate
.. //depot/projects/hammer/sys/conf/options.pc98#17 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/dsmthdat.c#8 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi.c#19 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_cmbat.c#9 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_cpu.c#12 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_ec.c#13 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_package.c#2 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_thermal.c#8 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpivar.h#15 integrate
.. //depot/projects/hammer/sys/dev/an/if_aironet_ieee.h#5 integrate
.. //depot/projects/hammer/sys/dev/an/if_an.c#13 integrate
.. //depot/projects/hammer/sys/dev/an/if_an_isa.c#7 integrate
.. //depot/projects/hammer/sys/dev/an/if_an_pccard.c#8 integrate
.. //depot/projects/hammer/sys/dev/an/if_an_pci.c#8 integrate
.. //depot/projects/hammer/sys/dev/an/if_anreg.h#6 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#23 integrate
.. //depot/projects/hammer/sys/dev/ath/if_ath.c#14 integrate
.. //depot/projects/hammer/sys/dev/ath/if_athioctl.h#4 integrate
.. //depot/projects/hammer/sys/dev/drm/drm_bufs.h#7 integrate
.. //depot/projects/hammer/sys/dev/drm/drm_dma.h#6 integrate
.. //depot/projects/hammer/sys/dev/ed/if_ed_pccard.c#11 integrate
.. //depot/projects/hammer/sys/dev/fatm/if_fatm.c#6 integrate
.. //depot/projects/hammer/sys/dev/fb/creator.c#3 integrate
.. //depot/projects/hammer/sys/dev/firewire/firewire.c#21 integrate
.. //depot/projects/hammer/sys/dev/firewire/firewirereg.h#12 integrate
.. //depot/projects/hammer/sys/dev/firewire/fwmem.c#12 integrate
.. //depot/projects/hammer/sys/dev/firewire/fwohci.c#18 integrate
.. //depot/projects/hammer/sys/dev/firewire/fwohci_pci.c#18 integrate
.. //depot/projects/hammer/sys/dev/firewire/sbp.c#25 integrate
.. //depot/projects/hammer/sys/dev/gem/if_gem_pci.c#6 integrate
.. //depot/projects/hammer/sys/dev/hatm/if_hatm_intr.c#6 integrate
.. //depot/projects/hammer/sys/dev/hifn/hifn7751.c#8 integrate
.. //depot/projects/hammer/sys/dev/idt/idt.c#5 integrate
.. //depot/projects/hammer/sys/dev/idt/idt_harp.c#4 integrate
.. //depot/projects/hammer/sys/dev/if_ndis/if_ndis.c#2 integrate
.. //depot/projects/hammer/sys/dev/if_ndis/if_ndisvar.h#2 integrate
.. //depot/projects/hammer/sys/dev/iicbus/if_ic.c#7 integrate
.. //depot/projects/hammer/sys/dev/ips/ips_commands.c#8 integrate
.. //depot/projects/hammer/sys/dev/pccard/pccarddevs#19 integrate
.. //depot/projects/hammer/sys/dev/pccard/pccarddevs.h#19 integrate
.. //depot/projects/hammer/sys/dev/pccbb/pccbb.c#21 integrate
.. //depot/projects/hammer/sys/dev/pccbb/pccbbdevid.h#6 integrate
.. //depot/projects/hammer/sys/dev/pci/pci.c#17 integrate
.. //depot/projects/hammer/sys/dev/ppbus/if_plip.c#6 integrate
.. //depot/projects/hammer/sys/dev/puc/pucdata.c#12 integrate
.. //depot/projects/hammer/sys/dev/raidframe/rf_freebsdkintf.c#7 integrate
.. //depot/projects/hammer/sys/dev/ray/if_ray.c#8 integrate
.. //depot/projects/hammer/sys/dev/sio/sio.c#25 integrate
.. //depot/projects/hammer/sys/dev/sio/sio_ebus.c#3 integrate
.. //depot/projects/hammer/sys/dev/sio/sio_isa.c#5 integrate
.. //depot/projects/hammer/sys/dev/sio/sio_puc.c#5 integrate
.. //depot/projects/hammer/sys/dev/usb/ubsa.c#9 integrate
.. //depot/projects/hammer/sys/dev/usb/ucom.c#9 integrate
.. //depot/projects/hammer/sys/dev/usb/ufm.c#7 integrate
.. //depot/projects/hammer/sys/dev/usb/ukbd.c#7 integrate
.. //depot/projects/hammer/sys/dev/usb/umass.c#14 integrate
.. //depot/projects/hammer/sys/dev/usb/usbdevs#23 integrate
.. //depot/projects/hammer/sys/dev/usb/usbdevs.h#22 integrate
.. //depot/projects/hammer/sys/dev/usb/usbdevs_data.h#22 integrate
.. //depot/projects/hammer/sys/dev/usb/uscanner.c#11 integrate
.. //depot/projects/hammer/sys/dev/usb/uvisor.c#9 integrate
.. //depot/projects/hammer/sys/dev/usb/uvscom.c#7 integrate
.. //depot/projects/hammer/sys/dev/wi/if_wi.c#24 integrate
.. //depot/projects/hammer/sys/dev/wi/if_wi_pccard.c#17 integrate
.. //depot/projects/hammer/sys/dev/wi/if_wireg.h#7 integrate
.. //depot/projects/hammer/sys/fs/devfs/devfs_vnops.c#9 integrate
.. //depot/projects/hammer/sys/fs/msdosfs/bootsect.h#3 integrate
.. //depot/projects/hammer/sys/fs/msdosfs/bpb.h#2 integrate
.. //depot/projects/hammer/sys/fs/msdosfs/denode.h#4 integrate
.. //depot/projects/hammer/sys/fs/msdosfs/direntry.h#3 integrate
.. //depot/projects/hammer/sys/fs/msdosfs/fat.h#2 integrate
.. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_conv.c#6 integrate
.. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_denode.c#10 integrate
.. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_fat.c#3 integrate
.. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_iconv.c#2 integrate
.. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_lookup.c#3 integrate
.. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_vfsops.c#15 integrate
.. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_vnops.c#11 integrate
.. //depot/projects/hammer/sys/fs/msdosfs/msdosfsmount.h#4 integrate
.. //depot/projects/hammer/sys/fs/nullfs/null_vnops.c#6 integrate
.. //depot/projects/hammer/sys/fs/smbfs/smbfs_node.c#8 integrate
.. //depot/projects/hammer/sys/fs/unionfs/union_vnops.c#10 integrate
.. //depot/projects/hammer/sys/geom/geom_event.c#15 integrate
.. //depot/projects/hammer/sys/i386/acpica/acpi_wakecode.S#6 integrate
.. //depot/projects/hammer/sys/i386/conf/NOTES#26 integrate
.. //depot/projects/hammer/sys/i386/i386/elan-mmcr.c#11 integrate
.. //depot/projects/hammer/sys/i386/i386/machdep.c#29 integrate
.. //depot/projects/hammer/sys/i386/i386/pmap.c#26 integrate
.. //depot/projects/hammer/sys/i386/i386/vm_machdep.c#19 integrate
.. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_isc_syscall.h#2 integrate
.. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_isc_sysent.c#3 integrate
.. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_proto.h#2 integrate
.. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_syscall.h#2 integrate
.. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_sysent.c#3 integrate
.. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_xenix.h#2 integrate
.. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_xenix_syscall.h#2 integrate
.. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_xenix_sysent.c#3 integrate
.. //depot/projects/hammer/sys/i386/ibcs2/syscalls.conf#2 integrate
.. //depot/projects/hammer/sys/i386/ibcs2/syscalls.isc#2 integrate
.. //depot/projects/hammer/sys/i386/ibcs2/syscalls.isc.conf#2 integrate
.. //depot/projects/hammer/sys/i386/ibcs2/syscalls.master#2 integrate
.. //depot/projects/hammer/sys/i386/ibcs2/syscalls.xenix#2 integrate
.. //depot/projects/hammer/sys/i386/ibcs2/syscalls.xenix.conf#2 integrate
.. //depot/projects/hammer/sys/i386/include/elan_mmcr.h#1 branch
.. //depot/projects/hammer/sys/i386/include/kse.h#2 delete
.. //depot/projects/hammer/sys/i386/include/md_var.h#10 integrate
.. //depot/projects/hammer/sys/i386/linux/linux_proto.h#7 integrate
.. //depot/projects/hammer/sys/i386/linux/linux_syscall.h#7 integrate
.. //depot/projects/hammer/sys/i386/linux/linux_sysent.c#8 integrate
.. //depot/projects/hammer/sys/i386/linux/linux_sysvec.c#15 integrate
.. //depot/projects/hammer/sys/i386/linux/syscalls.conf#2 integrate
.. //depot/projects/hammer/sys/i386/linux/syscalls.master#7 integrate
.. //depot/projects/hammer/sys/i386/pci/pci_cfgreg.c#14 integrate
.. //depot/projects/hammer/sys/i386/svr4/svr4_machdep.c#7 integrate
.. //depot/projects/hammer/sys/ia64/acpica/OsdEnvironment.c#4 integrate
.. //depot/projects/hammer/sys/ia64/ia64/dump_machdep.c#5 integrate
.. //depot/projects/hammer/sys/ia64/ia64/machdep.c#33 integrate
.. //depot/projects/hammer/sys/ia64/ia64/vm_machdep.c#18 integrate
.. //depot/projects/hammer/sys/ia64/include/kse.h#2 delete
.. //depot/projects/hammer/sys/kern/init_sysent.c#23 integrate
.. //depot/projects/hammer/sys/kern/kern_descrip.c#18 integrate
.. //depot/projects/hammer/sys/kern/kern_event.c#12 integrate
.. //depot/projects/hammer/sys/kern/kern_exec.c#17 integrate
.. //depot/projects/hammer/sys/kern/kern_fork.c#21 integrate
.. //depot/projects/hammer/sys/kern/kern_sig.c#28 integrate
.. //depot/projects/hammer/sys/kern/kern_subr.c#8 integrate
.. //depot/projects/hammer/sys/kern/makesyscalls.sh#5 integrate
.. //depot/projects/hammer/sys/kern/sched_4bsd.c#12 integrate
.. //depot/projects/hammer/sys/kern/subr_mbuf.c#19 integrate
.. //depot/projects/hammer/sys/kern/subr_power.c#3 integrate
.. //depot/projects/hammer/sys/kern/subr_smp.c#13 integrate
.. //depot/projects/hammer/sys/kern/sys_pipe.c#16 integrate
.. //depot/projects/hammer/sys/kern/syscalls.c#23 integrate
.. //depot/projects/hammer/sys/kern/syscalls.master#23 integrate
.. //depot/projects/hammer/sys/kern/uipc_mbuf.c#12 integrate
.. //depot/projects/hammer/sys/kern/uipc_mbuf2.c#7 integrate
.. //depot/projects/hammer/sys/kern/uipc_syscalls.c#14 integrate
.. //depot/projects/hammer/sys/kern/vfs_subr.c#30 integrate
.. //depot/projects/hammer/sys/kern/vfs_syscalls.c#19 integrate
.. //depot/projects/hammer/sys/kern/vfs_vnops.c#12 integrate
.. //depot/projects/hammer/sys/modules/acpi/Makefile#11 integrate
.. //depot/projects/hammer/sys/modules/acpi/acpi/Makefile#1 branch
.. //depot/projects/hammer/sys/modules/cam/Makefile#6 integrate
.. //depot/projects/hammer/sys/modules/raidframe/Makefile#2 integrate
.. //depot/projects/hammer/sys/modules/sio/Makefile#1 branch
.. //depot/projects/hammer/sys/modules/ukbd/Makefile#2 integrate
.. //depot/projects/hammer/sys/net/bpf.c#14 integrate
.. //depot/projects/hammer/sys/net/bpf.h#6 integrate
.. //depot/projects/hammer/sys/net/bridge.c#10 integrate
.. //depot/projects/hammer/sys/net/if.c#13 integrate
.. //depot/projects/hammer/sys/net/if_disc.c#7 integrate
.. //depot/projects/hammer/sys/net/if_ef.c#7 integrate
.. //depot/projects/hammer/sys/net/if_faith.c#8 integrate
.. //depot/projects/hammer/sys/net/if_gif.c#9 integrate
.. //depot/projects/hammer/sys/net/if_gre.c#10 integrate
.. //depot/projects/hammer/sys/net/if_gre.h#4 integrate
.. //depot/projects/hammer/sys/net/if_loop.c#14 integrate
.. //depot/projects/hammer/sys/net/if_stf.c#9 integrate
.. //depot/projects/hammer/sys/net/if_tun.c#10 integrate
.. //depot/projects/hammer/sys/net/if_vlan.c#11 integrate
.. //depot/projects/hammer/sys/net/if_vlan_var.h#5 integrate
.. //depot/projects/hammer/sys/net80211/ieee80211_radiotap.h#2 integrate
.. //depot/projects/hammer/sys/netgraph/atm/ng_atm.c#6 integrate
.. //depot/projects/hammer/sys/netgraph/atm/sscfu/ng_sscfu.c#2 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#7 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#6 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#6 integrate
.. //depot/projects/hammer/sys/netgraph/ng_iface.c#7 integrate
.. //depot/projects/hammer/sys/netinet/if_ether.c#7 integrate
.. //depot/projects/hammer/sys/netinet/in.c#5 integrate
.. //depot/projects/hammer/sys/netinet/ip_dummynet.c#18 integrate
.. //depot/projects/hammer/sys/netinet/ip_fw2.c#24 integrate
.. //depot/projects/hammer/sys/netinet/ip_gre.c#7 integrate
.. //depot/projects/hammer/sys/netinet6/ip6_fw.c#7 integrate
.. //depot/projects/hammer/sys/netinet6/ip6_output.c#18 integrate
.. //depot/projects/hammer/sys/netsmb/smb_conn.c#5 integrate
.. //depot/projects/hammer/sys/netsmb/smb_conn.h#5 integrate
.. //depot/projects/hammer/sys/netsmb/smb_crypt.c#4 integrate
.. //depot/projects/hammer/sys/netsmb/smb_iod.c#7 integrate
.. //depot/projects/hammer/sys/netsmb/smb_rq.c#6 integrate
.. //depot/projects/hammer/sys/netsmb/smb_rq.h#2 integrate
.. //depot/projects/hammer/sys/netsmb/smb_smb.c#5 integrate
.. //depot/projects/hammer/sys/netsmb/smb_subr.h#6 integrate
.. //depot/projects/hammer/sys/pc98/conf/NOTES#14 integrate
.. //depot/projects/hammer/sys/pc98/i386/machdep.c#24 integrate
.. //depot/projects/hammer/sys/pc98/pc98/sio.c#14 integrate
.. //depot/projects/hammer/sys/pc98/pc98/sio_cbus.c#3 integrate
.. //depot/projects/hammer/sys/pci/if_rl.c#26 integrate
.. //depot/projects/hammer/sys/pci/if_sis.c#21 integrate
.. //depot/projects/hammer/sys/pci/if_sisreg.h#6 integrate
.. //depot/projects/hammer/sys/powerpc/include/kse.h#2 delete
.. //depot/projects/hammer/sys/powerpc/powerpc/machdep.c#22 integrate
.. //depot/projects/hammer/sys/powerpc/powerpc/vm_machdep.c#11 integrate
.. //depot/projects/hammer/sys/sparc64/include/kse.h#2 delete
.. //depot/projects/hammer/sys/sparc64/pci/psycho.c#15 integrate
.. //depot/projects/hammer/sys/sparc64/sbus/sbus.c#9 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/bus_machdep.c#13 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/db_trace.c#5 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/dump_machdep.c#7 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/machdep.c#26 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/ofw_machdep.c#4 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/vm_machdep.c#11 integrate
.. //depot/projects/hammer/sys/sys/_null.h#3 integrate
.. //depot/projects/hammer/sys/sys/copyright.h#3 integrate
.. //depot/projects/hammer/sys/sys/kse.h#15 integrate
.. //depot/projects/hammer/sys/sys/mbuf.h#18 integrate
.. //depot/projects/hammer/sys/sys/proc.h#41 integrate
.. //depot/projects/hammer/sys/sys/sf_buf.h#2 integrate
.. //depot/projects/hammer/sys/sys/socket.h#7 integrate
.. //depot/projects/hammer/sys/sys/syscall.h#23 integrate
.. //depot/projects/hammer/sys/sys/syscall.mk#23 integrate
.. //depot/projects/hammer/sys/sys/sysproto.h#23 integrate
.. //depot/projects/hammer/sys/sys/systm.h#13 integrate
.. //depot/projects/hammer/sys/sys/uio.h#5 integrate
.. //depot/projects/hammer/sys/sys/vnode.h#20 integrate
.. //depot/projects/hammer/sys/ufs/ffs/ffs_snapshot.c#17 integrate
.. //depot/projects/hammer/sys/vm/device_pager.c#7 integrate
.. //depot/projects/hammer/sys/vm/phys_pager.c#6 integrate
.. //depot/projects/hammer/sys/vm/swap_pager.c#19 integrate
.. //depot/projects/hammer/sys/vm/vm_fault.c#15 integrate
.. //depot/projects/hammer/sys/vm/vm_kern.c#11 integrate
.. //depot/projects/hammer/sys/vm/vm_map.c#29 integrate
.. //depot/projects/hammer/sys/vm/vm_meter.c#7 integrate
.. //depot/projects/hammer/sys/vm/vm_object.c#33 integrate
.. //depot/projects/hammer/sys/vm/vm_page.c#20 integrate
.. //depot/projects/hammer/sys/vm/vnode_pager.c#17 integrate
.. //depot/projects/hammer/tools/debugscripts/dot.gdbinit#3 integrate
.. //depot/projects/hammer/tools/debugscripts/gdbinit.i386#2 integrate
.. //depot/projects/hammer/tools/debugscripts/gdbinit.kernel#2 integrate
.. //depot/projects/hammer/tools/debugscripts/gdbinit.vinum#2 integrate
.. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.birthday#7 integrate
.. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.freebsd#13 integrate
.. //depot/projects/hammer/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.common#3 integrate
.. //depot/projects/hammer/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.holiday#2 integrate
.. //depot/projects/hammer/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.military#2 integrate
.. //depot/projects/hammer/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.pagan#2 integrate
.. //depot/projects/hammer/usr.bin/netstat/Makefile#3 integrate
.. //depot/projects/hammer/usr.bin/netstat/main.c#5 integrate
.. //depot/projects/hammer/usr.bin/netstat/mbuf.c#5 integrate
.. //depot/projects/hammer/usr.bin/netstat/netstat.1#6 integrate
.. //depot/projects/hammer/usr.bin/netstat/netstat.h#5 integrate
.. //depot/projects/hammer/usr.bin/sed/sed.1#4 integrate
.. //depot/projects/hammer/usr.bin/systat/netstat.c#3 integrate
.. //depot/projects/hammer/usr.bin/truss/main.c#6 integrate
.. //depot/projects/hammer/usr.bin/usbhidctl/usbhidctl.1#2 integrate
.. //depot/projects/hammer/usr.bin/vmstat/vmstat.c#11 integrate
.. //depot/projects/hammer/usr.sbin/acpi/acpiconf/acpiconf.8#6 integrate
.. //depot/projects/hammer/usr.sbin/acpi/acpiconf/acpiconf.c#5 integrate
.. //depot/projects/hammer/usr.sbin/acpi/acpidump/acpi.c#7 integrate
.. //depot/projects/hammer/usr.sbin/apmd/apmd.8#4 integrate
.. //depot/projects/hammer/usr.sbin/burncd/burncd.c#6 integrate
.. //depot/projects/hammer/usr.sbin/devinfo/devinfo.c#4 integrate
.. //depot/projects/hammer/usr.sbin/ip6addrctl/ip6addrctl.c#3 integrate
.. //depot/projects/hammer/usr.sbin/ip6addrctl/ip6addrctl.conf.sample#2 integrate
.. //depot/projects/hammer/usr.sbin/mergemaster/mergemaster.sh#7 integrate
.. //depot/projects/hammer/usr.sbin/mountd/exports.5#4 integrate
.. //depot/projects/hammer/usr.sbin/mrouted/mtrace.c#3 integrate
.. //depot/projects/hammer/usr.sbin/ndiscvt/inf-parse.y#2 integrate
.. //depot/projects/hammer/usr.sbin/ndiscvt/inf-token.l#2 integrate
.. //depot/projects/hammer/usr.sbin/ndiscvt/inf.c#2 integrate
.. //depot/projects/hammer/usr.sbin/ndiscvt/ndiscvt.8#2 integrate
.. //depot/projects/hammer/usr.sbin/ndiscvt/ndiscvt.c#2 integrate
.. //depot/projects/hammer/usr.sbin/ngctl/main.c#3 integrate
.. //depot/projects/hammer/usr.sbin/pccard/pccardd/pccardd.c#3 integrate
.. //depot/projects/hammer/usr.sbin/pciconf/pciconf.c#4 integrate
.. //depot/projects/hammer/usr.sbin/pkg_install/add/main.c#4 integrate
.. //depot/projects/hammer/usr.sbin/pkg_install/lib/match.c#4 integrate
.. //depot/projects/hammer/usr.sbin/sysinstall/config.c#12 integrate
.. //depot/projects/hammer/usr.sbin/sysinstall/devices.c#8 integrate
.. //depot/projects/hammer/usr.sbin/sysinstall/doc.c#2 integrate
.. //depot/projects/hammer/usr.sbin/sysinstall/index.c#5 integrate
.. //depot/projects/hammer/usr.sbin/sysinstall/package.c#2 integrate
.. //depot/projects/hammer/usr.sbin/sysinstall/sysinstall.h#14 integrate

Differences ...

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

@@ -1,6 +1,35 @@
-# $FreeBSD: src/COPYRIGHT,v 1.4 1999/09/05 21:33:47 obrien Exp $
+# $FreeBSD: src/COPYRIGHT,v 1.5 2003/12/31 22:35:22 imp Exp $
 #	@(#)COPYRIGHT	8.2 (Berkeley) 3/21/94
 
+The compilation of software known as FreeBSD is distributed under the
+following terms:
+
+Copyright (C) 1992-2004 The FreeBSD Project. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
+
+The 4.4BSD and 4.4BSD-Lite software is distributed under the following
+terms:
+
 All of the documentation and software included in the 4.4BSD and 4.4BSD-Lite
 Releases is copyrighted by The Regents of the University of California.
 

==== //depot/projects/hammer/bin/rm/rm.c#6 (text+ko) ====

@@ -43,7 +43,7 @@
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/rm/rm.c,v 1.45 2003/11/10 09:40:18 guido Exp $");
+__FBSDID("$FreeBSD: src/bin/rm/rm.c,v 1.46 2004/01/01 10:26:43 kuriyama Exp $");
 
 #include <sys/stat.h>
 #include <sys/param.h>
@@ -199,8 +199,8 @@
 			errx(1, "%s: %s", p->fts_path, strerror(p->fts_errno));
 		case FTS_NS:
 			/*
-			 * FTS_NS: assume that if can't stat the file, it
-			 * can't be unlinked.
+			 * Assume that since fts_read() couldn't stat the
+			 * file, it can't be unlinked.
 			 */
 			if (!needstat)
 				break;
@@ -269,6 +269,14 @@
 				}
 				break;
 
+			case FTS_NS:
+				/*
+				 * Assume that since fts_read() couldn't stat
+				 * the file, it can't be unlinked.
+				 */
+				if (fflag)
+					continue;
+				/* FALLTHROUGH */
 			default:
 				if (Pflag)
 					if (!rm_overwrite(p->fts_accpath, NULL))

==== //depot/projects/hammer/bin/sh/eval.c#4 (text+ko) ====

@@ -40,7 +40,7 @@
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.37 2003/01/21 10:06:04 tjr Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.39 2003/12/30 15:39:33 maxim Exp $");
 
 #include <paths.h>
 #include <signal.h>
@@ -205,7 +205,6 @@
 	case NAND:
 		evaltree(n->nbinary.ch1, EV_TESTED);
 		if (evalskip || exitstatus != 0) {
-			flags |= EV_TESTED;
 			goto out;
 		}
 		evaltree(n->nbinary.ch2, flags);
@@ -246,25 +245,9 @@
 		break;
 	case NFOR:
 		evalfor(n);
-		/*
-		 * The 'for' command does not set exitstatus, so the value
-		 * now in exitstatus is from the last command executed in
-		 * the 'for' loop.  That exit value had been tested (wrt
-		 * 'sh -e' checking) while processing that command, and
-		 * it should not be re-tested here.
-		 */
-		flags |= EV_TESTED;
 		break;
 	case NCASE:
 		evalcase(n, flags);
-		/*
-		 * The 'case' command does not set exitstatus, so the value
-		 * now in exitstatus is from the last command executed in
-		 * the 'case' block.  That exit value had been tested (wrt
-		 * 'sh -e' checking) while processing that command, and
-		 * it should not be re-tested here.
-		 */
-		flags |= EV_TESTED;
 		break;
 	case NDEFUN:
 		defun(n->narg.text, n->narg.next);
@@ -289,14 +272,8 @@
 out:
 	if (pendingsigs)
 		dotrap();
-	/*
-	 * XXX - Like "!(n->type == NSEMI)", more types will probably
-	 * need to be excluded from this test. It's probably better
-	 * to set or unset EV_TESTED in the loop above than to bloat
-	 * the conditional here.
-	 */
 	if ((flags & EV_EXIT) || (eflag && exitstatus 
-	    && !(flags & EV_TESTED) && !(n->type == NSEMI)))
+	    && !(flags & EV_TESTED) && (n->type == NCMD)))
 		exitshell(exitstatus);
 }
 
@@ -711,7 +688,7 @@
 				 * the command runs. Partly deleting like
 				 * changepatch() does doesn't seem worth the
 				 * bookinging effort, since most such runs add
-				 * diretories in front of the new PATH.
+				 * directories in front of the new PATH.
 				 */
 				clearcmdentry(0);
 				do_clearcmdentry = 1;

==== //depot/projects/hammer/contrib/amd/fsinfo/fsinfo.8#4 (text+ko) ====

@@ -34,7 +34,7 @@
 .\"
 .\"     from: @(#)fsinfo.8	8.1 (Berkeley) 6/28/93
 .\"	$Id: fsinfo.8,v 1.3.2.4 2003/03/31 20:09:02 ezk Exp $
-.\"	$FreeBSD: src/contrib/amd/fsinfo/fsinfo.8,v 1.8 2003/09/02 15:42:56 mbr Exp $
+.\"	$FreeBSD: src/contrib/amd/fsinfo/fsinfo.8,v 1.9 2004/01/04 10:56:22 charnier Exp $
 .\"
 .Dd June 26, 1999
 .Dt FSINFO 8
@@ -68,7 +68,7 @@
 ,
 .I mount
 and
-.Xr mountd
+.Xr mountd 8
 configuration files.
 .Pp
 The following options are available:

==== //depot/projects/hammer/contrib/ipfilter/ipmon.c#4 (text+ko) ====

@@ -70,7 +70,7 @@
 #if !defined(lint)
 static const char sccsid[] = "@(#)ipmon.c	1.21 6/5/96 (C)1993-2000 Darren Reed";
 /* static const char rcsid[] = "@(#)$Id: ipmon.c,v 2.12.2.13 2001/07/19 12:24:59 darrenr Exp $"; */
-static const char rcsid[] = "@(#)$FreeBSD: src/contrib/ipfilter/ipmon.c,v 1.16 2003/02/15 06:32:47 darrenr Exp $";
+static const char rcsid[] = "@(#)$FreeBSD: src/contrib/ipfilter/ipmon.c,v 1.17 2004/01/02 13:10:47 guido Exp $";
 #endif
 
 
@@ -922,6 +922,7 @@
 	}
 #if (SOLARIS || \
 	(defined(NetBSD) && (NetBSD <= 1991011) && (NetBSD >= 199603)) || \
+	(defined(__FreeBSD__) && (__FreeBSD_version >= 501113)) || \
 	(defined(OpenBSD) && (OpenBSD >= 199603))) || defined(linux)
 	{
 	char	ifname[sizeof(ipf->fl_ifname) + 1];

==== //depot/projects/hammer/contrib/pnpinfo/pnpinfo.c#2 (text+ko) ====

@@ -22,12 +22,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD: src/contrib/pnpinfo/pnpinfo.c,v 1.8 2002/08/09 22:04:54 iedowse Exp $
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/contrib/pnpinfo/pnpinfo.c,v 1.9 2004/01/04 11:11:02 charnier Exp $");
+
 #include <sys/time.h>
 
+#include <err.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -588,10 +590,8 @@
 
 #ifdef __i386__
     /* Hey what about a i386_iopl() call :) */
-    if (open("/dev/io", O_RDONLY) < 0) {
-	fprintf (stderr, "pnpinfo: Can't get I/O privilege.\n");
-	exit (1);
-    }
+    if (open("/dev/io", O_RDONLY) < 0)
+	errx(1, "can't get I/O privilege");
 #endif
 #ifdef __alpha__
     ioperm(0x203, 0x400 - 0x203, 1);
@@ -608,6 +608,7 @@
     }
     if (!num_pnp_devs) {
 	printf("No Plug-n-Play devices were found\n");
-	return 0;
+	return (0);
     }
+    return (0);
 }

==== //depot/projects/hammer/contrib/tcp_wrappers/socket.c#2 (text+ko) ====

@@ -14,7 +14,7 @@
   * 
   * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
   *
-  * $FreeBSD: src/contrib/tcp_wrappers/socket.c,v 1.6 2001/07/04 20:16:18 kris Exp $
+  * $FreeBSD: src/contrib/tcp_wrappers/socket.c,v 1.7 2003/12/27 14:58:00 ceri Exp $
   */
 
 #ifndef lint
@@ -114,7 +114,7 @@
 	    return;				/* give up */
 	}
 #ifdef really_paranoid
-	memset(buf, 0 sizeof(buf));
+	memset(buf, 0, sizeof(buf));
 #endif
     }
 #ifdef INET6

==== //depot/projects/hammer/etc/apmd.conf#2 (text+ko) ====

@@ -1,10 +1,10 @@
 # apmd Configuration File
 #
-# $FreeBSD: src/etc/apmd.conf,v 1.7 2001/08/06 15:52:42 nsayer Exp $
+# $FreeBSD: src/etc/apmd.conf,v 1.9 2003/12/30 17:40:28 njl Exp $
 #
 
 apm_event SUSPENDREQ {
-	exec "/etc/rc.suspend";
+	exec "/etc/rc.suspend apm suspend";
 }
 
 apm_event USERSUSPENDREQ {
@@ -13,8 +13,12 @@
 	exec "apm -z";
 }
 
-apm_event NORMRESUME, STANDBYRESUME {
-	exec "/etc/rc.resume";
+apm_event NORMRESUME {
+	exec "/etc/rc.resume apm suspend";
+}
+
+apm_event STANDBYRESUME {
+	exec "/etc/rc.resume apm standby";
 }
 
 # resume event configuration for serial mouse users by

==== //depot/projects/hammer/etc/defaults/rc.conf#19 (text+ko) ====

@@ -13,7 +13,7 @@
 #
 # All arguments must be in double or single quotes.
 #
-# $FreeBSD: src/etc/defaults/rc.conf,v 1.194 2003/12/18 04:39:57 njl Exp $
+# $FreeBSD: src/etc/defaults/rc.conf,v 1.195 2003/12/25 23:29:19 babkin Exp $
 
 ##############################################################
 ###  Important initial Boot-time options  ####################
@@ -398,6 +398,7 @@
 
 cron_enable="YES"	# Run the periodic job daemon.
 cron_program="/usr/sbin/cron"	# Which cron executable to run (if enabled).
+cron_dst="YES"		# Handle DST transitions intelligently (YES/NO)
 cron_flags=""		# Which options to pass to the cron daemon.
 lpd_enable="NO"		# Run the line printer daemon.
 lpd_program="/usr/sbin/lpd"	# path to lpd, if you want a different one.

==== //depot/projects/hammer/etc/periodic/daily/150.clean-hoststat#4 (text+ko) ====

@@ -1,8 +1,8 @@
 #!/bin/sh
 #
-# $FreeBSD: src/etc/periodic/daily/150.clean-hoststat,v 1.7 2003/01/08 18:51:45 wollman Exp $
+# $FreeBSD: src/etc/periodic/daily/150.clean-hoststat,v 1.8 2004/01/02 18:50:22 gshapiro Exp $
 #
-# Remove stale files in /var/spool/.hoststat
+# Remove stale persistent host status files
 #
 
 # If there is a global system configuration file, suck it in.
@@ -14,13 +14,13 @@
 
 case "$daily_clean_hoststat_enable" in
     [Yy][Ee][Ss])
-	if [ -z "$(sendmail -bh 2>&1)" ]; then
+	if [ -z "$(hoststat 2>&1)" ]; then
 	    rc=2
 	else
 	    echo ""
 	    echo "Removing stale entries from sendmail host status cache:"
 	    rc=0
-	    sendmail -bH || rc=1
+	    purgestat || rc=1
 	fi;;
 
     *)  rc=0;;

==== //depot/projects/hammer/etc/rc.d/cron#3 (text+ko) ====

@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: cron,v 1.5 2000/09/19 13:04:38 lukem Exp $
-# $FreeBSD: src/etc/rc.d/cron,v 1.3 2003/05/05 15:38:41 mtm Exp $
+# $FreeBSD: src/etc/rc.d/cron,v 1.4 2003/12/25 23:29:19 babkin Exp $
 #
 
 # PROVIDE: cron
@@ -17,4 +17,8 @@
 pidfile="/var/run/${name}.pid"
 
 load_rc_config $name
+if checkyesno cron_dst
+then
+	cron_flags="$cron_flags -s"
+fi
 run_rc_command "$1"

==== //depot/projects/hammer/etc/rc.d/diskless#8 (text+ko) ====

@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD: src/etc/rc.d/diskless,v 1.29 2003/10/13 08:18:05 dougb Exp $
+# $FreeBSD: src/etc/rc.d/diskless,v 1.30 2004/01/05 19:14:47 brooks Exp $
 #
 
 # PROVIDE: diskless
@@ -107,7 +107,13 @@
 # Make sure our aliases database is uptodate, the aliases may have
 # been overriden in /conf.
 #
-/usr/bin/newaliases
+case ${sendmail_enable} in
+[Nn][Oo][Nn][Ee])
+	;;
+*)
+	/usr/bin/newaliases
+	;;
+esac
 
 # XXX make sure to create one dir for each printer as requested by lpd
 #

==== //depot/projects/hammer/etc/rc.resume#2 (text+ko) ====

@@ -24,15 +24,23 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD: src/etc/rc.resume,v 1.5 2000/12/17 08:15:57 dougb Exp $
+# $FreeBSD: src/etc/rc.resume,v 1.7 2003/12/30 17:30:39 njl Exp $
 #
 
 # sample run command file for APM Resume Event
 
+if [ $# -ne 2 ]; then
+	echo "Usage: $0 [apm|acpi] [standby,suspend|1-5]"
+	exit 1
+fi
+
+subsystem=$1
+state=$2
+

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



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