PERFORCE change 100149 for review

Robert Watson rwatson at FreeBSD.org
Tue Jun 27 15:54:39 UTC 2006


http://perforce.freebsd.org/chv.cgi?CH=100149

Change 100149 by rwatson at rwatson_zoo on 2006/06/27 15:52:53

	Integrate trustedbsd base branch:
	
	- much mucking with make world
	- file update
	- sendmail update
	- traceroute icmp support
	- geli authentication
	- interface groups
	- enc, mxge, nfe
	- ng_tag
	- sched_core
	- snd_envy24
	- linux emulator updates, including more linux audit support
	- !COMPAT_43
	- ath hal update
	- xfs update
	- suser fixes 
	- kernel linker relocked, cleanup
	- sched_relinquish
	- tcp syncache cleanup + relock
	- loop back of audit locking fixes and cleanup, process tokens
	- conditional giant locking on audit log rotation
	- sbinsertoob removed, sodealloc hidden
	- usual plethora of bug fixes, driver updates, etc.

Affected files ...

.. //depot/projects/trustedbsd/base/Makefile#45 integrate
.. //depot/projects/trustedbsd/base/Makefile.inc1#73 integrate
.. //depot/projects/trustedbsd/base/README#6 integrate
.. //depot/projects/trustedbsd/base/bin/setfacl/setfacl.1#8 integrate
.. //depot/projects/trustedbsd/base/bin/setfacl/setfacl.c#8 integrate
.. //depot/projects/trustedbsd/base/bin/sh/cd.c#9 integrate
.. //depot/projects/trustedbsd/base/bin/sh/eval.c#16 integrate
.. //depot/projects/trustedbsd/base/bin/sh/sh.1#24 integrate
.. //depot/projects/trustedbsd/base/bin/sh/var.c#14 integrate
.. //depot/projects/trustedbsd/base/bin/sh/var.h#8 integrate
.. //depot/projects/trustedbsd/base/contrib/binutils/bfd/elf64-sparc.c#9 integrate
.. //depot/projects/trustedbsd/base/contrib/file/ChangeLog#3 integrate
.. //depot/projects/trustedbsd/base/contrib/file/FREEBSD-upgrade#3 integrate
.. //depot/projects/trustedbsd/base/contrib/file/Magdir/adventure#4 integrate
.. //depot/projects/trustedbsd/base/contrib/file/Magdir/amigaos#4 integrate
.. //depot/projects/trustedbsd/base/contrib/file/Magdir/animation#5 integrate
.. //depot/projects/trustedbsd/base/contrib/file/Magdir/apple#3 integrate
.. //depot/projects/trustedbsd/base/contrib/file/Magdir/archive#6 integrate
.. //depot/projects/trustedbsd/base/contrib/file/Magdir/audio#6 integrate
.. //depot/projects/trustedbsd/base/contrib/file/Magdir/basis#1 branch
.. //depot/projects/trustedbsd/base/contrib/file/Magdir/bflt#1 branch
.. //depot/projects/trustedbsd/base/contrib/file/Magdir/bout#2 integrate
.. //depot/projects/trustedbsd/base/contrib/file/Magdir/btsnoop#1 branch
.. //depot/projects/trustedbsd/base/contrib/file/Magdir/c64#2 integrate
.. //depot/projects/trustedbsd/base/contrib/file/Magdir/cad#2 integrate
.. //depot/projects/trustedbsd/base/contrib/file/Magdir/commands#4 integrate
.. //depot/projects/trustedbsd/base/contrib/file/Magdir/compress#5 integrate
.. //depot/projects/trustedbsd/base/contrib/file/Magdir/console#4 integrate
.. //depot/projects/trustedbsd/base/contrib/file/Magdir/cracklib#1 branch
.. //depot/projects/trustedbsd/base/contrib/file/Magdir/ctags#3 integrate
.. //depot/projects/trustedbsd/base/contrib/file/Magdir/database#4 integrate
.. //depot/projects/trustedbsd/base/contrib/file/Magdir/diff#3 integrate
.. //depot/projects/trustedbsd/base/contrib/file/Magdir/digital#2 integrate
.. //depot/projects/trustedbsd/base/contrib/file/Magdir/dump#2 integrate
.. //depot/projects/trustedbsd/base/contrib/file/Magdir/elf#6 integrate
.. //depot/projects/trustedbsd/base/contrib/file/Magdir/filesystems#7 integrate
.. //depot/projects/trustedbsd/base/contrib/file/Magdir/flash#4 integrate
.. //depot/projects/trustedbsd/base/contrib/file/Magdir/fsav#2 integrate
.. //depot/projects/trustedbsd/base/contrib/file/Magdir/gnu#3 integrate
.. //depot/projects/trustedbsd/base/contrib/file/Magdir/iff#3 integrate
.. //depot/projects/trustedbsd/base/contrib/file/Magdir/images#5 integrate
.. //depot/projects/trustedbsd/base/contrib/file/Magdir/java#2 integrate
.. //depot/projects/trustedbsd/base/contrib/file/Magdir/linux#5 integrate
.. //depot/projects/trustedbsd/base/contrib/file/Magdir/lisp#4 integrate
.. //depot/projects/trustedbsd/base/contrib/file/Magdir/mach#3 integrate
.. //depot/projects/trustedbsd/base/contrib/file/Magdir/macintosh#4 integrate
.. //depot/projects/trustedbsd/base/contrib/file/Magdir/mail.news#3 integrate
.. //depot/projects/trustedbsd/base/contrib/file/Magdir/maple#3 integrate
.. //depot/projects/trustedbsd/base/contrib/file/Magdir/misctools#2 integrate
.. //depot/projects/trustedbsd/base/contrib/file/Magdir/msdos#5 integrate
.. //depot/projects/trustedbsd/base/contrib/file/Magdir/mup#1 branch
.. //depot/projects/trustedbsd/base/contrib/file/Magdir/ncr#2 integrate
.. //depot/projects/trustedbsd/base/contrib/file/Magdir/perl#4 integrate
.. //depot/projects/trustedbsd/base/contrib/file/Magdir/printer#4 integrate
.. //depot/projects/trustedbsd/base/contrib/file/Magdir/psion#2 integrate
.. //depot/projects/trustedbsd/base/contrib/file/Magdir/python#4 integrate
.. //depot/projects/trustedbsd/base/contrib/file/Magdir/riff#3 integrate
.. //depot/projects/trustedbsd/base/contrib/file/Magdir/scientific#1 branch
.. //depot/projects/trustedbsd/base/contrib/file/Magdir/sgi#3 integrate
.. //depot/projects/trustedbsd/base/contrib/file/Magdir/sharc#2 integrate
.. //depot/projects/trustedbsd/base/contrib/file/Magdir/sql#2 integrate
.. //depot/projects/trustedbsd/base/contrib/file/Magdir/varied.out#4 integrate
.. //depot/projects/trustedbsd/base/contrib/file/Magdir/wordprocessors#2 integrate
.. //depot/projects/trustedbsd/base/contrib/file/Makefile.am#7 integrate
.. //depot/projects/trustedbsd/base/contrib/file/Makefile.in#7 integrate
.. //depot/projects/trustedbsd/base/contrib/file/aclocal.m4#6 integrate
.. //depot/projects/trustedbsd/base/contrib/file/apprentice.c#6 integrate
.. //depot/projects/trustedbsd/base/contrib/file/ascmagic.c#6 integrate
.. //depot/projects/trustedbsd/base/contrib/file/compress.c#5 integrate
.. //depot/projects/trustedbsd/base/contrib/file/config.h.in#7 integrate
.. //depot/projects/trustedbsd/base/contrib/file/configure#7 integrate
.. //depot/projects/trustedbsd/base/contrib/file/configure.in#7 integrate
.. //depot/projects/trustedbsd/base/contrib/file/file.c#7 integrate
.. //depot/projects/trustedbsd/base/contrib/file/file.h#6 integrate
.. //depot/projects/trustedbsd/base/contrib/file/file.man#6 integrate
.. //depot/projects/trustedbsd/base/contrib/file/fsmagic.c#5 integrate
.. //depot/projects/trustedbsd/base/contrib/file/funcs.c#3 integrate
.. //depot/projects/trustedbsd/base/contrib/file/libmagic.man#2 integrate
.. //depot/projects/trustedbsd/base/contrib/file/magic.c#3 integrate
.. //depot/projects/trustedbsd/base/contrib/file/magic.man#6 integrate
.. //depot/projects/trustedbsd/base/contrib/file/magic.mime#6 integrate
.. //depot/projects/trustedbsd/base/contrib/file/magic2mime#3 integrate
.. //depot/projects/trustedbsd/base/contrib/file/patchlevel.h#7 integrate
.. //depot/projects/trustedbsd/base/contrib/file/print.c#6 integrate
.. //depot/projects/trustedbsd/base/contrib/file/readelf.c#7 integrate
.. //depot/projects/trustedbsd/base/contrib/file/readelf.h#5 integrate
.. //depot/projects/trustedbsd/base/contrib/file/softmagic.c#7 integrate
.. //depot/projects/trustedbsd/base/contrib/pf/man/pfsync.4#9 integrate
.. //depot/projects/trustedbsd/base/contrib/sendmail/FREEBSD-upgrade#20 integrate
.. //depot/projects/trustedbsd/base/contrib/sendmail/PGPKEYS#10 integrate
.. //depot/projects/trustedbsd/base/contrib/sendmail/RELEASE_NOTES#17 integrate
.. //depot/projects/trustedbsd/base/contrib/sendmail/cf/README#16 integrate
.. //depot/projects/trustedbsd/base/contrib/sendmail/cf/cf/submit.cf#16 integrate
.. //depot/projects/trustedbsd/base/contrib/sendmail/cf/cf/submit.mc#8 integrate
.. //depot/projects/trustedbsd/base/contrib/sendmail/cf/feature/dnsbl.m4#7 integrate
.. //depot/projects/trustedbsd/base/contrib/sendmail/cf/feature/enhdnsbl.m4#5 integrate
.. //depot/projects/trustedbsd/base/contrib/sendmail/cf/m4/proto.m4#15 integrate
.. //depot/projects/trustedbsd/base/contrib/sendmail/cf/m4/version.m4#17 integrate
.. //depot/projects/trustedbsd/base/contrib/sendmail/include/libmilter/mfapi.h#11 integrate
.. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/xxfi_header.html#4 integrate
.. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/engine.c#12 integrate
.. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/t-memstat.c#2 integrate
.. //depot/projects/trustedbsd/base/contrib/sendmail/src/README#16 integrate
.. //depot/projects/trustedbsd/base/contrib/sendmail/src/bf.c#9 integrate
.. //depot/projects/trustedbsd/base/contrib/sendmail/src/collect.c#14 integrate
.. //depot/projects/trustedbsd/base/contrib/sendmail/src/conf.c#18 integrate
.. //depot/projects/trustedbsd/base/contrib/sendmail/src/daemon.c#15 integrate
.. //depot/projects/trustedbsd/base/contrib/sendmail/src/deliver.c#17 integrate
.. //depot/projects/trustedbsd/base/contrib/sendmail/src/domain.c#12 integrate
.. //depot/projects/trustedbsd/base/contrib/sendmail/src/envelope.c#10 integrate
.. //depot/projects/trustedbsd/base/contrib/sendmail/src/headers.c#13 integrate
.. //depot/projects/trustedbsd/base/contrib/sendmail/src/helpfile#8 integrate
.. //depot/projects/trustedbsd/base/contrib/sendmail/src/main.c#15 integrate
.. //depot/projects/trustedbsd/base/contrib/sendmail/src/map.c#14 integrate
.. //depot/projects/trustedbsd/base/contrib/sendmail/src/mci.c#14 integrate
.. //depot/projects/trustedbsd/base/contrib/sendmail/src/mime.c#11 integrate
.. //depot/projects/trustedbsd/base/contrib/sendmail/src/parseaddr.c#16 integrate
.. //depot/projects/trustedbsd/base/contrib/sendmail/src/queue.c#17 integrate
.. //depot/projects/trustedbsd/base/contrib/sendmail/src/savemail.c#11 integrate
.. //depot/projects/trustedbsd/base/contrib/sendmail/src/sendmail.h#17 integrate
.. //depot/projects/trustedbsd/base/contrib/sendmail/src/sfsasl.c#13 integrate
.. //depot/projects/trustedbsd/base/contrib/sendmail/src/sfsasl.h#6 integrate
.. //depot/projects/trustedbsd/base/contrib/sendmail/src/srvrsmtp.c#17 integrate
.. //depot/projects/trustedbsd/base/contrib/sendmail/src/tls.c#13 integrate
.. //depot/projects/trustedbsd/base/contrib/sendmail/src/util.c#13 integrate
.. //depot/projects/trustedbsd/base/contrib/sendmail/src/version.c#17 integrate
.. //depot/projects/trustedbsd/base/contrib/tcpdump/tcpdump.1#8 integrate
.. //depot/projects/trustedbsd/base/contrib/traceroute/traceroute.8#7 integrate
.. //depot/projects/trustedbsd/base/contrib/traceroute/traceroute.c#11 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/config.h#12 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/loginrec.c#14 integrate
.. //depot/projects/trustedbsd/base/etc/defaults/rc.conf#55 integrate
.. //depot/projects/trustedbsd/base/etc/periodic/daily/470.status-named#7 integrate
.. //depot/projects/trustedbsd/base/etc/rc.d/abi#7 integrate
.. //depot/projects/trustedbsd/base/etc/rc.d/auditd#2 integrate
.. //depot/projects/trustedbsd/base/etc/rc.d/cached#2 integrate
.. //depot/projects/trustedbsd/base/etc/rc.d/ldconfig#13 integrate
.. //depot/projects/trustedbsd/base/etc/rc.subr#27 integrate
.. //depot/projects/trustedbsd/base/etc/sendmail/freebsd.mc#11 integrate
.. //depot/projects/trustedbsd/base/etc/sendmail/freebsd.submit.mc#3 integrate
.. //depot/projects/trustedbsd/base/games/fortune/datfiles/fortunes#51 integrate
.. //depot/projects/trustedbsd/base/gnu/lib/libgcc_r/Makefile#2 delete
.. //depot/projects/trustedbsd/base/lib/libc/gen/glob.c#8 integrate
.. //depot/projects/trustedbsd/base/lib/libc/stdlib/malloc.c#27 integrate
.. //depot/projects/trustedbsd/base/lib/libc/stdlib/tsearch.3#8 integrate
.. //depot/projects/trustedbsd/base/lib/libc/string/strlcpy.c#6 integrate
.. //depot/projects/trustedbsd/base/lib/libc/sys/mincore.2#9 integrate
.. //depot/projects/trustedbsd/base/lib/libc/sys/stat.2#12 integrate
.. //depot/projects/trustedbsd/base/lib/libfetch/ftp.c#19 integrate
.. //depot/projects/trustedbsd/base/lib/libmagic/Makefile#6 integrate
.. //depot/projects/trustedbsd/base/lib/libmagic/config.h#3 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_private.h#27 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_sig.c#20 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_sigaction.c#8 integrate
.. //depot/projects/trustedbsd/base/lib/libsdp/sdp.h#5 integrate
.. //depot/projects/trustedbsd/base/lib/libsdp/util.c#7 integrate
.. //depot/projects/trustedbsd/base/lib/libutil/Makefile#15 integrate
.. //depot/projects/trustedbsd/base/lib/libutil/login_class.3#6 integrate
.. //depot/projects/trustedbsd/base/lib/libutil/pidfile.c#3 integrate
.. //depot/projects/trustedbsd/base/libexec/ftpd/Makefile#13 integrate
.. //depot/projects/trustedbsd/base/libexec/ftpd/ftpcmd.y#22 integrate
.. //depot/projects/trustedbsd/base/release/Makefile#76 integrate
.. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#68 integrate
.. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/hardware/sparc64/proc-sparc64.sgml#7 integrate
.. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#102 integrate
.. //depot/projects/trustedbsd/base/release/doc/share/misc/dev.archlist.txt#14 integrate
.. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/hardware/common/dev.sgml#9 integrate
.. //depot/projects/trustedbsd/base/sbin/devfs/devfs.c#5 integrate
.. //depot/projects/trustedbsd/base/sbin/fdisk/fdisk.c#25 integrate
.. //depot/projects/trustedbsd/base/sbin/ffsinfo/ffsinfo.8#10 integrate
.. //depot/projects/trustedbsd/base/sbin/geom/class/eli/geli.8#6 integrate
.. //depot/projects/trustedbsd/base/sbin/geom/class/eli/geom_eli.c#7 integrate
.. //depot/projects/trustedbsd/base/sbin/ggate/ggatec/ggatec.8#8 integrate
.. //depot/projects/trustedbsd/base/sbin/gpt/add.c#11 integrate
.. //depot/projects/trustedbsd/base/sbin/gpt/gpt.8#12 integrate
.. //depot/projects/trustedbsd/base/sbin/gpt/gpt.c#11 integrate
.. //depot/projects/trustedbsd/base/sbin/gpt/gpt.h#9 integrate
.. //depot/projects/trustedbsd/base/sbin/gpt/label.c#2 integrate
.. //depot/projects/trustedbsd/base/sbin/gpt/remove.c#5 integrate
.. //depot/projects/trustedbsd/base/sbin/gpt/show.c#11 integrate
.. //depot/projects/trustedbsd/base/sbin/ifconfig/Makefile#11 integrate
.. //depot/projects/trustedbsd/base/sbin/ifconfig/ifconfig.8#39 integrate
.. //depot/projects/trustedbsd/base/sbin/ifconfig/ifgroup.c#1 branch
.. //depot/projects/trustedbsd/base/sbin/ifconfig/ifieee80211.c#19 integrate
.. //depot/projects/trustedbsd/base/sbin/ifconfig/ifpfsync.c#3 integrate
.. //depot/projects/trustedbsd/base/sbin/init/init.c#13 integrate
.. //depot/projects/trustedbsd/base/sbin/ipfw/ipfw.8#46 integrate
.. //depot/projects/trustedbsd/base/sbin/ipfw/ipfw2.c#40 integrate
.. //depot/projects/trustedbsd/base/sbin/mount/mount.c#23 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/Makefile#68 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/aac.4#12 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/acpi.4#26 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/adv.4#4 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/adw.4#4 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/altq.4#11 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/amd.4#3 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/amr.4#12 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/auditpipe.4#2 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/bge.4#17 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/bt.4#5 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/carp.4#6 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/cpufreq.4#8 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/dpt.4#8 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/enc.4#1 branch
.. //depot/projects/trustedbsd/base/share/man/man4/esp.4#4 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/fast_ipsec.4#4 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/geom_fox.4#2 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/if_bridge.4#7 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/iir.4#8 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/ips.4#4 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/man4.alpha/Makefile#2 delete
.. //depot/projects/trustedbsd/base/share/man/man4/man4.alpha/linux.4#4 delete
.. //depot/projects/trustedbsd/base/share/man/man4/man4.alpha/osf1.4#4 delete
.. //depot/projects/trustedbsd/base/share/man/man4/man4.i386/linux.4#5 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/man4.i386/padlock.4#3 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/mpt.4#7 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/mxge.4#1 branch
.. //depot/projects/trustedbsd/base/share/man/man4/myri10ge.4#2 delete
.. //depot/projects/trustedbsd/base/share/man/man4/ncr.4#4 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/ncv.4#5 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/nfe.4#1 branch
.. //depot/projects/trustedbsd/base/share/man/man4/ng_tag.4#1 branch
.. //depot/projects/trustedbsd/base/share/man/man4/nsp.4#5 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/re.4#11 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/sched_4bsd.4#3 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/sched_core.4#1 branch
.. //depot/projects/trustedbsd/base/share/man/man4/sched_ule.4#3 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/snd_csa.4#6 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/snd_envy24.4#1 branch
.. //depot/projects/trustedbsd/base/share/man/man4/snd_gusc.4#5 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/snd_ich.4#4 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/snd_sbc.4#6 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/stg.4#6 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/sym.4#7 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/umodem.4#6 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/uscanner.4#11 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/uvisor.4#7 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/vinum.4#14 integrate
.. //depot/projects/trustedbsd/base/share/man/man5/mailer.conf.5#4 integrate
.. //depot/projects/trustedbsd/base/share/man/man7/build.7#13 integrate
.. //depot/projects/trustedbsd/base/share/man/man8/rc.subr.8#9 integrate
.. //depot/projects/trustedbsd/base/share/man/man9/lock.9#8 integrate
.. //depot/projects/trustedbsd/base/share/man/man9/vflush.9#6 integrate
.. //depot/projects/trustedbsd/base/share/man/man9/vgone.9#5 integrate
.. //depot/projects/trustedbsd/base/share/mk/bsd.README#12 integrate
.. //depot/projects/trustedbsd/base/share/monetdef/pt_PT.ISO8859-1.src#3 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/amd64/fpu.c#11 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/amd64/initcpu.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/amd64/machdep.c#26 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/amd64/pmap.c#29 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/amd64/trap.c#26 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/conf/DEFAULTS#4 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/conf/GENERIC#23 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/conf/NOTES#15 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/include/md_var.h#12 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_dummy.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_proto.h#9 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_syscall.h#9 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_sysent.c#9 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/linux32/syscalls.master#9 integrate
.. //depot/projects/trustedbsd/base/sys/arm/arm/elf_trampoline.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/arm/arm/inckern.S#3 integrate
.. //depot/projects/trustedbsd/base/sys/arm/arm/locore.S#8 integrate
.. //depot/projects/trustedbsd/base/sys/arm/arm/pmap.c#15 integrate
.. //depot/projects/trustedbsd/base/sys/arm/arm/vm_machdep.c#14 integrate
.. //depot/projects/trustedbsd/base/sys/arm/at91/at91_pmc.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/arm/at91/at91rm92reg.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/arm/at91/files.at91#4 integrate
.. //depot/projects/trustedbsd/base/sys/arm/at91/if_ate.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/arm/at91/kb920x_machdep.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/arm/conf/IQ31244#7 integrate
.. //depot/projects/trustedbsd/base/sys/arm/conf/KB920X#4 integrate
.. //depot/projects/trustedbsd/base/sys/arm/conf/SIMICS#8 integrate
.. //depot/projects/trustedbsd/base/sys/arm/conf/SKYEYE#4 integrate
.. //depot/projects/trustedbsd/base/sys/arm/include/pmap.h#13 integrate
.. //depot/projects/trustedbsd/base/sys/arm/sa11x0/assabet_machdep.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/arm/sa11x0/uart_cpu_sa1110.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/arm/sa11x0/uart_dev_sa1110.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/arm/xscale/i80321/iq31244_machdep.c#10 integrate
.. //depot/projects/trustedbsd/base/sys/boot/Makefile#16 integrate
.. //depot/projects/trustedbsd/base/sys/cam/cam_ccb.h#9 integrate
.. //depot/projects/trustedbsd/base/sys/cam/cam_xpt.c#26 integrate
.. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_misc.c#21 integrate
.. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_proto.h#19 integrate
.. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_syscall.h#19 integrate
.. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_syscalls.c#19 integrate
.. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_sysent.c#19 integrate
.. //depot/projects/trustedbsd/base/sys/compat/freebsd32/syscalls.master#19 integrate
.. //depot/projects/trustedbsd/base/sys/compat/linprocfs/linprocfs.c#33 integrate
.. //depot/projects/trustedbsd/base/sys/compat/linux/linux_misc.c#41 integrate
.. //depot/projects/trustedbsd/base/sys/compat/ndis/kern_ndis.c#14 integrate
.. //depot/projects/trustedbsd/base/sys/compat/ndis/subr_ndis.c#14 integrate
.. //depot/projects/trustedbsd/base/sys/compat/ndis/winx32_wrap.S#3 integrate
.. //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_misc.c#30 integrate
.. //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_proto.h#8 integrate
.. //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_syscall.h#7 integrate
.. //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_syscallnames.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_sysent.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/compat/svr4/syscalls.master#7 integrate
.. //depot/projects/trustedbsd/base/sys/conf/Makefile.arm#11 integrate
.. //depot/projects/trustedbsd/base/sys/conf/NOTES#73 integrate
.. //depot/projects/trustedbsd/base/sys/conf/files#101 integrate
.. //depot/projects/trustedbsd/base/sys/conf/files.amd64#29 integrate
.. //depot/projects/trustedbsd/base/sys/conf/files.arm#6 integrate
.. //depot/projects/trustedbsd/base/sys/conf/files.i386#63 integrate
.. //depot/projects/trustedbsd/base/sys/conf/files.powerpc#22 integrate
.. //depot/projects/trustedbsd/base/sys/conf/kern.post.mk#48 integrate
.. //depot/projects/trustedbsd/base/sys/conf/options#72 integrate
.. //depot/projects/trustedbsd/base/sys/conf/options.arm#9 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/COPYRIGHT#4 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/README#5 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/ah.h#8 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/ah_desc.h#4 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/ah_devid.h#5 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/ah_soc.h#1 branch
.. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/freebsd/ah_if.m#4 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/freebsd/ah_osdep.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/freebsd/ah_osdep.h#6 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/alpha-elf.hal.o.uu#2 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/ap30.hal.o.uu#1 branch
.. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/ap30.inc#1 branch
.. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/ap30.opt_ah.h#1 branch
.. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/ap43.hal.o.uu#1 branch
.. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/ap43.inc#1 branch
.. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/ap43.opt_ah.h#1 branch
.. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/ap51.hal.o.uu#1 branch
.. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/ap51.inc#1 branch
.. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/ap51.opt_ah.h#1 branch
.. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/ap61.hal.o.uu#1 branch
.. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/ap61.inc#1 branch
.. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/ap61.opt_ah.h#1 branch
.. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/arm9-le-thumb-elf.hal.o.uu#3 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/arm9-le-thumb-elf.inc#3 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/armv4-be-elf.hal.o.uu#3 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/armv4-be-elf.inc#3 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/armv4-be-elf.opt_ah.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/armv4-le-elf.hal.o.uu#3 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/armv4-le-elf.inc#3 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/armv4-le-elf.opt_ah.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/i386-elf.hal.o.uu#3 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/i386-elf.inc#3 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/mips-be-elf.hal.o.uu#3 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/mips-be-elf.inc#3 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/mips-be-elf.opt_ah.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/mips-le-elf.hal.o.uu#3 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/mips-le-elf.inc#3 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/mips-le-elf.opt_ah.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/mips1-be-elf.hal.o.uu#3 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/mips1-be-elf.inc#3 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/mips1-be-elf.opt_ah.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/mips1-le-elf.hal.o.uu#3 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/mips1-le-elf.inc#3 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/mips1-le-elf.opt_ah.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#3 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/mipsisa32-be-elf.inc#3 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/mipsisa32-be-elf.opt_ah.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/mipsisa32-le-elf.hal.o.uu#3 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/mipsisa32-le-elf.inc#3 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/mipsisa32-le-elf.opt_ah.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/powerpc-be-eabi.hal.o.uu#3 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/powerpc-be-eabi.inc#3 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/powerpc-be-eabi.opt_ah.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/powerpc-be-elf.hal.o.uu#2 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/powerpc-be-elf.inc#2 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/powerpc-be-elf.opt_ah.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/powerpc-le-eabi.hal.o.uu#3 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/powerpc-le-eabi.inc#3 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/powerpc-le-eabi.opt_ah.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/sh4-le-elf.hal.o.uu#3 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/sh4-le-elf.inc#3 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/sparc-be-elf.hal.o.uu#1 branch
.. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/sparc-be-elf.inc#1 branch
.. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/sparc-be-elf.opt_ah.h#1 branch
.. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/sparc64-be-elf.hal.o.uu#2 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/sparc64-be-elf.inc#2 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/x86_64-elf.hal.o.uu#3 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/x86_64-elf.inc#3 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/xscale-be-elf.hal.o.uu#3 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/xscale-be-elf.inc#3 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/xscale-be-elf.opt_ah.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/xscale-le-elf.hal.o.uu#3 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/xscale-le-elf.inc#3 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/public/xscale-le-elf.opt_ah.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/ath/version.h#8 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/pf/net/if_pfsync.c#14 integrate
.. //depot/projects/trustedbsd/base/sys/crypto/via/padlock.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/ddb/db_sym.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/dev/aac/aac_pci.c#31 integrate
.. //depot/projects/trustedbsd/base/sys/dev/acpi_support/acpi_panasonic.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi.c#49 integrate
.. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_battery.c#14 integrate
.. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_dock.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_thermal.c#22 integrate
.. //depot/projects/trustedbsd/base/sys/dev/acpica/acpivar.h#36 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ata/ata-chipset.c#36 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ath/if_ath.c#27 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ath/if_ath_pci.c#12 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ath/if_athioctl.h#12 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ath/if_athvar.h#19 integrate
.. //depot/projects/trustedbsd/base/sys/dev/atkbdc/atkbdc_isa.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/dev/bce/if_bce.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/dev/bge/if_bge.c#54 integrate
.. //depot/projects/trustedbsd/base/sys/dev/bge/if_bgereg.h#32 integrate
.. //depot/projects/trustedbsd/base/sys/dev/cardbus/cardbus.c#24 integrate
.. //depot/projects/trustedbsd/base/sys/dev/cardbus/cardbus_cis.c#24 integrate
.. //depot/projects/trustedbsd/base/sys/dev/cm/if_cm_isa.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/dev/cm/smc90cx6.c#13 integrate
.. //depot/projects/trustedbsd/base/sys/dev/cm/smc90cx6reg.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/dev/cm/smc90cx6var.h#5 integrate
.. //depot/projects/trustedbsd/base/sys/dev/dc/if_dc.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/dev/dc/if_dcreg.h#5 integrate
.. //depot/projects/trustedbsd/base/sys/dev/digi/digi.c#20 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ed/if_ed.c#29 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ed/if_ed_novell.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ed/if_edvar.h#11 integrate
.. //depot/projects/trustedbsd/base/sys/dev/em/if_em.c#52 integrate
.. //depot/projects/trustedbsd/base/sys/dev/firewire/fwohci_pci.c#28 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ipw/if_ipw.c#10 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ipw/if_ipwvar.h#4 integrate
.. //depot/projects/trustedbsd/base/sys/dev/mfi/mfi.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/dev/mfi/mfi_disk.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/dev/mfi/mfi_pci.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/dev/mfi/mfireg.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/dev/mfi/mfivar.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/dev/mii/rgephy.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt.c#18 integrate
.. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt.h#13 integrate
.. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt_cam.c#9 integrate
.. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt_pci.c#21 integrate
.. //depot/projects/trustedbsd/base/sys/dev/mxge/eth_z8e.dat.gz.uu#1 branch
.. //depot/projects/trustedbsd/base/sys/dev/mxge/ethp_z8e.dat.gz.uu#1 branch
.. //depot/projects/trustedbsd/base/sys/dev/mxge/if_mxge.c#1 branch
.. //depot/projects/trustedbsd/base/sys/dev/mxge/if_mxge_var.h#1 branch
.. //depot/projects/trustedbsd/base/sys/dev/mxge/mcp_gen_header.h#1 branch
.. //depot/projects/trustedbsd/base/sys/dev/mxge/mxge_mcp.h#1 branch
.. //depot/projects/trustedbsd/base/sys/dev/my/if_my.c#24 integrate
.. //depot/projects/trustedbsd/base/sys/dev/myri10ge/eth_z8e.dat.gz.uu#2 delete
.. //depot/projects/trustedbsd/base/sys/dev/myri10ge/ethp_z8e.dat.gz.uu#2 delete
.. //depot/projects/trustedbsd/base/sys/dev/myri10ge/if_myri10ge.c#3 delete
.. //depot/projects/trustedbsd/base/sys/dev/myri10ge/if_myri10ge_var.h#2 delete
.. //depot/projects/trustedbsd/base/sys/dev/myri10ge/mcp_gen_header.h#2 delete
.. //depot/projects/trustedbsd/base/sys/dev/myri10ge/myri10ge_mcp.h#2 delete
.. //depot/projects/trustedbsd/base/sys/dev/nfe/if_nfe.c#1 branch
.. //depot/projects/trustedbsd/base/sys/dev/nfe/if_nfereg.h#1 branch
.. //depot/projects/trustedbsd/base/sys/dev/nfe/if_nfevar.h#1 branch
.. //depot/projects/trustedbsd/base/sys/dev/puc/pucdata.c#27 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ral/rt2661.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/dev/re/if_re.c#23 integrate
.. //depot/projects/trustedbsd/base/sys/dev/sk/if_sk.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/dev/sound/driver.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/dev/sound/midi/midi.c#10 integrate
.. //depot/projects/trustedbsd/base/sys/dev/sound/midi/sequencer.c#11 integrate
.. //depot/projects/trustedbsd/base/sys/dev/sound/pci/ak452x.c#1 branch
.. //depot/projects/trustedbsd/base/sys/dev/sound/pci/ak452x.h#1 branch
.. //depot/projects/trustedbsd/base/sys/dev/sound/pci/cmi.c#20 integrate
.. //depot/projects/trustedbsd/base/sys/dev/sound/pci/envy24.c#1 branch
.. //depot/projects/trustedbsd/base/sys/dev/sound/pci/envy24.h#1 branch
.. //depot/projects/trustedbsd/base/sys/dev/sound/pci/es137x.c#16 integrate
.. //depot/projects/trustedbsd/base/sys/dev/sound/pci/ich.c#33 integrate
.. //depot/projects/trustedbsd/base/sys/dev/sound/pci/maestro.c#14 integrate
.. //depot/projects/trustedbsd/base/sys/dev/sound/pci/via8233.c#18 integrate
.. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/feeder_rate.c#11 integrate
.. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/sound.c#24 integrate
.. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/vchan.c#15 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ubsec/ubsec.c#20 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/uhid.c#22 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/umodem.c#16 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/uplcom.c#19 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/usbdevs#52 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/uscanner.c#24 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/uvisor.c#18 integrate
.. //depot/projects/trustedbsd/base/sys/dev/wi/if_wi.c#55 integrate
.. //depot/projects/trustedbsd/base/sys/dev/wl/if_wl.c#23 integrate
.. //depot/projects/trustedbsd/base/sys/fs/procfs/procfs.c#12 integrate
.. //depot/projects/trustedbsd/base/sys/fs/udf/udf_vfsops.c#25 integrate
.. //depot/projects/trustedbsd/base/sys/geom/eli/g_eli.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/geom/eli/g_eli.h#5 integrate
.. //depot/projects/trustedbsd/base/sys/geom/eli/g_eli_ctl.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/geom/eli/g_eli_integrity.c#1 branch
.. //depot/projects/trustedbsd/base/sys/geom/eli/g_eli_key.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/geom/eli/g_eli_privacy.c#1 branch
.. //depot/projects/trustedbsd/base/sys/geom/geom.h#40 integrate
.. //depot/projects/trustedbsd/base/sys/geom/geom_dev.c#40 integrate
.. //depot/projects/trustedbsd/base/sys/geom/geom_gpt.c#25 integrate
.. //depot/projects/trustedbsd/base/sys/geom/geom_io.c#31 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/support/atomic.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/support/debug.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/support/kmem.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/support/ktrace.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/support/rwlock.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/support/spin.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/support/sv.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/xfs_buf.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/xfs_buf.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/xfs_compat.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/xfs_dmistubs.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/xfs_freebsd.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/xfs_freebsd_iget.c#1 branch
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/xfs_frw.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/xfs_frw.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/xfs_globals.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/xfs_iget.c#3 delete
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/xfs_ioctl.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/xfs_iops.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/xfs_super.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/xfs_super.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/xfs_sysctl.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/xfs_vfs.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/xfs_vfs.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_acl.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_acl.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_ag.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_alloc.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_alloc.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_alloc_btree.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_alloc_btree.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_arch.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_attr.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_attr.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_attr_leaf.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_attr_leaf.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_attr_sf.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_behavior.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_behavior.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_bit.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_bit.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_bmap.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_bmap.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_bmap_btree.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_bmap_btree.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_btree.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_btree.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_buf_item.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_buf_item.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_cap.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_clnt.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_da_btree.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_da_btree.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_dfrag.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_dfrag.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_dinode.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_dir.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_dir.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_dir2.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_dir2.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_dir2_block.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_dir2_block.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_dir2_data.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_dir2_data.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_dir2_leaf.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_dir2_leaf.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_dir2_node.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_dir2_node.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_dir2_sf.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_dir2_sf.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_dir2_trace.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_dir2_trace.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_dir_leaf.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_dir_leaf.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_dir_sf.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_dmapi.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_dmops.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_error.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_error.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_extfree_item.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_extfree_item.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_fs.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_fsops.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_fsops.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_ialloc.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_ialloc.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_ialloc_btree.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_ialloc_btree.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_iget.c#1 branch
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_imap.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_inode.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_inode.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_inode_item.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_inode_item.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_inum.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_iocore.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_iomap.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_iomap.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_itable.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_itable.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_log.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_log.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_log_priv.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_log_recover.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_log_recover.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_mac.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_macros.c#2 delete
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_macros.h#2 delete
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_mount.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_mount.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_qmops.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_quota.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_refcache.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_refcache.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_rename.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_rtalloc.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_rtalloc.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_rw.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_rw.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_sb.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_trans.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_trans.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_trans_ail.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_trans_buf.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_trans_extfree.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_trans_inode.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_trans_item.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_trans_priv.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_trans_space.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_types.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_utils.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_utils.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_vfsops.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfs_vnodeops.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/xfsidbg.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/i386/acpica/acpi_machdep.c#21 integrate
.. //depot/projects/trustedbsd/base/sys/i386/acpica/acpi_wakecode.S#7 integrate
.. //depot/projects/trustedbsd/base/sys/i386/acpica/acpi_wakeup.c#26 integrate
.. //depot/projects/trustedbsd/base/sys/i386/conf/DEFAULTS#4 integrate
.. //depot/projects/trustedbsd/base/sys/i386/conf/GENERIC#55 integrate
.. //depot/projects/trustedbsd/base/sys/i386/conf/NOTES#67 integrate
.. //depot/projects/trustedbsd/base/sys/i386/conf/XBOX#5 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/db_trace.c#20 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/identcpu.c#38 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/minidump_machdep.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/pmap.c#64 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/trap.c#48 integrate
.. //depot/projects/trustedbsd/base/sys/i386/include/specialreg.h#12 integrate
.. //depot/projects/trustedbsd/base/sys/i386/linux/linux_dummy.c#10 integrate
.. //depot/projects/trustedbsd/base/sys/i386/linux/linux_proto.h#21 integrate
.. //depot/projects/trustedbsd/base/sys/i386/linux/linux_syscall.h#21 integrate
.. //depot/projects/trustedbsd/base/sys/i386/linux/linux_sysent.c#22 integrate
.. //depot/projects/trustedbsd/base/sys/i386/linux/syscalls.master#20 integrate
.. //depot/projects/trustedbsd/base/sys/ia64/conf/DEFAULTS#3 integrate
.. //depot/projects/trustedbsd/base/sys/ia64/conf/GENERIC#37 integrate
.. //depot/projects/trustedbsd/base/sys/ia64/conf/SKI#19 integrate
.. //depot/projects/trustedbsd/base/sys/ia64/disasm/disasm.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/ia64/disasm/disasm_decode.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/ia64/disasm/disasm_extract.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/ia64/disasm/disasm_format.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/ia64/disasm/disasm_int.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/ia64/ia64/machdep.c#60 integrate
.. //depot/projects/trustedbsd/base/sys/ia64/ia64/pmap.c#52 integrate
.. //depot/projects/trustedbsd/base/sys/isa/isa_common.c#15 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_clock.c#34 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_descrip.c#64 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_event.c#40 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_fork.c#54 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_ktrace.c#30 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_linker.c#31 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_mbuf.c#13 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_module.c#13 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_switch.c#38 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_synch.c#49 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_sysctl.c#33 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_tc.c#31 integrate
.. //depot/projects/trustedbsd/base/sys/kern/link_elf.c#23 integrate
.. //depot/projects/trustedbsd/base/sys/kern/link_elf_obj.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/kern/sched_4bsd.c#25 integrate
.. //depot/projects/trustedbsd/base/sys/kern/sched_core.c#1 branch
.. //depot/projects/trustedbsd/base/sys/kern/sched_ule.c#29 integrate
.. //depot/projects/trustedbsd/base/sys/kern/subr_bus.c#41 integrate
.. //depot/projects/trustedbsd/base/sys/kern/subr_firmware.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/kern/subr_kdb.c#9 integrate
.. //depot/projects/trustedbsd/base/sys/kern/subr_rman.c#22 integrate
.. //depot/projects/trustedbsd/base/sys/kern/sys_pipe.c#48 integrate
.. //depot/projects/trustedbsd/base/sys/kern/sysv_msg.c#17 integrate
.. //depot/projects/trustedbsd/base/sys/kern/sysv_sem.c#25 integrate
.. //depot/projects/trustedbsd/base/sys/kern/sysv_shm.c#25 integrate
.. //depot/projects/trustedbsd/base/sys/kern/uipc_mbuf.c#34 integrate
.. //depot/projects/trustedbsd/base/sys/kern/uipc_socket.c#56 integrate
.. //depot/projects/trustedbsd/base/sys/kern/uipc_socket2.c#48 integrate
.. //depot/projects/trustedbsd/base/sys/kern/uipc_syscalls.c#54 integrate
.. //depot/projects/trustedbsd/base/sys/kern/uipc_usrreq.c#40 integrate
.. //depot/projects/trustedbsd/base/sys/kern/vfs_cache.c#23 integrate
.. //depot/projects/trustedbsd/base/sys/kern/vfs_init.c#17 integrate
.. //depot/projects/trustedbsd/base/sys/kern/vfs_subr.c#76 integrate
.. //depot/projects/trustedbsd/base/sys/kern/vfs_vnops.c#59 integrate
.. //depot/projects/trustedbsd/base/sys/modules/Makefile#77 integrate
.. //depot/projects/trustedbsd/base/sys/modules/ath_hal/Makefile#4 integrate
.. //depot/projects/trustedbsd/base/sys/modules/geom/geom_bde/Makefile#2 integrate
.. //depot/projects/trustedbsd/base/sys/modules/geom/geom_eli/Makefile#4 integrate
.. //depot/projects/trustedbsd/base/sys/modules/if_bridge/Makefile#4 integrate
.. //depot/projects/trustedbsd/base/sys/modules/mxge/Makefile#1 branch
.. //depot/projects/trustedbsd/base/sys/modules/mxge/mxge/Makefile#1 branch
.. //depot/projects/trustedbsd/base/sys/modules/mxge/mxge_eth_z8e/Makefile#1 branch
.. //depot/projects/trustedbsd/base/sys/modules/mxge/mxge_ethp_z8e/Makefile#1 branch
.. //depot/projects/trustedbsd/base/sys/modules/myri10ge/Makefile#2 delete
.. //depot/projects/trustedbsd/base/sys/modules/myri10ge/myri10ge/Makefile#2 delete
.. //depot/projects/trustedbsd/base/sys/modules/myri10ge/myri10ge_eth_z8e/Makefile#2 delete
.. //depot/projects/trustedbsd/base/sys/modules/myri10ge/myri10ge_ethp_z8e/Makefile#2 delete
.. //depot/projects/trustedbsd/base/sys/modules/netgraph/Makefile#17 integrate
.. //depot/projects/trustedbsd/base/sys/modules/netgraph/tag/Makefile#1 branch
.. //depot/projects/trustedbsd/base/sys/modules/nfe/Makefile#1 branch
.. //depot/projects/trustedbsd/base/sys/modules/ppc/Makefile#1 branch
.. //depot/projects/trustedbsd/base/sys/modules/sound/driver/Makefile#8 integrate
.. //depot/projects/trustedbsd/base/sys/modules/sound/driver/ak452x/Makefile#1 branch
.. //depot/projects/trustedbsd/base/sys/modules/sound/driver/envy24/Makefile#1 branch
.. //depot/projects/trustedbsd/base/sys/modules/xfs/Makefile#2 integrate
.. //depot/projects/trustedbsd/base/sys/net/bpf.c#41 integrate
.. //depot/projects/trustedbsd/base/sys/net/bpf.h#18 integrate
.. //depot/projects/trustedbsd/base/sys/net/if.c#45 integrate
.. //depot/projects/trustedbsd/base/sys/net/if.h#26 integrate
.. //depot/projects/trustedbsd/base/sys/net/if_bridge.c#12 integrate
.. //depot/projects/trustedbsd/base/sys/net/if_clone.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/net/if_enc.c#1 branch
.. //depot/projects/trustedbsd/base/sys/net/if_types.h#9 integrate
.. //depot/projects/trustedbsd/base/sys/net/if_var.h#38 integrate
.. //depot/projects/trustedbsd/base/sys/net/if_vlan.c#35 integrate
.. //depot/projects/trustedbsd/base/sys/net/route.c#24 integrate
.. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_freebsd.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/netatalk/COPYRIGHT#3 integrate
.. //depot/projects/trustedbsd/base/sys/netgraph/netgraph.h#18 integrate
.. //depot/projects/trustedbsd/base/sys/netgraph/ng_base.c#26 integrate
.. //depot/projects/trustedbsd/base/sys/netgraph/ng_socket.c#25 integrate
.. //depot/projects/trustedbsd/base/sys/netgraph/ng_tag.c#1 branch
.. //depot/projects/trustedbsd/base/sys/netgraph/ng_tag.h#1 branch
.. //depot/projects/trustedbsd/base/sys/netinet/if_ether.c#32 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/in_pcb.c#40 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/ip_dummynet.c#37 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/ip_fw2.c#47 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/tcp_input.c#62 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/tcp_seq.h#11 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/tcp_syncache.c#40 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/tcp_usrreq.c#35 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/tcp_var.h#32 integrate
.. //depot/projects/trustedbsd/base/sys/netinet6/in6.c#20 integrate
.. //depot/projects/trustedbsd/base/sys/netinet6/in6_pcb.c#28 integrate
.. //depot/projects/trustedbsd/base/sys/netinet6/ipsec.c#21 integrate
.. //depot/projects/trustedbsd/base/sys/netinet6/nd6.c#24 integrate
.. //depot/projects/trustedbsd/base/sys/netinet6/raw_ip6.c#23 integrate
.. //depot/projects/trustedbsd/base/sys/netipsec/ipsec.h#8 integrate
.. //depot/projects/trustedbsd/base/sys/netipsec/ipsec_input.c#10 integrate
.. //depot/projects/trustedbsd/base/sys/netipsec/ipsec_osdep.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/netipsec/ipsec_output.c#9 integrate
.. //depot/projects/trustedbsd/base/sys/netipsec/xform_ipip.c#12 integrate
.. //depot/projects/trustedbsd/base/sys/nfsserver/nfs_srvcache.c#10 integrate
.. //depot/projects/trustedbsd/base/sys/nfsserver/nfsrvcache.h#6 integrate
.. //depot/projects/trustedbsd/base/sys/opencrypto/crypto.c#17 integrate
.. //depot/projects/trustedbsd/base/sys/pc98/conf/DEFAULTS#4 integrate
.. //depot/projects/trustedbsd/base/sys/pc98/conf/GENERIC#46 integrate
.. //depot/projects/trustedbsd/base/sys/pc98/conf/NOTES#35 integrate
.. //depot/projects/trustedbsd/base/sys/pci/agp_i810.c#22 integrate
.. //depot/projects/trustedbsd/base/sys/pci/if_rlreg.h#22 integrate
.. //depot/projects/trustedbsd/base/sys/posix4/ksched.c#13 integrate
.. //depot/projects/trustedbsd/base/sys/powerpc/conf/DEFAULTS#2 integrate
.. //depot/projects/trustedbsd/base/sys/powerpc/conf/GENERIC#30 integrate
.. //depot/projects/trustedbsd/base/sys/powerpc/powerpc/mmu_if.m#4 integrate
.. //depot/projects/trustedbsd/base/sys/powerpc/powerpc/mmu_oea.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/powerpc/powerpc/pmap_dispatch.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/security/audit/audit.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/security/audit/audit_arg.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/security/audit/audit_bsm.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/security/audit/audit_bsm_token.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/security/audit/audit_syscalls.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/security/audit/audit_trigger.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/security/audit/audit_worker.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/sparc64/conf/DEFAULTS#2 integrate
.. //depot/projects/trustedbsd/base/sys/sparc64/conf/GENERIC#53 integrate
.. //depot/projects/trustedbsd/base/sys/sparc64/include/_bus.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/sparc64/include/bus.h#23 integrate
.. //depot/projects/trustedbsd/base/sys/sparc64/isa/isa.c#14 integrate
.. //depot/projects/trustedbsd/base/sys/sparc64/sbus/sbus.c#23 integrate
.. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/pmap.c#56 integrate
.. //depot/projects/trustedbsd/base/sys/sys/firmware.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/sys/gpt.h#7 integrate
.. //depot/projects/trustedbsd/base/sys/sys/linker.h#15 integrate
.. //depot/projects/trustedbsd/base/sys/sys/protosw.h#16 integrate
.. //depot/projects/trustedbsd/base/sys/sys/rman.h#13 integrate
.. //depot/projects/trustedbsd/base/sys/sys/rwlock.h#4 integrate
.. //depot/projects/trustedbsd/base/sys/sys/sched.h#12 integrate
.. //depot/projects/trustedbsd/base/sys/sys/socketvar.h#45 integrate
.. //depot/projects/trustedbsd/base/sys/sys/sockio.h#9 integrate
.. //depot/projects/trustedbsd/base/sys/sys/sx.h#9 integrate
.. //depot/projects/trustedbsd/base/sys/sys/syscallsubr.h#16 integrate
.. //depot/projects/trustedbsd/base/sys/sys/sysctl.h#29 integrate
.. //depot/projects/trustedbsd/base/sys/tools/fw_stub.awk#2 integrate
.. //depot/projects/trustedbsd/base/sys/vm/pmap.h#30 integrate
.. //depot/projects/trustedbsd/base/sys/vm/vm_fault.c#45 integrate
.. //depot/projects/trustedbsd/base/sys/vm/vm_map.c#49 integrate
.. //depot/projects/trustedbsd/base/sys/vm/vm_meter.c#21 integrate
.. //depot/projects/trustedbsd/base/sys/vm/vm_mmap.c#34 integrate
.. //depot/projects/trustedbsd/base/sys/vm/vm_page.c#61 integrate
.. //depot/projects/trustedbsd/base/sys/vm/vm_pageq.c#19 integrate
.. //depot/projects/trustedbsd/base/tools/regression/geom_eli/init-a.t#1 branch
.. //depot/projects/trustedbsd/base/tools/regression/geom_eli/init.t#2 integrate
.. //depot/projects/trustedbsd/base/tools/regression/geom_eli/integrity-copy.t#1 branch
.. //depot/projects/trustedbsd/base/tools/regression/geom_eli/integrity-data.t#1 branch
.. //depot/projects/trustedbsd/base/tools/regression/geom_eli/integrity-hmac.t#1 branch
.. //depot/projects/trustedbsd/base/tools/regression/geom_eli/onetime-a.t#1 branch
.. //depot/projects/trustedbsd/base/tools/regression/geom_eli/onetime.t#2 integrate
.. //depot/projects/trustedbsd/base/tools/tools/ath/athstats/athstats.c#2 integrate
.. //depot/projects/trustedbsd/base/tools/tools/ipw/Makefile#1 branch
.. //depot/projects/trustedbsd/base/tools/tools/ipw/ipwstats.c#1 branch
.. //depot/projects/trustedbsd/base/tools/tools/mfc/mfc.pl#2 integrate
.. //depot/projects/trustedbsd/base/usr.bin/calendar/calendars/calendar.freebsd#49 integrate
.. //depot/projects/trustedbsd/base/usr.bin/file/config.h#7 integrate
.. //depot/projects/trustedbsd/base/usr.bin/locate/locate/locate.c#5 integrate
.. //depot/projects/trustedbsd/base/usr.bin/top/machine.c#12 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/adduser/adduser.8#19 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/asf/Makefile#2 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/asf/asf.8#6 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/asf/asf.c#5 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/asf/asf.h#1 branch
.. //depot/projects/trustedbsd/base/usr.sbin/asf/asf_kld.c#1 branch
.. //depot/projects/trustedbsd/base/usr.sbin/asf/asf_kvm.c#1 branch
.. //depot/projects/trustedbsd/base/usr.sbin/asf/asf_prog.c#1 branch
.. //depot/projects/trustedbsd/base/usr.sbin/config/config.y#13 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/config/main.c#14 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/config/mkmakefile.c#12 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/config/mkoptions.c#7 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/cron/cron/do_command.c#6 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/cron/cron/popen.c#4 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/jail/jail.8#31 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/mailwrapper/Makefile#8 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/mailwrapper/mailwrapper.c#4 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/mountd/mountd.c#15 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/newsyslog/newsyslog.c#26 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/pkg_install/add/main.c#16 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/pkg_install/create/main.c#9 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/pkg_install/delete/main.c#5 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/pkg_install/info/main.c#13 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/pkg_install/lib/global.c#4 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/pkg_install/lib/lib.h#14 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/pkg_install/version/main.c#7 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/ypserv/Makefile.yp#7 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/ypserv/yp_server.c#6 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/ypserv/ypinit.8#5 integrate

Differences ...

==== //depot/projects/trustedbsd/base/Makefile#45 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile,v 1.330 2006/05/26 18:10:06 netchild Exp $
+# $FreeBSD: src/Makefile,v 1.334 2006/06/22 16:52:53 imp Exp $
 #
 # The user-driven targets are:
 #
@@ -8,7 +8,7 @@
 # buildworld          - Rebuild *everything*, including glue to help do
 #                       upgrades.
 # installworld        - Install everything built by "buildworld".
-# world               - buildworld + installworld.
+# world               - buildworld + installworld, no kernel.
 # buildkernel         - Rebuild the kernel and the kernel-modules.
 # installkernel       - Install the kernel and the kernel-modules.
 # installkernel.debug
@@ -37,7 +37,8 @@
 # system, the simple instructions are:
 #
 # 1.  `cd /usr/src'  (or to the directory containing your source tree).
-# 2.  `make world'
+# 2.  Define `HISTORICAL_MAKE_WORLD' variable (see README).
+# 3.  `make world'
 #
 # For individuals wanting to upgrade their sources (even if only a
 # delta of a few days):
@@ -46,6 +47,7 @@
 #  2.  `make buildworld'
 #  3.  `make buildkernel KERNCONF=YOUR_KERNEL_HERE'     (default is GENERIC).
 #  4.  `make installkernel KERNCONF=YOUR_KERNEL_HERE'   (default is GENERIC).
+#       [steps 3. & 4. can be combined by using the "kernel" target]
 #  5.  `reboot'        (in single user mode: boot -s from the loader prompt).
 #  6.  `mergemaster -p'
 #  7.  `make installworld'
@@ -68,9 +70,9 @@
 # developer convenience only.  They are intentionally not documented and
 # completely subject to change without notice.
 #
-TGTS=	all all-man buildenv buildkernel buildworld check-old checkdpadd \
-	clean cleandepend cleandir delete-old delete-old-libs depend \
-	distribute distributeworld distrib-dirs distribution doxygen \
+TGTS=	all all-man buildenv buildenvvars buildkernel buildworld check-old \
+	checkdpadd clean cleandepend cleandir delete-old delete-old-libs \
+	depend distribute distributeworld distrib-dirs distribution doxygen \
 	everything hierarchy install installcheck installkernel \
 	installkernel.debug reinstallkernel reinstallkernel.debug \
 	installworld kernel-toolchain libraries lint maninstall \
@@ -204,9 +206,6 @@
 	@echo "'Rebuilding world', for how to upgrade your system."
 	@echo "Define DESTDIR to where you want to install FreeBSD,"
 	@echo "including /, to override this warning and proceed as usual."
-	@echo "You may get the historical 'make world' behavior by defining"
-	@echo "HISTORICAL_MAKE_WORLD.  You should understand the implications"
-	@echo "before doing this."
 	@echo ""
 	@echo "Bailing out now..."
 	@false

==== //depot/projects/trustedbsd/base/Makefile.inc1#73 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile.inc1,v 1.547 2006/05/26 18:10:06 netchild Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.549 2006/06/06 18:07:58 imp Exp $
 #
 # Make command line options:
 #	-DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -468,6 +468,16 @@
 buildworld: ${WMAKE_TGTS}
 .ORDER: ${WMAKE_TGTS}
 
+
+#
+# We need to have this as a target because the indirection between Makefile
+# and Makefile.inc1 causes the correct PATH to be used, rather than a
+# modification of the current environment's PATH.  In addition, we need
+# to quote multiword values.
+# 
+buildenvvars:
+	@echo ${WMAKEENV:Q}
+
 buildenv:
 	@echo Entering world for ${TARGET_ARCH}:${TARGET}
 	@cd ${.CURDIR} && env ${WMAKEENV} sh || true

==== //depot/projects/trustedbsd/base/README#6 (text+ko) ====

@@ -1,6 +1,6 @@
 This is the top level of the FreeBSD source directory.  This file
 was last revised on:
-$FreeBSD: src/README,v 1.23 2006/03/01 20:14:55 ceri Exp $
+$FreeBSD: src/README,v 1.24 2006/06/07 03:33:48 trhodes Exp $
 
 For copyright information, please see the file COPYRIGHT in this
 directory (additional copyright information also exists for some
@@ -11,8 +11,13 @@
 building components (or all) of the FreeBSD source tree, the most
 commonly used one being ``world'', which rebuilds and installs
 everything in the FreeBSD system from the source tree except the
-kernel, the kernel-modules and the contents of /etc.  The
-``buildkernel'' and ``installkernel'' targets build and install
+kernel, the kernel-modules and the contents of /etc.  The ``world''
+target should only be used in cases where the source tree has not
+changed from the currently running version.  See:
+http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/makeworld.html
+for more information, including setting make(1) variables.
+
+The ``buildkernel'' and ``installkernel'' targets build and install
 the kernel and the modules (see below).  Please see the top of
 the Makefile in this directory for more information on the
 standard build targets and compile-time flags.

==== //depot/projects/trustedbsd/base/bin/setfacl/setfacl.1#8 (text+ko) ====

@@ -23,7 +23,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/bin/setfacl/setfacl.1,v 1.14 2005/12/13 17:07:52 ru Exp $
+.\" $FreeBSD: src/bin/setfacl/setfacl.1,v 1.16 2006/06/09 17:03:24 maxim Exp $
 .\"
 .Dd January 7, 2001
 .Dt SETFACL 1
@@ -44,6 +44,8 @@
 .Nm
 utility sets discretionary access control information on
 the specified file(s).
+If no files are specified, or the list consists of the

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


More information about the trustedbsd-cvs mailing list