Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 11 Mar 2005 19:42:07 GMT
From:      Peter Wemm <peter@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 72923 for review
Message-ID:  <200503111942.j2BJg7kV033412@repoman.freebsd.org>

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

Change 72923 by peter@peter_daintree on 2005/03/11 19:41:35

	IFC @72922

Affected files ...

.. //depot/projects/hammer/Makefile#31 integrate
.. //depot/projects/hammer/Makefile.inc1#86 integrate
.. //depot/projects/hammer/UPDATING#74 integrate
.. //depot/projects/hammer/bin/Makefile#4 integrate
.. //depot/projects/hammer/bin/sh/parser.c#8 integrate
.. //depot/projects/hammer/bin/sh/sh.1#14 integrate
.. //depot/projects/hammer/etc/Makefile#37 integrate
.. //depot/projects/hammer/etc/defaults/rc.conf#49 integrate
.. //depot/projects/hammer/etc/etc.sparc64/ttys#8 integrate
.. //depot/projects/hammer/etc/mtree/BSD.usr.dist#33 integrate
.. //depot/projects/hammer/etc/newsyslog.conf#10 integrate
.. //depot/projects/hammer/etc/rc.d/Makefile#32 integrate
.. //depot/projects/hammer/etc/rc.d/initrandom#5 integrate
.. //depot/projects/hammer/etc/rc.d/lpd#5 integrate
.. //depot/projects/hammer/etc/rc.d/newsyslog#2 integrate
.. //depot/projects/hammer/etc/rc.d/resolv#4 integrate
.. //depot/projects/hammer/etc/rc.d/var#5 integrate
.. //depot/projects/hammer/games/fortune/datfiles/fortunes#40 integrate
.. //depot/projects/hammer/gnu/usr.bin/gdb/kgdb/kgdb.1#4 integrate
.. //depot/projects/hammer/gnu/usr.bin/gdb/kgdb/main.c#5 integrate
.. //depot/projects/hammer/include/Makefile#39 integrate
.. //depot/projects/hammer/lib/libalias/alias_skinny.c#7 integrate
.. //depot/projects/hammer/lib/libarchive/archive_read_support_compression_gzip.c#7 integrate
.. //depot/projects/hammer/lib/libc/alpha/_fpmath.h#5 integrate
.. //depot/projects/hammer/lib/libc/amd64/_fpmath.h#10 integrate
.. //depot/projects/hammer/lib/libc/arm/_fpmath.h#3 integrate
.. //depot/projects/hammer/lib/libc/gen/Makefile.inc#21 integrate
.. //depot/projects/hammer/lib/libc/gen/frexp.3#4 integrate
.. //depot/projects/hammer/lib/libc/gen/ldexp.3#3 integrate
.. //depot/projects/hammer/lib/libc/gen/times.c#2 integrate
.. //depot/projects/hammer/lib/libc/gen/tls.c#6 integrate
.. //depot/projects/hammer/lib/libc/gen/ttyname.3#3 integrate
.. //depot/projects/hammer/lib/libc/gen/ttyname.c#4 integrate
.. //depot/projects/hammer/lib/libc/i386/_fpmath.h#5 integrate
.. //depot/projects/hammer/lib/libc/ia64/_fpmath.h#5 integrate
.. //depot/projects/hammer/lib/libc/nls/ko_KR.UTF-8.msg#1 branch
.. //depot/projects/hammer/lib/libc/nls/ko_KR.eucKR.msg#1 branch
.. //depot/projects/hammer/lib/libc/nls/pl_PL.ISO8859-2.msg#1 branch
.. //depot/projects/hammer/lib/libc/powerpc/_fpmath.h#7 integrate
.. //depot/projects/hammer/lib/libc/rpc/auth_time.c#3 integrate
.. //depot/projects/hammer/lib/libc/rpc/clnt_vc.c#4 integrate
.. //depot/projects/hammer/lib/libc/rpc/netnamer.c#4 integrate
.. //depot/projects/hammer/lib/libc/rpc/rtime.c#2 integrate
.. //depot/projects/hammer/lib/libc/sparc64/_fpmath.h#5 integrate
.. //depot/projects/hammer/lib/libc/stdlib/grantpt.c#2 integrate
.. //depot/projects/hammer/lib/libc/string/strsignal.c#3 integrate
.. //depot/projects/hammer/lib/libc/sys/send.2#11 integrate
.. //depot/projects/hammer/lib/libc/yp/yplib.c#4 integrate
.. //depot/projects/hammer/lib/libdevinfo/devinfo.c#4 integrate
.. //depot/projects/hammer/lib/libdisk/open_disk.c#8 integrate
.. //depot/projects/hammer/lib/libfetch/http.c#11 integrate
.. //depot/projects/hammer/lib/libmd/Makefile#5 integrate
.. //depot/projects/hammer/lib/libmd/sha.3#6 integrate
.. //depot/projects/hammer/lib/libmd/sha256.3#1 branch
.. //depot/projects/hammer/lib/libmd/sha256.h#1 branch
.. //depot/projects/hammer/lib/libmd/sha256c.c#1 branch
.. //depot/projects/hammer/lib/libmd/shadriver.c#2 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_init.c#14 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_private.h#22 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_stack.c#4 integrate
.. //depot/projects/hammer/lib/msun/Makefile#24 integrate
.. //depot/projects/hammer/lib/msun/alpha/Makefile.inc#2 integrate
.. //depot/projects/hammer/lib/msun/amd64/Makefile.inc#2 integrate
.. //depot/projects/hammer/lib/msun/arm/Makefile.inc#1 branch
.. //depot/projects/hammer/lib/msun/i387/Makefile.inc#3 integrate
.. //depot/projects/hammer/lib/msun/i387/s_scalbnf.S#2 integrate
.. //depot/projects/hammer/lib/msun/i387/s_scalbnl.S#1 branch
.. //depot/projects/hammer/lib/msun/ia64/Makefile.inc#2 integrate
.. //depot/projects/hammer/lib/msun/ia64/fenv.h#3 integrate
.. //depot/projects/hammer/lib/msun/ia64/s_fmal.S#1 branch
.. //depot/projects/hammer/lib/msun/man/fma.3#2 integrate
.. //depot/projects/hammer/lib/msun/man/ieee.3#9 integrate
.. //depot/projects/hammer/lib/msun/man/math.3#9 integrate
.. //depot/projects/hammer/lib/msun/man/nextafter.3#2 integrate
.. //depot/projects/hammer/lib/msun/man/scalbn.3#2 integrate
.. //depot/projects/hammer/lib/msun/powerpc/Makefile.inc#1 branch
.. //depot/projects/hammer/lib/msun/sparc64/Makefile.inc#2 integrate
.. //depot/projects/hammer/lib/msun/src/math.h#27 integrate
.. //depot/projects/hammer/lib/msun/src/s_fma.c#2 integrate
.. //depot/projects/hammer/lib/msun/src/s_fmal.c#1 branch
.. //depot/projects/hammer/lib/msun/src/s_frexp.c#2 integrate
.. //depot/projects/hammer/lib/msun/src/s_frexpl.c#1 branch
.. //depot/projects/hammer/lib/msun/src/s_ldexp.c#2 delete
.. //depot/projects/hammer/lib/msun/src/s_ldexpf.c#2 delete
.. //depot/projects/hammer/lib/msun/src/s_nextafter.c#3 integrate
.. //depot/projects/hammer/lib/msun/src/s_nextafterf.c#3 integrate
.. //depot/projects/hammer/lib/msun/src/s_nextafterl.c#1 branch
.. //depot/projects/hammer/lib/msun/src/s_nexttoward.c#1 branch
.. //depot/projects/hammer/lib/msun/src/s_nexttowardf.c#1 branch
.. //depot/projects/hammer/lib/msun/src/s_rint.c#3 integrate
.. //depot/projects/hammer/lib/msun/src/s_scalbln.c#2 integrate
.. //depot/projects/hammer/lib/msun/src/s_scalbn.c#3 integrate
.. //depot/projects/hammer/lib/msun/src/s_scalbnf.c#2 integrate
.. //depot/projects/hammer/lib/msun/src/s_scalbnl.c#1 branch
.. //depot/projects/hammer/libexec/Makefile#28 integrate
.. //depot/projects/hammer/libexec/rexecd/rexecd.c#5 integrate
.. //depot/projects/hammer/release/Makefile#68 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/Makefile#5 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/early-adopter/Makefile#2 delete
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/early-adopter/article.sgml#10 delete
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#72 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/sparc64/dev-sparc64.sgml#4 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/installation/common/install.sgml#12 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#86 integrate
.. //depot/projects/hammer/release/doc/ja_JP.eucJP/hardware/common/dev.sgml#16 integrate
.. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/Makefile#7 integrate
.. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/early-adopter/Makefile#2 delete
.. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/early-adopter/article.sgml#4 delete
.. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/hardware/alpha/Makefile#3 integrate
.. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/hardware/alpha/article.sgml#3 integrate
.. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/hardware/amd64/Makefile#3 integrate
.. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/hardware/amd64/article.sgml#3 integrate
.. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml#9 integrate
.. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/hardware/i386/Makefile#3 integrate
.. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/hardware/i386/article.sgml#3 integrate
.. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/hardware/i386/proc-i386.sgml#2 integrate
.. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/hardware/ia64/Makefile#3 integrate
.. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/hardware/ia64/article.sgml#3 integrate
.. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/hardware/pc98/Makefile#3 integrate
.. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/hardware/pc98/article.sgml#3 integrate
.. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/hardware/pc98/proc-pc98.sgml#2 integrate
.. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/hardware/sparc64/Makefile#3 integrate
.. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/hardware/sparc64/article.sgml#3 integrate
.. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/installation/common/install.sgml#6 integrate
.. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/relnotes/common/new.sgml#9 integrate
.. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/share/examples/dev-auto-translate.pl#1 branch
.. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/share/sgml/catalog#2 integrate
.. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/share/sgml/dev-auto-ru.sgml#1 branch
.. //depot/projects/hammer/release/doc/share/misc/dev.archlist.txt#22 integrate
.. //depot/projects/hammer/rescue/rescue/Makefile#23 integrate
.. //depot/projects/hammer/sbin/dump/tape.c#5 integrate
.. //depot/projects/hammer/sbin/fsck_ffs/fsck.h#11 integrate
.. //depot/projects/hammer/sbin/fsck_ffs/pass5.c#11 integrate
.. //depot/projects/hammer/sbin/fsck_ffs/setup.c#12 integrate
.. //depot/projects/hammer/sbin/fsck_msdosfs/ext.h#6 integrate
.. //depot/projects/hammer/sbin/md5/Makefile#4 integrate
.. //depot/projects/hammer/sbin/md5/md5.1#7 integrate
.. //depot/projects/hammer/sbin/md5/md5.c#7 integrate
.. //depot/projects/hammer/sbin/mdconfig/mdconfig.c#19 integrate
.. //depot/projects/hammer/share/colldef/Makefile#17 integrate
.. //depot/projects/hammer/share/colldef/uk_UA.CP1251.src#1 branch
.. //depot/projects/hammer/share/examples/drivers/make_pseudo_driver.sh#2 integrate
.. //depot/projects/hammer/share/examples/etc/make.conf#35 integrate
.. //depot/projects/hammer/share/man/man4/Makefile#65 integrate
.. //depot/projects/hammer/share/man/man4/aac.4#11 integrate
.. //depot/projects/hammer/share/man/man4/amr.4#11 integrate
.. //depot/projects/hammer/share/man/man4/ng_ccatm.4#1 branch
.. //depot/projects/hammer/share/man/man4/snd_ad1816.4#3 integrate
.. //depot/projects/hammer/share/man/man4/snd_als4000.4#3 integrate
.. //depot/projects/hammer/share/man/man4/snd_cmi.4#3 integrate
.. //depot/projects/hammer/share/man/man4/snd_cs4281.4#3 integrate
.. //depot/projects/hammer/share/man/man4/snd_ds1.4#3 integrate
.. //depot/projects/hammer/share/man/man4/snd_emu10k1.4#3 integrate
.. //depot/projects/hammer/share/man/man4/snd_es137x.4#3 integrate
.. //depot/projects/hammer/share/man/man4/snd_ess.4#2 integrate
.. //depot/projects/hammer/share/man/man4/snd_fm801.4#1 branch
.. //depot/projects/hammer/share/man/man4/snd_ich.4#4 integrate
.. //depot/projects/hammer/share/man/man4/snd_solo.4#3 integrate
.. //depot/projects/hammer/share/man/man4/snd_via82c686.4#1 branch
.. //depot/projects/hammer/share/man/man4/snd_vibes.4#1 branch
.. //depot/projects/hammer/share/man/man5/make.conf.5#34 integrate
.. //depot/projects/hammer/share/man/man5/rc.conf.5#50 integrate
.. //depot/projects/hammer/share/man/man9/alq.9#5 integrate
.. //depot/projects/hammer/share/man/man9/bus_alloc_resource.9#8 integrate
.. //depot/projects/hammer/share/man/man9/ktr.9#6 integrate
.. //depot/projects/hammer/share/mk/bsd.compat.mk#3 integrate
.. //depot/projects/hammer/share/mk/bsd.nls.mk#3 integrate
.. //depot/projects/hammer/share/mklocale/Makefile#15 integrate
.. //depot/projects/hammer/share/monetdef/Makefile#16 integrate
.. //depot/projects/hammer/share/monetdef/uk_UA.CP1251.src#1 branch
.. //depot/projects/hammer/share/msgdef/Makefile#17 integrate
.. //depot/projects/hammer/share/msgdef/uk_UA.CP1251.src#1 branch
.. //depot/projects/hammer/share/numericdef/Makefile#15 integrate
.. //depot/projects/hammer/share/timedef/Makefile#17 integrate
.. //depot/projects/hammer/share/timedef/uk_UA.CP1251.src#1 branch
.. //depot/projects/hammer/sys/Makefile#9 integrate
.. //depot/projects/hammer/sys/alpha/alpha/busdma_machdep.c#17 integrate
.. //depot/projects/hammer/sys/alpha/alpha/machdep.c#33 integrate
.. //depot/projects/hammer/sys/alpha/include/_types.h#5 integrate
.. //depot/projects/hammer/sys/alpha/include/atomic.h#7 integrate
.. //depot/projects/hammer/sys/alpha/include/cpufunc.h#2 integrate
.. //depot/projects/hammer/sys/alpha/include/critical.h#5 integrate
.. //depot/projects/hammer/sys/alpha/include/endian.h#6 integrate
.. //depot/projects/hammer/sys/alpha/include/in_cksum.h#3 integrate
.. //depot/projects/hammer/sys/alpha/include/ioctl_bt848.h#3 integrate
.. //depot/projects/hammer/sys/alpha/include/ioctl_meteor.h#3 integrate
.. //depot/projects/hammer/sys/alpha/include/limits.h#7 integrate
.. //depot/projects/hammer/sys/alpha/include/stdarg.h#5 integrate
.. //depot/projects/hammer/sys/alpha/include/varargs.h#5 integrate
.. //depot/projects/hammer/sys/alpha/linux/linux_proto.h#10 integrate
.. //depot/projects/hammer/sys/alpha/linux/linux_syscall.h#10 integrate
.. //depot/projects/hammer/sys/alpha/linux/linux_sysent.c#10 integrate
.. //depot/projects/hammer/sys/alpha/linux/syscalls.master#10 integrate
.. //depot/projects/hammer/sys/amd64/amd64/apic_vector.S#26 integrate
.. //depot/projects/hammer/sys/amd64/amd64/busdma_machdep.c#31 integrate
.. //depot/projects/hammer/sys/amd64/amd64/fpu.c#24 integrate
.. //depot/projects/hammer/sys/amd64/amd64/io_apic.c#37 integrate
.. //depot/projects/hammer/sys/amd64/amd64/local_apic.c#44 integrate
.. //depot/projects/hammer/sys/amd64/amd64/machdep.c#116 integrate
.. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#82 integrate
.. //depot/projects/hammer/sys/amd64/amd64/mptable.c#39 integrate
.. //depot/projects/hammer/sys/amd64/amd64/prof_machdep.c#3 integrate
.. //depot/projects/hammer/sys/amd64/conf/GENERIC#64 integrate
.. //depot/projects/hammer/sys/amd64/include/_types.h#11 integrate
.. //depot/projects/hammer/sys/amd64/include/apicvar.h#30 integrate
.. //depot/projects/hammer/sys/amd64/include/atomic.h#13 integrate
.. //depot/projects/hammer/sys/amd64/include/bus_amd64.h#12 integrate
.. //depot/projects/hammer/sys/amd64/include/cpufunc.h#30 integrate
.. //depot/projects/hammer/sys/amd64/include/critical.h#18 integrate
.. //depot/projects/hammer/sys/amd64/include/endian.h#11 integrate
.. //depot/projects/hammer/sys/amd64/include/ieeefp.h#13 integrate
.. //depot/projects/hammer/sys/amd64/include/in_cksum.h#11 integrate
.. //depot/projects/hammer/sys/amd64/include/limits.h#10 integrate
.. //depot/projects/hammer/sys/amd64/include/pcpu.h#20 integrate
.. //depot/projects/hammer/sys/amd64/include/profile.h#25 integrate
.. //depot/projects/hammer/sys/amd64/include/sf_buf.h#6 integrate
.. //depot/projects/hammer/sys/amd64/include/smp.h#23 integrate
.. //depot/projects/hammer/sys/amd64/include/stdarg.h#8 integrate
.. //depot/projects/hammer/sys/amd64/include/varargs.h#9 integrate
.. //depot/projects/hammer/sys/amd64/isa/clock.c#33 integrate
.. //depot/projects/hammer/sys/amd64/linux32/linux32_proto.h#2 integrate
.. //depot/projects/hammer/sys/amd64/linux32/linux32_syscall.h#2 integrate
.. //depot/projects/hammer/sys/amd64/linux32/linux32_sysent.c#2 integrate
.. //depot/projects/hammer/sys/amd64/linux32/syscalls.master#2 integrate
.. //depot/projects/hammer/sys/arm/arm/busdma_machdep.c#12 integrate
.. //depot/projects/hammer/sys/arm/arm/in_cksum.c#3 integrate
.. //depot/projects/hammer/sys/arm/arm/machdep.c#11 integrate
.. //depot/projects/hammer/sys/arm/arm/pmap.c#17 integrate
.. //depot/projects/hammer/sys/arm/arm/support.S#6 integrate
.. //depot/projects/hammer/sys/arm/arm/swtch.S#13 integrate
.. //depot/projects/hammer/sys/arm/include/_types.h#5 integrate
.. //depot/projects/hammer/sys/arm/include/limits.h#7 integrate
.. //depot/projects/hammer/sys/arm/include/stdarg.h#3 integrate
.. //depot/projects/hammer/sys/boot/arc/include/arcfuncs.h#3 integrate
.. //depot/projects/hammer/sys/boot/efi/include/i386/efibind.h#2 integrate
.. //depot/projects/hammer/sys/boot/efi/include/ia64/efibind.h#2 integrate
.. //depot/projects/hammer/sys/boot/ofw/libofw/ofw_net.c#5 integrate
.. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_misc.c#22 integrate
.. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_proto.h#27 integrate
.. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscall.h#25 integrate
.. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscalls.c#25 integrate
.. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_sysent.c#25 integrate
.. //depot/projects/hammer/sys/compat/freebsd32/syscalls.master#29 integrate
.. //depot/projects/hammer/sys/compat/linprocfs/linprocfs.c#27 integrate
.. //depot/projects/hammer/sys/compat/linux/linux_misc.c#26 integrate
.. //depot/projects/hammer/sys/compat/linux/linux_socket.c#17 integrate
.. //depot/projects/hammer/sys/compat/linux/linux_sysproto.h#1 branch
.. //depot/projects/hammer/sys/compat/linux/linux_util.c#9 integrate
.. //depot/projects/hammer/sys/compat/linux/linux_util.h#7 integrate
.. //depot/projects/hammer/sys/compat/ndis/kern_ndis.c#26 integrate
.. //depot/projects/hammer/sys/compat/ndis/kern_windrv.c#3 integrate
.. //depot/projects/hammer/sys/compat/ndis/ndis_var.h#18 integrate
.. //depot/projects/hammer/sys/compat/ndis/subr_ndis.c#25 integrate
.. //depot/projects/hammer/sys/compat/ndis/subr_ntoskrnl.c#25 integrate
.. //depot/projects/hammer/sys/conf/NOTES#82 integrate
.. //depot/projects/hammer/sys/conf/files#106 integrate
.. //depot/projects/hammer/sys/conf/files.i386#52 integrate
.. //depot/projects/hammer/sys/conf/options#69 integrate
.. //depot/projects/hammer/sys/contrib/dev/hptmv/access601.h#2 delete
.. //depot/projects/hammer/sys/contrib/dev/hptmv/array.h#2 delete
.. //depot/projects/hammer/sys/contrib/dev/hptmv/atapi.h#2 delete
.. //depot/projects/hammer/sys/contrib/dev/hptmv/command.h#2 delete
.. //depot/projects/hammer/sys/contrib/dev/hptmv/gui_lib.c#2 delete
.. //depot/projects/hammer/sys/contrib/dev/hptmv/hptproc.c#3 delete
.. //depot/projects/hammer/sys/contrib/dev/hptmv/i386-elf.raid.o.uu#4 delete
.. //depot/projects/hammer/sys/contrib/dev/hptmv/ioctl.c#3 delete
.. //depot/projects/hammer/sys/contrib/dev/hptmv/mvSata.h#2 delete
.. //depot/projects/hammer/sys/contrib/dev/hptmv/mvStorageDev.h#2 delete
.. //depot/projects/hammer/sys/contrib/dev/hptmv/raid5n.h#2 delete
.. //depot/projects/hammer/sys/contrib/dev/hptmv/readme.txt#2 delete
.. //depot/projects/hammer/sys/contrib/dev/hptmv/vdevice.h#2 delete
.. //depot/projects/hammer/sys/crypto/cast128/cast128.c#4 delete
.. //depot/projects/hammer/sys/crypto/cast128/cast128.h#3 delete
.. //depot/projects/hammer/sys/crypto/cast128/cast128sb.h#2 delete
.. //depot/projects/hammer/sys/crypto/md5.c#5 delete
.. //depot/projects/hammer/sys/crypto/md5.h#2 delete
.. //depot/projects/hammer/sys/crypto/rijndael/rijndael-alg-fst.c#5 integrate
.. //depot/projects/hammer/sys/crypto/rijndael/rijndael-alg-fst.h#4 delete
.. //depot/projects/hammer/sys/crypto/rijndael/rijndael-api-fst.c#7 integrate
.. //depot/projects/hammer/sys/crypto/rijndael/rijndael-api-fst.h#4 integrate
.. //depot/projects/hammer/sys/crypto/rijndael/rijndael.h#3 integrate
.. //depot/projects/hammer/sys/dev/aac/aac_pci.c#20 integrate
.. //depot/projects/hammer/sys/dev/acpi_support/acpi_ibm.c#3 integrate
.. //depot/projects/hammer/sys/dev/acpi_support/acpi_sony.c#4 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi.c#56 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_battery.c#7 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_button.c#10 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_pcib.c#26 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_pcib_acpi.c#18 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_perf.c#5 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_throttle.c#5 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_timer.c#13 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_video.c#9 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpiio.h#7 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpivar.h#40 integrate
.. //depot/projects/hammer/sys/dev/adlink/adlink.c#11 integrate
.. //depot/projects/hammer/sys/dev/advansys/adv_pci.c#9 integrate
.. //depot/projects/hammer/sys/dev/advansys/adw_pci.c#8 integrate
.. //depot/projects/hammer/sys/dev/aic7xxx/ahc_pci.c#16 integrate
.. //depot/projects/hammer/sys/dev/aic7xxx/ahd_pci.c#14 integrate
.. //depot/projects/hammer/sys/dev/amd/amd.c#12 integrate
.. //depot/projects/hammer/sys/dev/amr/amr.c#18 integrate
.. //depot/projects/hammer/sys/dev/amr/amr_pci.c#16 integrate
.. //depot/projects/hammer/sys/dev/an/if_an_pci.c#9 integrate
.. //depot/projects/hammer/sys/dev/ar/if_ar_pci.c#6 integrate
.. //depot/projects/hammer/sys/dev/asr/asr.c#14 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-disk.c#28 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-lowlevel.c#25 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-queue.c#22 integrate
.. //depot/projects/hammer/sys/dev/ath/ath_rate/sample/sample.c#1 branch
.. //depot/projects/hammer/sys/dev/ath/ath_rate/sample/sample.h#1 branch
.. //depot/projects/hammer/sys/dev/ath/if_ath.c#28 integrate
.. //depot/projects/hammer/sys/dev/ath/if_ath_pci.c#12 integrate
.. //depot/projects/hammer/sys/dev/awi/awi.c#14 integrate
.. //depot/projects/hammer/sys/dev/bfe/if_bfe.c#14 integrate
.. //depot/projects/hammer/sys/dev/bktr/bktr_os.c#15 integrate
.. //depot/projects/hammer/sys/dev/cardbus/cardbus.c#18 integrate
.. //depot/projects/hammer/sys/dev/ciss/ciss.c#30 integrate
.. //depot/projects/hammer/sys/dev/cp/if_cp.c#16 integrate
.. //depot/projects/hammer/sys/dev/cx/machdep.h#5 integrate
.. //depot/projects/hammer/sys/dev/cy/cy_pci.c#4 integrate
.. //depot/projects/hammer/sys/dev/digi/digi_pci.c#5 integrate
.. //depot/projects/hammer/sys/dev/dpt/dpt_pci.c#8 integrate
.. //depot/projects/hammer/sys/dev/ed/if_ed_pci.c#9 integrate
.. //depot/projects/hammer/sys/dev/em/if_em.c#39 integrate
.. //depot/projects/hammer/sys/dev/en/if_en_pci.c#7 integrate
.. //depot/projects/hammer/sys/dev/esp/esp_sbus.c#7 integrate
.. //depot/projects/hammer/sys/dev/esp/ncr53c9x.c#5 integrate
.. //depot/projects/hammer/sys/dev/fatm/if_fatm.c#9 integrate
.. //depot/projects/hammer/sys/dev/fb/s3_pci.c#5 integrate
.. //depot/projects/hammer/sys/dev/fb/vgareg.h#4 integrate
.. //depot/projects/hammer/sys/dev/fdc/fdc_isa.c#14 integrate
.. //depot/projects/hammer/sys/dev/firewire/fwohci_pci.c#30 integrate
.. //depot/projects/hammer/sys/dev/fxp/if_fxp.c#43 integrate
.. //depot/projects/hammer/sys/dev/fxp/if_fxpreg.h#10 integrate
.. //depot/projects/hammer/sys/dev/fxp/if_fxpvar.h#12 integrate
.. //depot/projects/hammer/sys/dev/gem/if_gem_pci.c#11 integrate
.. //depot/projects/hammer/sys/dev/hatm/if_hatm.c#12 integrate
.. //depot/projects/hammer/sys/dev/hfa/hfa_pci.c#4 integrate
.. //depot/projects/hammer/sys/dev/hifn/hifn7751.c#16 integrate
.. //depot/projects/hammer/sys/dev/hme/if_hme_pci.c#12 integrate
.. //depot/projects/hammer/sys/dev/hptmv/access601.h#2 integrate
.. //depot/projects/hammer/sys/dev/hptmv/array.h#2 integrate
.. //depot/projects/hammer/sys/dev/hptmv/atapi.h#2 integrate
.. //depot/projects/hammer/sys/dev/hptmv/command.h#2 integrate
.. //depot/projects/hammer/sys/dev/hptmv/entry.c#6 integrate
.. //depot/projects/hammer/sys/dev/hptmv/global.h#3 integrate
.. //depot/projects/hammer/sys/dev/hptmv/gui_lib.c#2 integrate
.. //depot/projects/hammer/sys/dev/hptmv/hptproc.c#2 integrate
.. //depot/projects/hammer/sys/dev/hptmv/i386-elf.raid.o.uu#2 integrate
.. //depot/projects/hammer/sys/dev/hptmv/ioctl.c#2 integrate
.. //depot/projects/hammer/sys/dev/hptmv/mvSata.h#2 integrate
.. //depot/projects/hammer/sys/dev/hptmv/mvStorageDev.h#2 integrate
.. //depot/projects/hammer/sys/dev/hptmv/raid5n.h#2 integrate
.. //depot/projects/hammer/sys/dev/hptmv/readme.txt#2 integrate
.. //depot/projects/hammer/sys/dev/hptmv/vdevice.h#2 integrate
.. //depot/projects/hammer/sys/dev/ichsmb/ichsmb.c#5 integrate
.. //depot/projects/hammer/sys/dev/ichsmb/ichsmb_pci.c#8 integrate
.. //depot/projects/hammer/sys/dev/ida/ida_pci.c#10 integrate
.. //depot/projects/hammer/sys/dev/idt/idt_pci.c#5 integrate
.. //depot/projects/hammer/sys/dev/ieee488/ibfoo.c#2 integrate
.. //depot/projects/hammer/sys/dev/ieee488/upd7210.c#3 integrate
.. //depot/projects/hammer/sys/dev/if_ndis/if_ndis.c#28 integrate
.. //depot/projects/hammer/sys/dev/iir/iir.h#11 integrate
.. //depot/projects/hammer/sys/dev/iir/iir_pci.c#9 integrate
.. //depot/projects/hammer/sys/dev/ips/ips_pci.c#11 integrate
.. //depot/projects/hammer/sys/dev/isp/isp_pci.c#14 integrate
.. //depot/projects/hammer/sys/dev/isp/ispvar.h#11 integrate
.. //depot/projects/hammer/sys/dev/ixgb/if_ixgb.c#5 integrate
.. //depot/projects/hammer/sys/dev/led/led.c#13 integrate
.. //depot/projects/hammer/sys/dev/lge/if_lge.c#21 integrate
.. //depot/projects/hammer/sys/dev/lnc/if_lnc_pci.c#10 integrate
.. //depot/projects/hammer/sys/dev/mcd/mcdreg.h#4 integrate
.. //depot/projects/hammer/sys/dev/mlx/mlx_pci.c#8 integrate
.. //depot/projects/hammer/sys/dev/mly/mly.c#12 integrate
.. //depot/projects/hammer/sys/dev/mpt/mpilib/mpi_type.h#4 integrate
.. //depot/projects/hammer/sys/dev/mpt/mpt_pci.c#10 integrate
.. //depot/projects/hammer/sys/dev/musycc/musycc.c#10 integrate
.. //depot/projects/hammer/sys/dev/my/if_my.c#16 integrate
.. //depot/projects/hammer/sys/dev/nge/if_nge.c#25 integrate
.. //depot/projects/hammer/sys/dev/patm/if_patm_attach.c#7 integrate
.. //depot/projects/hammer/sys/dev/pccbb/pccbb_pci.c#6 integrate
.. //depot/projects/hammer/sys/dev/pdq/if_fpa.c#6 integrate
.. //depot/projects/hammer/sys/dev/ppbus/pps.c#10 integrate
.. //depot/projects/hammer/sys/dev/pst/pst-pci.c#7 integrate
.. //depot/projects/hammer/sys/dev/puc/puc.c#15 integrate
.. //depot/projects/hammer/sys/dev/puc/puc_pci.c#9 integrate
.. //depot/projects/hammer/sys/dev/random/hash.c#6 integrate
.. //depot/projects/hammer/sys/dev/random/nehemiah.c#3 integrate
.. //depot/projects/hammer/sys/dev/random/yarrow.c#7 integrate
.. //depot/projects/hammer/sys/dev/re/if_re.c#23 integrate
.. //depot/projects/hammer/sys/dev/rp/rp_pci.c#7 integrate
.. //depot/projects/hammer/sys/dev/safe/safe.c#6 integrate
.. //depot/projects/hammer/sys/dev/sbsh/if_sbsh.c#6 integrate
.. //depot/projects/hammer/sys/dev/scd/scdreg.h#4 integrate
.. //depot/projects/hammer/sys/dev/si/si_pci.c#5 integrate
.. //depot/projects/hammer/sys/dev/sound/isa/ad1816.c#12 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/als4000.c#9 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/au88x0.c#9 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/aureal.c#10 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/cmi.c#13 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/cs4281.c#10 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/csa.c#7 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/ds1.c#12 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/emu10k1.c#16 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/es137x.c#10 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/fm801.c#12 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/ich.c#19 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/maestro.c#11 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/maestro3.c#10 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/solo.c#11 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/t4dwave.c#12 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/via8233.c#13 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/via82c686.c#13 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/vibes.c#9 integrate
.. //depot/projects/hammer/sys/dev/sound/sbus/cs4231.c#3 integrate
.. //depot/projects/hammer/sys/dev/sound/usb/uaudio_pcm.c#8 integrate
.. //depot/projects/hammer/sys/dev/sr/if_sr_pci.c#7 integrate
.. //depot/projects/hammer/sys/dev/stg/tmc18c30_pci.c#3 integrate
.. //depot/projects/hammer/sys/dev/sx/sx_pci.c#5 integrate
.. //depot/projects/hammer/sys/dev/sym/sym_hipd.c#15 integrate
.. //depot/projects/hammer/sys/dev/tdfx/tdfx_pci.c#14 integrate
.. //depot/projects/hammer/sys/dev/tga/tga_pci.c#11 integrate
.. //depot/projects/hammer/sys/dev/trm/trm.c#17 integrate
.. //depot/projects/hammer/sys/dev/twa/twa_freebsd.c#9 integrate
.. //depot/projects/hammer/sys/dev/twe/twe_freebsd.c#15 integrate
.. //depot/projects/hammer/sys/dev/tx/if_tx.c#18 integrate
.. //depot/projects/hammer/sys/dev/txp/if_txp.c#15 integrate
.. //depot/projects/hammer/sys/dev/uart/uart_core.c#10 integrate
.. //depot/projects/hammer/sys/dev/ubsec/ubsec.c#13 integrate
.. //depot/projects/hammer/sys/dev/usb/ehci.c#19 integrate
.. //depot/projects/hammer/sys/dev/usb/ehci_pci.c#14 integrate
.. //depot/projects/hammer/sys/dev/usb/ohci_pci.c#10 integrate
.. //depot/projects/hammer/sys/dev/usb/uhci_pci.c#12 integrate
.. //depot/projects/hammer/sys/dev/usb/usb_subr.c#21 integrate
.. //depot/projects/hammer/sys/dev/usb/usbcdc.h#4 integrate
.. //depot/projects/hammer/sys/dev/usb/usbdi.c#12 integrate
.. //depot/projects/hammer/sys/dev/usb/usbdi.h#9 integrate
.. //depot/projects/hammer/sys/dev/usb/usbdi_util.c#9 integrate
.. //depot/projects/hammer/sys/dev/usb/usbdi_util.h#6 integrate
.. //depot/projects/hammer/sys/dev/vge/if_vge.c#4 integrate
.. //depot/projects/hammer/sys/dev/vx/if_vx_pci.c#10 integrate
.. //depot/projects/hammer/sys/dev/wi/if_wi.c#33 integrate
.. //depot/projects/hammer/sys/dev/wi/if_wi_pci.c#12 integrate
.. //depot/projects/hammer/sys/fs/devfs/devfs.h#9 integrate
.. //depot/projects/hammer/sys/fs/devfs/devfs_devs.c#9 integrate
.. //depot/projects/hammer/sys/fs/devfs/devfs_rule.c#8 integrate
.. //depot/projects/hammer/sys/fs/devfs/devfs_vnops.c#28 integrate
.. //depot/projects/hammer/sys/fs/pseudofs/pseudofs_vncache.c#11 integrate
.. //depot/projects/hammer/sys/geom/bde/g_bde.c#12 integrate
.. //depot/projects/hammer/sys/geom/bde/g_bde_crypt.c#13 integrate
.. //depot/projects/hammer/sys/geom/bde/g_bde_lock.c#9 integrate
.. //depot/projects/hammer/sys/geom/bde/g_bde_work.c#12 integrate
.. //depot/projects/hammer/sys/geom/geom_aes.c#16 integrate
.. //depot/projects/hammer/sys/geom/geom_dev.c#30 integrate
.. //depot/projects/hammer/sys/geom/vinum/geom_vinum.c#12 integrate
.. //depot/projects/hammer/sys/geom/vinum/geom_vinum_drive.c#11 integrate
.. //depot/projects/hammer/sys/geom/vinum/geom_vinum_init.c#8 integrate
.. //depot/projects/hammer/sys/i386/acpica/acpi_wakeup.c#21 integrate
.. //depot/projects/hammer/sys/i386/conf/NOTES#63 integrate
.. //depot/projects/hammer/sys/i386/i386/busdma_machdep.c#25 integrate
.. //depot/projects/hammer/sys/i386/i386/identcpu.c#19 integrate
.. //depot/projects/hammer/sys/i386/i386/in_cksum.c#5 integrate
.. //depot/projects/hammer/sys/i386/i386/local_apic.c#13 integrate
.. //depot/projects/hammer/sys/i386/i386/machdep.c#47 integrate
.. //depot/projects/hammer/sys/i386/include/_types.h#8 integrate
.. //depot/projects/hammer/sys/i386/include/atomic.h#7 integrate
.. //depot/projects/hammer/sys/i386/include/bus_at386.h#7 integrate
.. //depot/projects/hammer/sys/i386/include/clock.h#8 integrate
.. //depot/projects/hammer/sys/i386/include/cpufunc.h#11 integrate
.. //depot/projects/hammer/sys/i386/include/critical.h#7 integrate
.. //depot/projects/hammer/sys/i386/include/endian.h#9 integrate
.. //depot/projects/hammer/sys/i386/include/ieeefp.h#4 integrate
.. //depot/projects/hammer/sys/i386/include/in_cksum.h#5 integrate
.. //depot/projects/hammer/sys/i386/include/ioctl_bt848.h#4 integrate
.. //depot/projects/hammer/sys/i386/include/ioctl_meteor.h#4 integrate
.. //depot/projects/hammer/sys/i386/include/limits.h#7 integrate
.. //depot/projects/hammer/sys/i386/include/pcpu.h#9 integrate
.. //depot/projects/hammer/sys/i386/include/profile.h#12 integrate
.. //depot/projects/hammer/sys/i386/include/stdarg.h#7 integrate
.. //depot/projects/hammer/sys/i386/include/varargs.h#6 integrate
.. //depot/projects/hammer/sys/i386/isa/clock.c#21 integrate
.. //depot/projects/hammer/sys/i386/isa/npx.c#23 integrate
.. //depot/projects/hammer/sys/i386/isa/prof_machdep.c#5 integrate
.. //depot/projects/hammer/sys/i386/isa/vesa.c#10 integrate
.. //depot/projects/hammer/sys/i386/linux/linux_machdep.c#17 integrate
.. //depot/projects/hammer/sys/i386/linux/linux_proto.h#13 integrate
.. //depot/projects/hammer/sys/i386/linux/linux_syscall.h#13 integrate
.. //depot/projects/hammer/sys/i386/linux/linux_sysent.c#14 integrate
.. //depot/projects/hammer/sys/i386/linux/syscalls.master#13 integrate
.. //depot/projects/hammer/sys/ia64/ia64/busdma_machdep.c#17 integrate
.. //depot/projects/hammer/sys/ia64/ia64/machdep.c#48 integrate
.. //depot/projects/hammer/sys/ia64/include/_types.h#7 integrate
.. //depot/projects/hammer/sys/ia64/include/cpufunc.h#10 integrate
.. //depot/projects/hammer/sys/ia64/include/critical.h#5 integrate
.. //depot/projects/hammer/sys/ia64/include/endian.h#6 integrate
.. //depot/projects/hammer/sys/ia64/include/in_cksum.h#3 integrate
.. //depot/projects/hammer/sys/ia64/include/limits.h#7 integrate
.. //depot/projects/hammer/sys/ia64/include/stdarg.h#5 integrate
.. //depot/projects/hammer/sys/isa/vga_isa.c#14 integrate
.. //depot/projects/hammer/sys/kern/init_sysent.c#42 integrate
.. //depot/projects/hammer/sys/kern/kern_acct.c#18 integrate
.. //depot/projects/hammer/sys/kern/kern_conf.c#29 integrate
.. //depot/projects/hammer/sys/kern/kern_descrip.c#46 integrate
.. //depot/projects/hammer/sys/kern/kern_environment.c#10 integrate
.. //depot/projects/hammer/sys/kern/kern_event.c#30 integrate
.. //depot/projects/hammer/sys/kern/kern_mib.c#13 integrate
.. //depot/projects/hammer/sys/kern/kern_prot.c#22 integrate
.. //depot/projects/hammer/sys/kern/kern_sig.c#56 integrate
.. //depot/projects/hammer/sys/kern/kern_thread.c#75 integrate
.. //depot/projects/hammer/sys/kern/kern_umtx.c#19 integrate
.. //depot/projects/hammer/sys/kern/subr_hints.c#4 integrate
.. //depot/projects/hammer/sys/kern/subr_prof.c#12 integrate
.. //depot/projects/hammer/sys/kern/subr_unit.c#4 integrate
.. //depot/projects/hammer/sys/kern/subr_witness.c#39 integrate
.. //depot/projects/hammer/sys/kern/sys_socket.c#16 integrate
.. //depot/projects/hammer/sys/kern/syscalls.c#41 integrate
.. //depot/projects/hammer/sys/kern/syscalls.master#41 integrate
.. //depot/projects/hammer/sys/kern/tty.c#42 integrate
.. //depot/projects/hammer/sys/kern/uipc_mbuf.c#27 integrate
.. //depot/projects/hammer/sys/kern/uipc_socket.c#53 integrate
.. //depot/projects/hammer/sys/kern/uipc_socket2.c#33 integrate
.. //depot/projects/hammer/sys/kern/uipc_syscalls.c#46 integrate
.. //depot/projects/hammer/sys/kern/vfs_bio.c#51 integrate
.. //depot/projects/hammer/sys/modules/Makefile#68 integrate
.. //depot/projects/hammer/sys/modules/ath_rate_sample/Makefile#1 branch
.. //depot/projects/hammer/sys/modules/crypto/Makefile#3 integrate
.. //depot/projects/hammer/sys/modules/hptmv/Makefile#3 integrate
.. //depot/projects/hammer/sys/net/bpf.c#28 integrate
.. //depot/projects/hammer/sys/net/bridge.c#23 integrate
.. //depot/projects/hammer/sys/net/if_ef.c#12 integrate
.. //depot/projects/hammer/sys/net/if_ethersubr.c#40 integrate
.. //depot/projects/hammer/sys/net/if_var.h#28 integrate
.. //depot/projects/hammer/sys/net80211/ieee80211_ioctl.c#16 integrate
.. //depot/projects/hammer/sys/net80211/ieee80211_node.c#19 integrate
.. //depot/projects/hammer/sys/netgraph/netflow/netflow.c#7 integrate
.. //depot/projects/hammer/sys/netgraph/netgraph.h#16 integrate
.. //depot/projects/hammer/sys/netgraph/ng_base.c#28 integrate
.. //depot/projects/hammer/sys/netgraph/ng_eiface.c#17 integrate
.. //depot/projects/hammer/sys/netgraph/ng_one2many.c#10 integrate
.. //depot/projects/hammer/sys/netgraph/ng_parse.c#9 integrate
.. //depot/projects/hammer/sys/netgraph/ng_source.c#11 integrate
.. //depot/projects/hammer/sys/netgraph/ng_source.h#5 integrate
.. //depot/projects/hammer/sys/netinet/if_ether.c#20 integrate
.. //depot/projects/hammer/sys/netinet/in.c#13 integrate
.. //depot/projects/hammer/sys/netinet/ip_carp.c#2 integrate
.. //depot/projects/hammer/sys/netinet/ip_dummynet.c#27 integrate
.. //depot/projects/hammer/sys/netinet/ip_fw2.c#51 integrate
.. //depot/projects/hammer/sys/netinet/ip_mroute.c#25 integrate
.. //depot/projects/hammer/sys/netinet/tcp_sack.c#10 integrate
.. //depot/projects/hammer/sys/netinet/tcp_subr.c#40 integrate
.. //depot/projects/hammer/sys/netinet/tcp_syncache.c#25 integrate
.. //depot/projects/hammer/sys/netinet/tcp_var.h#25 integrate
.. //depot/projects/hammer/sys/netinet6/esp_core.c#8 integrate
.. //depot/projects/hammer/sys/netinet6/icmp6.c#18 integrate
.. //depot/projects/hammer/sys/netinet6/ipsec.c#16 integrate
.. //depot/projects/hammer/sys/netipsec/ipsec.c#9 integrate
.. //depot/projects/hammer/sys/netipx/README#3 integrate
.. //depot/projects/hammer/sys/opencrypto/cryptosoft.c#8 integrate
.. //depot/projects/hammer/sys/opencrypto/rijndael.c#5 delete
.. //depot/projects/hammer/sys/opencrypto/rijndael.h#3 delete
.. //depot/projects/hammer/sys/opencrypto/xform.c#4 integrate
.. //depot/projects/hammer/sys/pc98/conf/GENERIC.hints#11 integrate
.. //depot/projects/hammer/sys/pc98/i386/machdep.c#41 integrate
.. //depot/projects/hammer/sys/pc98/pc98/clock.c#17 integrate
.. //depot/projects/hammer/sys/pci/if_dc.c#42 integrate
.. //depot/projects/hammer/sys/powerpc/include/_types.h#5 integrate
.. //depot/projects/hammer/sys/powerpc/include/atomic.h#5 integrate
.. //depot/projects/hammer/sys/powerpc/include/critical.h#5 integrate
.. //depot/projects/hammer/sys/powerpc/include/endian.h#6 integrate
.. //depot/projects/hammer/sys/powerpc/include/in_cksum.h#3 integrate
.. //depot/projects/hammer/sys/powerpc/include/limits.h#7 integrate
.. //depot/projects/hammer/sys/powerpc/include/stdarg.h#6 integrate
.. //depot/projects/hammer/sys/powerpc/include/varargs.h#5 integrate
.. //depot/projects/hammer/sys/powerpc/powerpc/busdma_machdep.c#14 integrate
.. //depot/projects/hammer/sys/powerpc/powerpc/machdep.c#34 integrate
.. //depot/projects/hammer/sys/powerpc/powerpc/pmap.c#35 integrate
.. //depot/projects/hammer/sys/sparc64/central/central.c#4 integrate
.. //depot/projects/hammer/sys/sparc64/conf/GENERIC#36 integrate
.. //depot/projects/hammer/sys/sparc64/fhc/fhc.c#5 integrate
.. //depot/projects/hammer/sys/sparc64/fhc/fhc_central.c#4 integrate
.. //depot/projects/hammer/sys/sparc64/fhc/fhc_nexus.c#4 integrate
.. //depot/projects/hammer/sys/sparc64/fhc/fhcvar.h#3 integrate
.. //depot/projects/hammer/sys/sparc64/include/_types.h#7 integrate
.. //depot/projects/hammer/sys/sparc64/include/critical.h#5 integrate
.. //depot/projects/hammer/sys/sparc64/include/endian.h#6 integrate
.. //depot/projects/hammer/sys/sparc64/include/limits.h#6 integrate
.. //depot/projects/hammer/sys/sparc64/include/smp.h#6 integrate
.. //depot/projects/hammer/sys/sparc64/include/stdarg.h#6 integrate
.. //depot/projects/hammer/sys/sparc64/include/varargs.h#6 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/exception.S#14 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/intr_machdep.c#10 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/machdep.c#38 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/pmap.c#33 integrate
.. //depot/projects/hammer/sys/sys/cdefs.h#18 integrate
.. //depot/projects/hammer/sys/sys/conf.h#29 integrate
.. //depot/projects/hammer/sys/sys/dir.h#5 integrate
.. //depot/projects/hammer/sys/sys/event.h#6 integrate
.. //depot/projects/hammer/sys/sys/filio.h#3 integrate
.. //depot/projects/hammer/sys/sys/ioctl.h#5 integrate
.. //depot/projects/hammer/sys/sys/ktr.h#11 integrate
.. //depot/projects/hammer/sys/sys/linker_set.h#7 integrate
.. //depot/projects/hammer/sys/sys/mbuf.h#38 integrate
.. //depot/projects/hammer/sys/sys/mutex.h#16 integrate
.. //depot/projects/hammer/sys/sys/param.h#55 integrate
.. //depot/projects/hammer/sys/sys/proc.h#75 integrate
.. //depot/projects/hammer/sys/sys/queue.h#6 integrate
.. //depot/projects/hammer/sys/sys/socket.h#17 integrate
.. //depot/projects/hammer/sys/sys/syscall.h#40 integrate
.. //depot/projects/hammer/sys/sys/syscall.mk#40 integrate
.. //depot/projects/hammer/sys/sys/syscallsubr.h#17 integrate
.. //depot/projects/hammer/sys/sys/sysctl.h#24 integrate
.. //depot/projects/hammer/sys/sys/syslimits.h#10 integrate
.. //depot/projects/hammer/sys/sys/sysproto.h#40 integrate
.. //depot/projects/hammer/sys/sys/systm.h#31 integrate
.. //depot/projects/hammer/sys/sys/umtx.h#10 integrate
.. //depot/projects/hammer/sys/ufs/ffs/ffs_snapshot.c#34 integrate
.. //depot/projects/hammer/tools/build/Makefile#6 integrate
.. //depot/projects/hammer/tools/build/cross-build/Makefile#1 branch
.. //depot/projects/hammer/tools/build/cross-build/date.sh#1 branch
.. //depot/projects/hammer/tools/build/cross-build/hostname.sh#1 branch
.. //depot/projects/hammer/tools/build/make_check/Makefile#2 integrate
.. //depot/projects/hammer/tools/build/make_check/regress.t#2 integrate
.. //depot/projects/hammer/tools/build/make_check/shell_test.sh#2 integrate
.. //depot/projects/hammer/tools/regression/aio/kqueue/Makefile#1 branch
.. //depot/projects/hammer/tools/regression/aio/kqueue/aio_kqueue.c#1 branch
.. //depot/projects/hammer/tools/regression/aio/kqueue/lio/Makefile#1 branch
.. //depot/projects/hammer/tools/regression/aio/kqueue/lio/lio_kqueue.c#1 branch
.. //depot/projects/hammer/tools/regression/lib/libc/stdio/Makefile#4 integrate
.. //depot/projects/hammer/tools/regression/lib/libc/stdio/test-printfloat.c#8 integrate
.. //depot/projects/hammer/tools/regression/lib/libc/stdio/test-scanfloat.c#4 integrate
.. //depot/projects/hammer/tools/regression/lib/msun/Makefile#4 integrate
.. //depot/projects/hammer/tools/regression/lib/msun/test-next.c#1 branch
.. //depot/projects/hammer/tools/regression/lib/msun/test-next.t#1 branch
.. //depot/projects/hammer/tools/regression/sockets/sigpipe/Makefile#1 branch
.. //depot/projects/hammer/tools/regression/sockets/sigpipe/sigpipe.c#1 branch
.. //depot/projects/hammer/tools/regression/usr.bin/Makefile#2 integrate
.. //depot/projects/hammer/tools/regression/usr.bin/make/Makefile#16 delete
.. //depot/projects/hammer/tools/regression/usr.bin/make/regress.shell_2B.out#2 delete
.. //depot/projects/hammer/tools/regression/usr.bin/make/regress.shell_2j.out#2 delete
.. //depot/projects/hammer/tools/regression/usr.bin/make/regress.sysvmatch.out#2 delete
.. //depot/projects/hammer/tools/regression/usr.bin/make/regress.t#2 delete
.. //depot/projects/hammer/tools/regression/usr.bin/make/regress.variables.out#2 delete
.. //depot/projects/hammer/tools/regression/usr.bin/make/shell_test.sh#2 delete
.. //depot/projects/hammer/tools/tools/README#13 integrate
.. //depot/projects/hammer/tools/tools/sysdoc/Makefile#1 branch
.. //depot/projects/hammer/tools/tools/sysdoc/sysctl.sh#1 branch
.. //depot/projects/hammer/tools/tools/sysdoc/sysdoc.sh#1 branch
.. //depot/projects/hammer/tools/tools/sysdoc/tunables.mdoc#1 branch
.. //depot/projects/hammer/tools/tools/tinderbox/tbmaster.1#14 integrate
.. //depot/projects/hammer/tools/tools/tinderbox/tbmaster.pl#23 integrate
.. //depot/projects/hammer/usr.bin/Makefile#41 integrate
.. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.freebsd#32 integrate
.. //depot/projects/hammer/usr.bin/ipcs/ipcs.c#7 integrate
.. //depot/projects/hammer/usr.bin/ktrdump/ktrdump.8#4 integrate
.. //depot/projects/hammer/usr.bin/make/GNode.h#2 integrate
.. //depot/projects/hammer/usr.bin/make/arch.c#14 integrate
.. //depot/projects/hammer/usr.bin/make/buf.c#8 integrate
.. //depot/projects/hammer/usr.bin/make/buf.h#7 integrate
.. //depot/projects/hammer/usr.bin/make/compat.c#17 integrate
.. //depot/projects/hammer/usr.bin/make/cond.c#15 integrate
.. //depot/projects/hammer/usr.bin/make/for.c#15 integrate
.. //depot/projects/hammer/usr.bin/make/job.c#22 integrate
.. //depot/projects/hammer/usr.bin/make/lst.h#11 integrate
.. //depot/projects/hammer/usr.bin/make/main.c#29 integrate
.. //depot/projects/hammer/usr.bin/make/parse.c#24 integrate
.. //depot/projects/hammer/usr.bin/make/pathnames.h#3 integrate
.. //depot/projects/hammer/usr.bin/make/str.c#12 integrate
.. //depot/projects/hammer/usr.bin/make/str.h#2 integrate
.. //depot/projects/hammer/usr.bin/make/suff.c#15 integrate
.. //depot/projects/hammer/usr.bin/make/suff.h#2 integrate
.. //depot/projects/hammer/usr.bin/make/util.c#5 integrate
.. //depot/projects/hammer/usr.bin/make/util.h#3 integrate
.. //depot/projects/hammer/usr.bin/make/var.c#22 integrate
.. //depot/projects/hammer/usr.bin/make/var.h#7 integrate
.. //depot/projects/hammer/usr.bin/netstat/inet.c#15 integrate
.. //depot/projects/hammer/usr.bin/pkill/pkill.c#6 integrate
.. //depot/projects/hammer/usr.bin/sed/compile.c#5 integrate
.. //depot/projects/hammer/usr.bin/talk/get_iface.c#3 integrate
.. //depot/projects/hammer/usr.bin/truss/syscalls.c#16 integrate
.. //depot/projects/hammer/usr.bin/unifdef/unifdef.1#5 integrate
.. //depot/projects/hammer/usr.bin/unifdef/unifdef.c#7 integrate
.. //depot/projects/hammer/usr.sbin/dconschat/dconschat.c#7 integrate
.. //depot/projects/hammer/usr.sbin/kldxref/ef_powerpc.c#1 branch
.. //depot/projects/hammer/usr.sbin/mount_portalfs/Makefile#3 integrate
.. //depot/projects/hammer/usr.sbin/mount_portalfs/cred.c#1 branch
.. //depot/projects/hammer/usr.sbin/mount_portalfs/mount_portalfs.8#4 integrate
.. //depot/projects/hammer/usr.sbin/mount_portalfs/mount_portalfs.c#4 integrate
.. //depot/projects/hammer/usr.sbin/mount_portalfs/portal.conf#2 integrate
.. //depot/projects/hammer/usr.sbin/mount_portalfs/portald.h#3 integrate
.. //depot/projects/hammer/usr.sbin/mount_portalfs/pt_conf.c#4 integrate
.. //depot/projects/hammer/usr.sbin/mount_portalfs/pt_file.c#4 integrate
.. //depot/projects/hammer/usr.sbin/mount_portalfs/pt_pipe.c#1 branch
.. //depot/projects/hammer/usr.sbin/newsyslog/newsyslog.8#14 integrate
.. //depot/projects/hammer/usr.sbin/newsyslog/newsyslog.c#21 integrate
.. //depot/projects/hammer/usr.sbin/pwd_mkdb/pwd_mkdb.8#7 integrate
.. //depot/projects/hammer/usr.sbin/pwd_mkdb/pwd_mkdb.c#8 integrate
.. //depot/projects/hammer/usr.sbin/sysinstall/cdrom.c#3 integrate
.. //depot/projects/hammer/usr.sbin/sysinstall/install.c#25 integrate
.. //depot/projects/hammer/usr.sbin/sysinstall/sysinstall.h#19 integrate
.. //depot/projects/hammer/usr.sbin/ypserv/yp_dnslookup.c#4 integrate
.. //depot/projects/hammer/usr.sbin/ypserv/yp_main.c#3 integrate

Differences ...

==== //depot/projects/hammer/Makefile#31 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile,v 1.317 2005/02/27 12:11:34 ru Exp $
+# $FreeBSD: src/Makefile,v 1.318 2005/03/02 12:33:22 harti Exp $
 #
 # The user-driven targets are:
 #
@@ -217,7 +217,7 @@
 # for building the world.
 #
 upgrade_checks:
-	@if ! (cd ${.CURDIR}/tools/regression/usr.bin/make && \
+	@if ! (cd ${.CURDIR}/tools/build/make_check && \
 	    PATH=${PATH} ${BINMAKE} obj >/dev/null 2>&1 && \
 	    PATH=${PATH} ${BINMAKE} >/dev/null 2>&1); \
 	then \

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

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile.inc1,v 1.486 2005/02/28 09:23:38 obrien Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.488 2005/03/02 16:40:50 ru Exp $
 #
 # Make command line options:
 #	-DNO_DYNAMICROOT do not link /bin and /sbin dynamically
@@ -127,12 +127,12 @@
 .error To cross-build, set TARGET_ARCH.
 .endif
 .endif
-.if ${MACHINE} == ${TARGET}
+.if ${MACHINE} == ${TARGET} && !defined(CROSS_BUILD_TESTING)
 OBJTREE=	${MAKEOBJDIRPREFIX}
 .else
 OBJTREE=	${MAKEOBJDIRPREFIX}/${TARGET}
 .endif
-WORLDTMP=	${OBJTREE}${.CURDIR}/${MACHINE_ARCH}
+WORLDTMP=	${OBJTREE}${.CURDIR}/tmp
 # /usr/games added for fortune which depend on strfile
 BPATH=		${WORLDTMP}/legacy/usr/sbin:${WORLDTMP}/legacy/usr/bin:${WORLDTMP}/legacy/usr/games
 XPATH=		${WORLDTMP}/usr/sbin:${WORLDTMP}/usr/bin:${WORLDTMP}/usr/games
@@ -798,6 +798,10 @@
 _crunchgen=	usr.sbin/crunch/crunchgen
 .endif
 
+.if ${BOOTSTRAPPING} < 600020
+_pwd_mkdb=	usr.sbin/pwd_mkdb
+.endif
+
 bootstrap-tools:
 .for _tool in \
     ${_strfile} \
@@ -813,7 +817,8 @@
     usr.bin/rpcgen \
     usr.bin/xinstall \
     usr.sbin/config \
-    ${_crunchgen}
+    ${_crunchgen} \
+    ${_pwd_mkdb}
 	${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \
 		cd ${.CURDIR}/${_tool}; \
 		${MAKE} DIRPRFX=${_tool}/ obj; \

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

@@ -6,7 +6,7 @@
 
 Items affecting the ports and packages system can be found in
 /usr/ports/UPDATING.  Please read that file before running
-portupgrade.  Important recent entries: 20040724 (default X changes).
+portupgrade.
 
 NOTE TO PEOPLE WHO THINK THAT FreeBSD 6.x IS SLOW:
 	FreeBSD 6.x has many debugging features turned on, in
@@ -48,6 +48,16 @@
 	"options CPU_ENABLE_TCC" obsolete.  Please load cpufreq.ko or
 	compile in "device cpufreq" to restore this functionality.
 
+20050220:
+	The responsibility of recomputing the file system summary of
+	a SoftUpdates-enabled dirty volume has been transferred to the
+	background fsck.  A rebuild of fsck(8) utility is recommended
+	if you have updated the kernel.
+
+	To get the old behavior (recompute file system summary at mount
+	time), you can set vfs.ffs.compute_summary_at_mount=1 before
+	mounting the new volume.
+
 20050206:
 	The cpufreq import is complete.  As part of this, the sysctls for
 	acpi(4) throttling have been removed.  The power_profile script
@@ -132,12 +142,6 @@
 
 COMMON ITEMS:
 
-	# NOTE: 5.x below applies to 6.0-current as well, for the
-	# moment.  4.any -> 5.any upgrade support will remain in
-	# place for 6.0 current, but after 5.3 RELEASE, the 4.any ->
-	# 6.0-current upgrade path will require moving through 5.3
-	# RELEASE or newer.
-
 	General Notes
 	-------------
 	Avoid using make -j when upgrading.  From time to time in the
@@ -219,28 +223,14 @@
  	<reboot>
 
 
-	To upgrade in-place from 4.x-stable to current
+	To upgrade in-place from 5.x-stable to current
 	----------------------------------------------
-	# 5.x uses more space than 4.x.  Also, the location of kernel
-	# modules has changed.  If you are installing 5.x onto a 4.x
-	# system, you'll need about 30MB of free disk space on your /
-	# partition.  If you have less than this, you may encounter difficult
-	# to back out of problems with this procedure.  If /tmp is on
-	# the / partition, you may want to completely remove all its content
-	# before upgrading, as this can be a common source of shortage of
-	# space on /.
-
 	<make sure you have good level 0 dumps>
-	<maybe fix /etc/fstab>				[7]
 	make buildworld					[9]
-	cp sys/${MACHINE}/conf/GENERIC.hints /boot/device.hints [2]
 	make kernel KERNCONF=YOUR_KERNEL_HERE		[8]
-	cd sys/boot ; make STRIP="" install		[6]
 							[1]
 	<reboot in single user>				[3]
-	src/etc/rc.d/preseedrandom			[10]
 	mergemaster -p					[5]
-	rm -rf /usr/include/g++
 	make installworld
 	mergemaster -i					[4]
 	<reboot>
@@ -261,10 +251,6 @@
 	should disable them at this point so they don't crash your
 	system on reboot.
 
-	[2] If you have legacy ISA devices, you may need to create
-	your own device.hints to reflect your unique hardware
-	configuration.
-
 	[3] From the bootblocks, boot -s, and then do
 		fsck -p
 		mount -u /
@@ -273,9 +259,6 @@
 		adjkerntz -i		# if CMOS is wall time
 	Also, when doing a major release upgrade, it is required that
 	you boot into single user mode to do the installworld.
-	For the 4.x -> 5.x upgrade, you will also see many messages about
-	needing to recompile your userland.  These are harmless and can
-	be ignored while you proceed to the next step.
 
 	[4] Note: This step is non-optional.  Failure to do this step
 	can result in a significant reduction in the functionality of the
@@ -291,21 +274,6 @@
 	install) after the buildworld before this step if you last updated
 	from current before 20020224 or from -stable before 20020408.
 
-	[6] 4.x boot loader can be used to boot a 5.x system, however
-	it is difficult to do that at best.  If you wish to try, then
-	you should interrupt the boot and at the ok prompt type:
-		ok unload
-		ok boot /boot/kernel/kernel
-	If this fails to work, you must install a new boot loader as
-	described here.
-
-	[7] Before you upgrade, please make sure that you are not using
-	compatibility slices.  These are device names of the form /dev/ad0a
-	without the actual slice name.  These will break with 5.x and newer.
-	You generally must update these entries to use the post FreeBSD
-	2.x form of /dev/ad0s1a. i386 and pc98 are affected, while alpha
-	is not.
-
 	[8] In order to have a kernel that can run the 4.x binaries
 	needed to do an installworld, you must include the COMPAT_FREEBSD4
 	option in your kernel.  Failure to do so may leave you with a system
@@ -324,26 +292,16 @@
 	MAKEOBJDIRPREFIX must be defined in an environment variable, and
 	not on the command line, or in /etc/make.conf.  buildworld will
 	warn if it is improperly defined.
-
-	In case you would like to avoid installing new packages of everything,
-	you might want to uncomment the "COMPAT4X=	YES" entry, so that 4.x
-	compatibility libraries are built which should allow you to continue
-	using your existing software for a while.  Alternatively, you can
-	install the misc/compat4x port.
-
-	[10] In order to create temporary files, /dev/random must be
-	initialized by feeding data into it.  src/etc/rc.d/preseedrandom
-	takes care of this.
 FORMAT:
 
 This file contains a list, in reverse chronological order, of major
 breakages in tracking -current.  Not all things will be listed here,
-and it only starts on March 15, 2000.  Updating files can found in
+and it only starts on October 16, 2004.  Updating files can found in
 previous releases if your system is older than this.
 
 Copyright information:
 
-Copyright 1998-2004 M. Warner Losh.  All Rights Reserved.
+Copyright 1998-2005 M. Warner Losh.  All Rights Reserved.
 
 Redistribution, publication, translation and use, with or without
 modification, in full or in part, in any form or format of this
@@ -367,4 +325,4 @@
 Contact Warner Losh if you have any questions about your use of
 this document.
 
-$FreeBSD: src/UPDATING,v 1.397 2005/02/26 22:26:10 ru Exp $
+$FreeBSD: src/UPDATING,v 1.400 2005/03/03 08:44:33 imp Exp $

==== //depot/projects/hammer/bin/Makefile#4 (text+ko) ====

@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD: src/bin/Makefile,v 1.24 2004/01/16 15:23:18 ru Exp $
+# $FreeBSD: src/bin/Makefile,v 1.25 2005/03/02 11:53:21 trhodes Exp $
 
 SUBDIR= cat \
 	chflags \
@@ -37,7 +37,7 @@
 	sync \
 	test
 
-.if !defined(NO_RCMNDS)
+.if !defined(NO_RCMDS)
 _rcp=	rcp
 .endif
 

==== //depot/projects/hammer/bin/sh/parser.c#8 (text+ko) ====

@@ -36,7 +36,7 @@
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.51 2004/04/06 20:06:51 markm Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.52 2005/03/01 03:35:58 obrien Exp $");
 
 #include <stdlib.h>
 
@@ -63,7 +63,8 @@
  * Shell command parser.
  */
 
-#define EOFMARKLEN 79
+#define	EOFMARKLEN	79
+#define	PROMPTLEN	128
 
 /* values returned by readtoken */
 #include "token.h"
@@ -1562,14 +1563,100 @@
 char *
 getprompt(void *unused __unused)
 {
+	static char ps[PROMPTLEN];
+	char *fmt;
+	int i, j, trim;
+
+	/*
+	 * Select prompt format.
+	 */
 	switch (whichprompt) {
 	case 0:
-		return "";
+		fmt = "";
+		break;
 	case 1:
-		return ps1val();
+		fmt = ps1val();
+		break;
 	case 2:
-		return ps2val();
+		fmt = ps2val();
+		break;
 	default:
 		return "<internal prompt error>";
 	}
+
+	/*
+	 * Format prompt string.
+	 */
+	for (i = 0; (i < 127) && (*fmt != '\0'); i++, fmt++)
+		if (*fmt == '\\')
+			switch (*++fmt) {

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



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