PERFORCE change 176393 for review

Rafal Jaworowski raj at FreeBSD.org
Thu Apr 1 06:31:03 UTC 2010


http://p4web.freebsd.org/chv.cgi?CH=176393

Change 176393 by raj at raj_fdt on 2010/04/01 06:30:08

	IFC @176349

Affected files ...

.. //depot/projects/fdt/MAINTAINERS#5 integrate
.. //depot/projects/fdt/Makefile#7 integrate
.. //depot/projects/fdt/Makefile.inc1#13 integrate
.. //depot/projects/fdt/ObsoleteFiles.inc#11 integrate
.. //depot/projects/fdt/bin/cp/utils.c#3 integrate
.. //depot/projects/fdt/bin/ls/cmp.c#2 integrate
.. //depot/projects/fdt/bin/pax/Makefile#3 integrate
.. //depot/projects/fdt/bin/pax/cpio.1#2 delete
.. //depot/projects/fdt/bin/pax/getoldopt.c#2 integrate
.. //depot/projects/fdt/bin/pax/tar.1#2 delete
.. //depot/projects/fdt/bin/ps/extern.h#2 integrate
.. //depot/projects/fdt/bin/ps/keyword.c#4 integrate
.. //depot/projects/fdt/bin/ps/print.c#2 integrate
.. //depot/projects/fdt/bin/ps/ps.1#3 integrate
.. //depot/projects/fdt/bin/rcp/rcp.c#2 integrate
.. //depot/projects/fdt/bin/test/test.c#2 integrate
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/zfs/zfs.8#2 integrate
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/zpool/zpool.8#2 integrate
.. //depot/projects/fdt/contrib/bind9/CHANGES#5 integrate
.. //depot/projects/fdt/contrib/bind9/bin/named/server.c#3 integrate
.. //depot/projects/fdt/contrib/bind9/doc/arm/Bv9ARM-book.xml#3 integrate
.. //depot/projects/fdt/contrib/bind9/doc/arm/Bv9ARM.ch06.html#3 integrate
.. //depot/projects/fdt/contrib/bind9/doc/arm/Bv9ARM.ch07.html#3 integrate
.. //depot/projects/fdt/contrib/bind9/doc/arm/Bv9ARM.ch08.html#3 integrate
.. //depot/projects/fdt/contrib/bind9/doc/arm/Bv9ARM.ch09.html#3 integrate
.. //depot/projects/fdt/contrib/bind9/doc/arm/Bv9ARM.html#3 integrate
.. //depot/projects/fdt/contrib/bind9/doc/arm/Bv9ARM.pdf#4 integrate
.. //depot/projects/fdt/contrib/bind9/doc/arm/man.dig.html#3 integrate
.. //depot/projects/fdt/contrib/bind9/doc/arm/man.dnssec-dsfromkey.html#3 integrate
.. //depot/projects/fdt/contrib/bind9/doc/arm/man.dnssec-keyfromlabel.html#3 integrate
.. //depot/projects/fdt/contrib/bind9/doc/arm/man.dnssec-keygen.html#3 integrate
.. //depot/projects/fdt/contrib/bind9/doc/arm/man.dnssec-signzone.html#4 integrate
.. //depot/projects/fdt/contrib/bind9/doc/arm/man.host.html#3 integrate
.. //depot/projects/fdt/contrib/bind9/doc/arm/man.named-checkconf.html#4 integrate
.. //depot/projects/fdt/contrib/bind9/doc/arm/man.named-checkzone.html#4 integrate
.. //depot/projects/fdt/contrib/bind9/doc/arm/man.named.html#4 integrate
.. //depot/projects/fdt/contrib/bind9/doc/arm/man.nsupdate.html#4 integrate
.. //depot/projects/fdt/contrib/bind9/doc/arm/man.rndc-confgen.html#4 integrate
.. //depot/projects/fdt/contrib/bind9/doc/arm/man.rndc.conf.html#4 integrate
.. //depot/projects/fdt/contrib/bind9/doc/arm/man.rndc.html#4 integrate
.. //depot/projects/fdt/contrib/bind9/lib/dns/api#4 integrate
.. //depot/projects/fdt/contrib/bind9/lib/dns/include/dns/rdataset.h#2 integrate
.. //depot/projects/fdt/contrib/bind9/lib/dns/include/dns/resolver.h#2 integrate
.. //depot/projects/fdt/contrib/bind9/lib/dns/include/dns/result.h#2 integrate
.. //depot/projects/fdt/contrib/bind9/lib/dns/include/dns/validator.h#2 integrate
.. //depot/projects/fdt/contrib/bind9/lib/dns/ncache.c#2 integrate
.. //depot/projects/fdt/contrib/bind9/lib/dns/rbtdb.c#5 integrate
.. //depot/projects/fdt/contrib/bind9/lib/dns/rdatalist.c#2 integrate
.. //depot/projects/fdt/contrib/bind9/lib/dns/rdataset.c#2 integrate
.. //depot/projects/fdt/contrib/bind9/lib/dns/rdataslab.c#2 integrate
.. //depot/projects/fdt/contrib/bind9/lib/dns/resolver.c#5 integrate
.. //depot/projects/fdt/contrib/bind9/lib/dns/result.c#2 integrate
.. //depot/projects/fdt/contrib/bind9/lib/dns/sdb.c#3 integrate
.. //depot/projects/fdt/contrib/bind9/lib/dns/sdlz.c#3 integrate
.. //depot/projects/fdt/contrib/bind9/lib/dns/validator.c#5 integrate
.. //depot/projects/fdt/contrib/bind9/lib/dns/view.c#3 integrate
.. //depot/projects/fdt/contrib/bind9/lib/lwres/man/lwres.html#4 integrate
.. //depot/projects/fdt/contrib/bind9/lib/lwres/man/lwres_buffer.html#4 integrate
.. //depot/projects/fdt/contrib/bind9/lib/lwres/man/lwres_config.html#4 integrate
.. //depot/projects/fdt/contrib/bind9/lib/lwres/man/lwres_context.html#4 integrate
.. //depot/projects/fdt/contrib/bind9/lib/lwres/man/lwres_gabn.html#4 integrate
.. //depot/projects/fdt/contrib/bind9/lib/lwres/man/lwres_gai_strerror.html#4 integrate
.. //depot/projects/fdt/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.html#4 integrate
.. //depot/projects/fdt/contrib/bind9/lib/lwres/man/lwres_gethostent.html#4 integrate
.. //depot/projects/fdt/contrib/bind9/lib/lwres/man/lwres_getipnode.html#4 integrate
.. //depot/projects/fdt/contrib/bind9/lib/lwres/man/lwres_getnameinfo.html#4 integrate
.. //depot/projects/fdt/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.html#4 integrate
.. //depot/projects/fdt/contrib/bind9/lib/lwres/man/lwres_gnba.html#4 integrate
.. //depot/projects/fdt/contrib/bind9/lib/lwres/man/lwres_hstrerror.html#4 integrate
.. //depot/projects/fdt/contrib/bind9/lib/lwres/man/lwres_inetntop.html#4 integrate
.. //depot/projects/fdt/contrib/bind9/lib/lwres/man/lwres_noop.html#4 integrate
.. //depot/projects/fdt/contrib/bind9/lib/lwres/man/lwres_packet.html#4 integrate
.. //depot/projects/fdt/contrib/bind9/lib/lwres/man/lwres_resutil.html#4 integrate
.. //depot/projects/fdt/contrib/bind9/version#5 integrate
.. //depot/projects/fdt/contrib/bsnmp/gensnmpdef/gensnmpdef.c#2 integrate
.. //depot/projects/fdt/contrib/bsnmp/snmpd/config.c#2 integrate
.. //depot/projects/fdt/contrib/cpio/ABOUT-NLS#2 delete
.. //depot/projects/fdt/contrib/cpio/AUTHORS#2 delete
.. //depot/projects/fdt/contrib/cpio/COPYING#2 delete
.. //depot/projects/fdt/contrib/cpio/ChangeLog#2 delete
.. //depot/projects/fdt/contrib/cpio/FREEBSD-upgrade#2 delete
.. //depot/projects/fdt/contrib/cpio/INSTALL#2 delete
.. //depot/projects/fdt/contrib/cpio/NEWS#2 delete
.. //depot/projects/fdt/contrib/cpio/README#2 delete
.. //depot/projects/fdt/contrib/cpio/THANKS#2 delete
.. //depot/projects/fdt/contrib/cpio/TODO#2 delete
.. //depot/projects/fdt/contrib/cpio/doc/cpio.1#2 delete
.. //depot/projects/fdt/contrib/cpio/doc/cpio.texi#2 delete
.. //depot/projects/fdt/contrib/cpio/doc/version.texi#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/alloca_.h#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/argp-ba.c#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/argp-eexst.c#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/argp-fmtstream.c#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/argp-fmtstream.h#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/argp-fs-xinl.c#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/argp-help.c#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/argp-namefrob.h#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/argp-parse.c#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/argp-pin.c#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/argp-pv.c#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/argp-pvh.c#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/argp-xinl.c#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/argp.h#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/basename.c#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/dirname.c#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/dirname.h#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/error.c#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/error.h#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/exitfail.c#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/exitfail.h#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/fatal.c#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/full-write.c#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/full-write.h#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/getopt.c#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/getopt1.c#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/getopt_.h#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/getopt_int.h#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/gettext.h#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/hash.c#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/hash.h#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/intprops.h#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/inttostr.c#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/inttostr.h#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/mempcpy.c#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/paxerror.c#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/paxexit.c#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/paxlib.h#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/paxnames.c#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/quote.c#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/quote.h#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/quotearg.c#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/quotearg.h#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/rmt-command.h#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/rmt.h#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/rtapelib.c#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/safe-read.c#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/safe-read.h#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/safe-write.c#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/safe-write.h#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/savedir.c#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/savedir.h#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/strchrnul.c#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/stripslash.c#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/strndup.c#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/strnlen.c#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/system-ioctl.h#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/system.h#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/umaxtostr.c#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/unlocked-io.h#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/utimens.c#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/utimens.h#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/xalloc-die.c#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/xalloc.h#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/xmalloc.c#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/xstrndup.c#2 delete
.. //depot/projects/fdt/contrib/cpio/lib/xstrndup.h#2 delete
.. //depot/projects/fdt/contrib/cpio/src/copyin.c#2 delete
.. //depot/projects/fdt/contrib/cpio/src/copyout.c#2 delete
.. //depot/projects/fdt/contrib/cpio/src/copypass.c#2 delete
.. //depot/projects/fdt/contrib/cpio/src/cpio.h#2 delete
.. //depot/projects/fdt/contrib/cpio/src/cpiohdr.h#2 delete
.. //depot/projects/fdt/contrib/cpio/src/defer.c#2 delete
.. //depot/projects/fdt/contrib/cpio/src/defer.h#2 delete
.. //depot/projects/fdt/contrib/cpio/src/dstring.c#2 delete
.. //depot/projects/fdt/contrib/cpio/src/dstring.h#2 delete
.. //depot/projects/fdt/contrib/cpio/src/extern.h#2 delete
.. //depot/projects/fdt/contrib/cpio/src/filemode.c#2 delete
.. //depot/projects/fdt/contrib/cpio/src/filetypes.h#2 delete
.. //depot/projects/fdt/contrib/cpio/src/global.c#2 delete
.. //depot/projects/fdt/contrib/cpio/src/idcache.c#2 delete
.. //depot/projects/fdt/contrib/cpio/src/main.c#2 delete
.. //depot/projects/fdt/contrib/cpio/src/makepath.c#2 delete
.. //depot/projects/fdt/contrib/cpio/src/safe-stat.h#2 delete
.. //depot/projects/fdt/contrib/cpio/src/tar.c#2 delete
.. //depot/projects/fdt/contrib/cpio/src/tar.h#2 delete
.. //depot/projects/fdt/contrib/cpio/src/tarhdr.h#2 delete
.. //depot/projects/fdt/contrib/cpio/src/userspec.c#2 delete
.. //depot/projects/fdt/contrib/cpio/src/util.c#2 delete
.. //depot/projects/fdt/contrib/netcat/FREEBSD-upgrade#2 integrate
.. //depot/projects/fdt/contrib/netcat/FREEBSD-vendor#4 integrate
.. //depot/projects/fdt/contrib/netcat/nc.1#3 integrate
.. //depot/projects/fdt/contrib/netcat/netcat.c#3 integrate
.. //depot/projects/fdt/contrib/openpam/include/security/pam_appl.h#2 integrate
.. //depot/projects/fdt/contrib/tzdata/antarctica#2 integrate
.. //depot/projects/fdt/contrib/tzdata/asia#3 integrate
.. //depot/projects/fdt/contrib/tzdata/australasia#3 integrate
.. //depot/projects/fdt/contrib/tzdata/zone.tab#2 integrate
.. //depot/projects/fdt/etc/Makefile#5 integrate
.. //depot/projects/fdt/etc/defaults/periodic.conf#2 integrate
.. //depot/projects/fdt/gnu/usr.bin/Makefile#5 integrate
.. //depot/projects/fdt/gnu/usr.bin/cpio/Makefile#2 delete
.. //depot/projects/fdt/gnu/usr.bin/cpio/config.h#2 delete
.. //depot/projects/fdt/gnu/usr.bin/cpio/doc/Makefile#2 delete
.. //depot/projects/fdt/gnu/usr.bin/diff/context.c.diff#2 integrate
.. //depot/projects/fdt/gnu/usr.bin/diff/diff.c.diff#2 integrate
.. //depot/projects/fdt/gnu/usr.bin/gdb/Makefile#3 integrate
.. //depot/projects/fdt/gnu/usr.bin/gdb/Makefile.inc#2 integrate
.. //depot/projects/fdt/gnu/usr.bin/gdb/arch/arm/nm-fbsd.h#2 integrate
.. //depot/projects/fdt/gnu/usr.bin/gdb/kgdb/trgt_ia64.c#2 integrate
.. //depot/projects/fdt/include/dlfcn.h#3 integrate
.. //depot/projects/fdt/include/inttypes.h#2 integrate
.. //depot/projects/fdt/lib/bind/config.h#4 integrate
.. //depot/projects/fdt/lib/csu/i386-elf/Makefile#4 integrate
.. //depot/projects/fdt/lib/libc/gen/dlfcn.c#2 integrate
.. //depot/projects/fdt/lib/libc/gen/dlopen.3#2 integrate
.. //depot/projects/fdt/lib/libc/gen/opendir.c#4 integrate
.. //depot/projects/fdt/lib/libc/posix1e/acl_to_text_nfs4.c#2 integrate
.. //depot/projects/fdt/lib/libc/sparc64/fpu/fpu.c#3 integrate
.. //depot/projects/fdt/lib/libc/sparc64/fpu/fpu_div.c#2 integrate
.. //depot/projects/fdt/lib/libc/sparc64/fpu/fpu_explode.c#2 integrate
.. //depot/projects/fdt/lib/libc/sparc64/fpu/fpu_extern.h#3 integrate
.. //depot/projects/fdt/lib/libc/sparc64/fpu/fpu_implode.c#2 integrate
.. //depot/projects/fdt/lib/libc/sys/mmap.2#3 integrate
.. //depot/projects/fdt/lib/libc/sys/open.2#2 integrate
.. //depot/projects/fdt/lib/libc/sys/stat.2#2 integrate
.. //depot/projects/fdt/lib/libpmc/pmc.xscale.3#2 integrate
.. //depot/projects/fdt/lib/libstand/assert.c#2 integrate
.. //depot/projects/fdt/lib/libstand/bzipfs.c#4 integrate
.. //depot/projects/fdt/lib/libstand/gzipfs.c#3 integrate
.. //depot/projects/fdt/lib/libusbhid/data.c#2 integrate
.. //depot/projects/fdt/lib/libusbhid/descr.c#2 integrate
.. //depot/projects/fdt/lib/libusbhid/parse.c#2 integrate
.. //depot/projects/fdt/lib/libusbhid/usage.c#2 integrate
.. //depot/projects/fdt/lib/libusbhid/usbhid.h#2 integrate
.. //depot/projects/fdt/lib/libusbhid/usbvar.h#2 integrate
.. //depot/projects/fdt/lib/libz/ChangeLog#2 integrate
.. //depot/projects/fdt/lib/libz/FAQ#2 integrate
.. //depot/projects/fdt/lib/libz/Makefile#3 integrate
.. //depot/projects/fdt/lib/libz/README#2 integrate
.. //depot/projects/fdt/lib/libz/Symbol.map#1 branch
.. //depot/projects/fdt/lib/libz/Versions.def#1 branch
.. //depot/projects/fdt/lib/libz/adler32.c#2 integrate
.. //depot/projects/fdt/lib/libz/algorithm.txt#2 delete
.. //depot/projects/fdt/lib/libz/compress.c#2 integrate
.. //depot/projects/fdt/lib/libz/contrib/README.contrib#1 branch
.. //depot/projects/fdt/lib/libz/contrib/asm686/README.686#1 branch
.. //depot/projects/fdt/lib/libz/contrib/asm686/match.S#1 branch
.. //depot/projects/fdt/lib/libz/contrib/gcc_gvmat64/gvmat64.S#1 branch
.. //depot/projects/fdt/lib/libz/crc32.c#2 integrate
.. //depot/projects/fdt/lib/libz/deflate.c#2 integrate
.. //depot/projects/fdt/lib/libz/deflate.h#2 integrate
.. //depot/projects/fdt/lib/libz/doc/algorithm.txt#1 branch
.. //depot/projects/fdt/lib/libz/doc/rfc1950.txt#1 branch
.. //depot/projects/fdt/lib/libz/doc/rfc1951.txt#1 branch
.. //depot/projects/fdt/lib/libz/doc/rfc1952.txt#1 branch
.. //depot/projects/fdt/lib/libz/doc/txtvsbin.txt#1 branch
.. //depot/projects/fdt/lib/libz/example.c#2 integrate
.. //depot/projects/fdt/lib/libz/gzclose.c#1 branch
.. //depot/projects/fdt/lib/libz/gzguts.h#1 branch
.. //depot/projects/fdt/lib/libz/gzio.c#2 delete
.. //depot/projects/fdt/lib/libz/gzlib.c#1 branch
.. //depot/projects/fdt/lib/libz/gzread.c#1 branch
.. //depot/projects/fdt/lib/libz/gzwrite.c#1 branch
.. //depot/projects/fdt/lib/libz/infback.c#2 integrate
.. //depot/projects/fdt/lib/libz/inffast.c#2 integrate
.. //depot/projects/fdt/lib/libz/inflate.c#2 integrate
.. //depot/projects/fdt/lib/libz/inflate.h#2 integrate
.. //depot/projects/fdt/lib/libz/inftrees.c#2 integrate
.. //depot/projects/fdt/lib/libz/inftrees.h#2 integrate
.. //depot/projects/fdt/lib/libz/minigzip.c#2 integrate
.. //depot/projects/fdt/lib/libz/trees.c#2 integrate
.. //depot/projects/fdt/lib/libz/uncompr.c#2 integrate
.. //depot/projects/fdt/lib/libz/zconf.h#2 integrate
.. //depot/projects/fdt/lib/libz/zlib.3#2 integrate
.. //depot/projects/fdt/lib/libz/zlib.h#2 integrate
.. //depot/projects/fdt/lib/libz/zutil.c#2 integrate
.. //depot/projects/fdt/lib/libz/zutil.h#2 integrate
.. //depot/projects/fdt/libexec/ftpd/popen.c#2 integrate
.. //depot/projects/fdt/libexec/rtld-elf/rtld.c#6 integrate
.. //depot/projects/fdt/sbin/geom/class/multipath/geom_multipath.c#3 integrate
.. //depot/projects/fdt/sbin/hastd/primary.c#2 integrate
.. //depot/projects/fdt/sbin/ifconfig/ifieee80211.c#4 integrate
.. //depot/projects/fdt/sbin/ipfw/ipfw.8#5 integrate
.. //depot/projects/fdt/sbin/ipfw/ipfw2.c#5 integrate
.. //depot/projects/fdt/sbin/setkey/setkey.8#3 integrate
.. //depot/projects/fdt/share/dict/web2#2 integrate
.. //depot/projects/fdt/share/man/man3/pthread_affinity_np.3#3 integrate
.. //depot/projects/fdt/share/man/man4/ath.4#3 integrate
.. //depot/projects/fdt/share/man/man5/src.conf.5#3 integrate
.. //depot/projects/fdt/share/man/man9/ieee80211.9#2 integrate
.. //depot/projects/fdt/share/man/man9/ieee80211_crypto.9#2 integrate
.. //depot/projects/fdt/share/man/man9/ieee80211_node.9#2 integrate
.. //depot/projects/fdt/share/man/man9/ieee80211_output.9#2 integrate
.. //depot/projects/fdt/share/man/man9/ieee80211_scan.9#3 integrate
.. //depot/projects/fdt/share/man/man9/uio.9#2 integrate
.. //depot/projects/fdt/share/man/man9/vfs_mount.9#2 integrate
.. //depot/projects/fdt/share/misc/bsd-family-tree#4 integrate
.. //depot/projects/fdt/share/mk/bsd.own.mk#6 integrate
.. //depot/projects/fdt/sys/amd64/acpica/acpi_machdep.c#2 integrate
.. //depot/projects/fdt/sys/amd64/amd64/apic_vector.S#2 integrate
.. //depot/projects/fdt/sys/amd64/amd64/local_apic.c#4 integrate
.. //depot/projects/fdt/sys/amd64/amd64/machdep.c#5 integrate
.. //depot/projects/fdt/sys/amd64/amd64/mca.c#5 integrate
.. //depot/projects/fdt/sys/amd64/amd64/pmap.c#8 integrate
.. //depot/projects/fdt/sys/amd64/ia32/ia32_signal.c#2 integrate
.. //depot/projects/fdt/sys/amd64/include/apicvar.h#4 integrate
.. //depot/projects/fdt/sys/amd64/include/reg.h#3 integrate
.. //depot/projects/fdt/sys/amd64/include/specialreg.h#4 integrate
.. //depot/projects/fdt/sys/amd64/linux32/linux.h#2 integrate
.. //depot/projects/fdt/sys/amd64/linux32/linux32_sysvec.c#3 integrate
.. //depot/projects/fdt/sys/arm/arm/machdep.c#3 integrate
.. //depot/projects/fdt/sys/arm/arm/pmap.c#3 integrate
.. //depot/projects/fdt/sys/arm/conf/KB920X#4 integrate
.. //depot/projects/fdt/sys/arm/conf/LN2410SBC#1 branch
.. //depot/projects/fdt/sys/arm/s3c2xx0/board_ln2410sbc.c#1 branch
.. //depot/projects/fdt/sys/arm/s3c2xx0/files.s3c2xx0#1 branch
.. //depot/projects/fdt/sys/arm/s3c2xx0/s3c2410reg.h#1 branch
.. //depot/projects/fdt/sys/arm/s3c2xx0/s3c2410var.h#1 branch
.. //depot/projects/fdt/sys/arm/s3c2xx0/s3c2440reg.h#1 branch
.. //depot/projects/fdt/sys/arm/s3c2xx0/s3c24x0.c#1 branch
.. //depot/projects/fdt/sys/arm/s3c2xx0/s3c24x0_clk.c#1 branch
.. //depot/projects/fdt/sys/arm/s3c2xx0/s3c24x0_machdep.c#1 branch
.. //depot/projects/fdt/sys/arm/s3c2xx0/s3c24x0reg.h#1 branch
.. //depot/projects/fdt/sys/arm/s3c2xx0/s3c24x0var.h#1 branch
.. //depot/projects/fdt/sys/arm/s3c2xx0/s3c2xx0_space.c#1 branch
.. //depot/projects/fdt/sys/arm/s3c2xx0/s3c2xx0board.h#1 branch
.. //depot/projects/fdt/sys/arm/s3c2xx0/s3c2xx0reg.h#1 branch
.. //depot/projects/fdt/sys/arm/s3c2xx0/s3c2xx0var.h#1 branch
.. //depot/projects/fdt/sys/arm/s3c2xx0/std.ln2410sbc#1 branch
.. //depot/projects/fdt/sys/arm/s3c2xx0/std.s3c2410#1 branch
.. //depot/projects/fdt/sys/arm/s3c2xx0/uart_bus_s3c2410.c#1 branch
.. //depot/projects/fdt/sys/arm/s3c2xx0/uart_cpu_s3c2410.c#1 branch
.. //depot/projects/fdt/sys/arm/s3c2xx0/uart_dev_s3c2410.c#1 branch
.. //depot/projects/fdt/sys/arm/s3c2xx0/uart_dev_s3c2410.h#1 branch
.. //depot/projects/fdt/sys/arm/xscale/ixp425/cambria_fled.c#4 integrate
.. //depot/projects/fdt/sys/boot/i386/boot2/boot2.c#2 integrate
.. //depot/projects/fdt/sys/boot/i386/gptboot/gptboot.c#3 integrate
.. //depot/projects/fdt/sys/boot/i386/zfsboot/zfsboot.c#4 integrate
.. //depot/projects/fdt/sys/cam/scsi/scsi_sg.c#3 integrate
.. //depot/projects/fdt/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#3 integrate
.. //depot/projects/fdt/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#4 integrate
.. //depot/projects/fdt/sys/compat/freebsd32/freebsd32.h#3 integrate
.. //depot/projects/fdt/sys/compat/freebsd32/freebsd32_ipc.h#2 integrate
.. //depot/projects/fdt/sys/compat/freebsd32/freebsd32_misc.c#3 integrate
.. //depot/projects/fdt/sys/compat/freebsd32/freebsd32_proto.h#5 integrate
.. //depot/projects/fdt/sys/compat/freebsd32/freebsd32_syscall.h#4 integrate
.. //depot/projects/fdt/sys/compat/freebsd32/freebsd32_syscalls.c#4 integrate
.. //depot/projects/fdt/sys/compat/freebsd32/freebsd32_sysent.c#4 integrate
.. //depot/projects/fdt/sys/compat/freebsd32/freebsd32_util.h#3 integrate
.. //depot/projects/fdt/sys/compat/freebsd32/syscalls.master#5 integrate
.. //depot/projects/fdt/sys/compat/ia32/ia32_signal.h#2 integrate
.. //depot/projects/fdt/sys/compat/linprocfs/linprocfs.c#3 integrate
.. //depot/projects/fdt/sys/compat/linux/linux_file.c#3 integrate
.. //depot/projects/fdt/sys/compat/linux/linux_ioctl.c#5 integrate
.. //depot/projects/fdt/sys/compat/linux/linux_stats.c#3 integrate
.. //depot/projects/fdt/sys/compat/svr4/svr4_stat.c#2 integrate
.. //depot/projects/fdt/sys/compat/x86bios/x86bios.c#3 integrate
.. //depot/projects/fdt/sys/conf/NOTES#13 integrate
.. //depot/projects/fdt/sys/conf/files#21 integrate
.. //depot/projects/fdt/sys/conf/kern.post.mk#2 integrate
.. //depot/projects/fdt/sys/conf/kmod.mk#3 integrate
.. //depot/projects/fdt/sys/conf/options#9 integrate
.. //depot/projects/fdt/sys/dev/ahci/ahci.c#11 integrate
.. //depot/projects/fdt/sys/dev/ata/ata-all.h#5 integrate
.. //depot/projects/fdt/sys/dev/ata/ata-raid.c#5 integrate
.. //depot/projects/fdt/sys/dev/bce/if_bce.c#4 integrate
.. //depot/projects/fdt/sys/dev/bce/if_bcefw.h#2 integrate
.. //depot/projects/fdt/sys/dev/bce/if_bcereg.h#3 integrate
.. //depot/projects/fdt/sys/dev/bge/if_bge.c#12 integrate
.. //depot/projects/fdt/sys/dev/bktr/ioctl_bt848.h#2 integrate
.. //depot/projects/fdt/sys/dev/bktr/ioctl_meteor.h#2 integrate
.. //depot/projects/fdt/sys/dev/cxgb/common/cxgb_ael1002.c#4 integrate
.. //depot/projects/fdt/sys/dev/cxgb/common/cxgb_common.h#4 integrate
.. //depot/projects/fdt/sys/dev/cxgb/common/cxgb_t3_hw.c#4 integrate
.. //depot/projects/fdt/sys/dev/cxgb/cxgb_adapter.h#4 integrate
.. //depot/projects/fdt/sys/dev/cxgb/cxgb_main.c#7 integrate
.. //depot/projects/fdt/sys/dev/cxgb/cxgb_sge.c#6 integrate
.. //depot/projects/fdt/sys/dev/e1000/e1000_80003es2lan.c#4 integrate
.. //depot/projects/fdt/sys/dev/e1000/e1000_82571.c#4 integrate
.. //depot/projects/fdt/sys/dev/e1000/e1000_82575.c#4 integrate
.. //depot/projects/fdt/sys/dev/e1000/e1000_82575.h#4 integrate
.. //depot/projects/fdt/sys/dev/e1000/e1000_defines.h#4 integrate
.. //depot/projects/fdt/sys/dev/e1000/e1000_hw.h#4 integrate
.. //depot/projects/fdt/sys/dev/e1000/e1000_ich8lan.c#4 integrate
.. //depot/projects/fdt/sys/dev/e1000/e1000_ich8lan.h#4 integrate
.. //depot/projects/fdt/sys/dev/e1000/e1000_mac.c#4 integrate
.. //depot/projects/fdt/sys/dev/e1000/e1000_manage.c#4 integrate
.. //depot/projects/fdt/sys/dev/e1000/e1000_phy.c#4 integrate
.. //depot/projects/fdt/sys/dev/e1000/e1000_regs.h#4 integrate
.. //depot/projects/fdt/sys/dev/e1000/if_em.c#7 integrate
.. //depot/projects/fdt/sys/dev/e1000/if_em.h#4 integrate
.. //depot/projects/fdt/sys/dev/e1000/if_igb.c#8 integrate
.. //depot/projects/fdt/sys/dev/e1000/if_igb.h#4 integrate
.. //depot/projects/fdt/sys/dev/e1000/if_lem.c#1 branch
.. //depot/projects/fdt/sys/dev/e1000/if_lem.h#1 branch
.. //depot/projects/fdt/sys/dev/fb/vesa.c#8 integrate
.. //depot/projects/fdt/sys/dev/fb/vga.c#3 integrate
.. //depot/projects/fdt/sys/dev/firewire/sbp.c#3 integrate
.. //depot/projects/fdt/sys/dev/hwpmc/hwpmc_logging.c#4 integrate
.. //depot/projects/fdt/sys/dev/isp/isp.c#7 integrate
.. //depot/projects/fdt/sys/dev/isp/isp_freebsd.c#5 integrate
.. //depot/projects/fdt/sys/dev/isp/isp_freebsd.h#3 integrate
.. //depot/projects/fdt/sys/dev/isp/isp_library.c#6 integrate
.. //depot/projects/fdt/sys/dev/isp/isp_pci.c#4 integrate
.. //depot/projects/fdt/sys/dev/isp/isp_sbus.c#4 integrate
.. //depot/projects/fdt/sys/dev/isp/ispvar.h#3 integrate
.. //depot/projects/fdt/sys/dev/ixgbe/LICENSE#2 integrate
.. //depot/projects/fdt/sys/dev/ixgbe/ixgbe.c#6 integrate
.. //depot/projects/fdt/sys/dev/ixgbe/ixgbe.h#3 integrate
.. //depot/projects/fdt/sys/dev/ixgbe/ixgbe_82598.c#3 integrate
.. //depot/projects/fdt/sys/dev/ixgbe/ixgbe_82599.c#3 integrate
.. //depot/projects/fdt/sys/dev/ixgbe/ixgbe_api.c#3 integrate
.. //depot/projects/fdt/sys/dev/ixgbe/ixgbe_api.h#3 integrate
.. //depot/projects/fdt/sys/dev/ixgbe/ixgbe_common.c#3 integrate
.. //depot/projects/fdt/sys/dev/ixgbe/ixgbe_phy.c#3 integrate
.. //depot/projects/fdt/sys/dev/ixgbe/ixgbe_phy.h#3 integrate
.. //depot/projects/fdt/sys/dev/ixgbe/ixgbe_type.h#3 integrate
.. //depot/projects/fdt/sys/dev/malo/if_malo.c#4 integrate
.. //depot/projects/fdt/sys/dev/mii/brgphy.c#6 integrate
.. //depot/projects/fdt/sys/dev/mii/brgphyreg.h#2 integrate
.. //depot/projects/fdt/sys/dev/mii/mii.c#3 integrate
.. //depot/projects/fdt/sys/dev/mii/miidevs#6 integrate
.. //depot/projects/fdt/sys/dev/mpt/mpt_cam.c#3 integrate
.. //depot/projects/fdt/sys/dev/mxge/if_mxge.c#7 integrate
.. //depot/projects/fdt/sys/dev/ofw/ofw_standard.c#3 integrate
.. //depot/projects/fdt/sys/dev/ppc/ppc_pci.c#2 integrate
.. //depot/projects/fdt/sys/dev/siis/siis.c#10 integrate
.. //depot/projects/fdt/sys/dev/sound/pci/envy24.c#2 integrate
.. //depot/projects/fdt/sys/dev/sound/pci/envy24.h#2 integrate
.. //depot/projects/fdt/sys/dev/sound/pci/envy24ht.c#2 integrate
.. //depot/projects/fdt/sys/dev/sound/pci/envy24ht.h#2 integrate
.. //depot/projects/fdt/sys/dev/sound/pci/hda/hdac.c#8 integrate
.. //depot/projects/fdt/sys/dev/sound/pci/spicds.c#2 integrate
.. //depot/projects/fdt/sys/dev/sound/pci/spicds.h#2 integrate
.. //depot/projects/fdt/sys/dev/sound/pcm/dsp.c#4 integrate
.. //depot/projects/fdt/sys/dev/syscons/scvgarndr.c#2 integrate
.. //depot/projects/fdt/sys/dev/syscons/scvidctl.c#4 integrate
.. //depot/projects/fdt/sys/dev/syscons/syscons.c#5 integrate
.. //depot/projects/fdt/sys/dev/ubsec/ubsec.c#2 integrate
.. //depot/projects/fdt/sys/dev/usb/controller/ehci_pci.c#7 integrate
.. //depot/projects/fdt/sys/dev/usb/controller/ohci_pci.c#4 integrate
.. //depot/projects/fdt/sys/dev/usb/controller/ohci_s3c24x0.c#1 branch
.. //depot/projects/fdt/sys/dev/usb/input/ukbd.c#7 integrate
.. //depot/projects/fdt/sys/dev/usb/quirk/usb_quirk.c#7 integrate
.. //depot/projects/fdt/sys/dev/usb/usb_compat_linux.c#3 integrate
.. //depot/projects/fdt/sys/dev/usb/usbdevs#12 integrate
.. //depot/projects/fdt/sys/fs/nfs/nfs_commonport.c#3 integrate
.. //depot/projects/fdt/sys/fs/nfs/nfs_commonsubs.c#3 integrate
.. //depot/projects/fdt/sys/fs/nfs/nfs_var.h#5 integrate
.. //depot/projects/fdt/sys/fs/nfs/nfsport.h#3 integrate
.. //depot/projects/fdt/sys/fs/nfs/nfsrvstate.h#2 integrate
.. //depot/projects/fdt/sys/fs/nfsserver/nfs_nfsdport.c#5 integrate
.. //depot/projects/fdt/sys/fs/nfsserver/nfs_nfsdstate.c#4 integrate
.. //depot/projects/fdt/sys/geom/gate/g_gate.c#4 integrate
.. //depot/projects/fdt/sys/geom/geom_dump.c#3 integrate
.. //depot/projects/fdt/sys/geom/geom_io.c#3 integrate
.. //depot/projects/fdt/sys/geom/geom_vfs.c#2 integrate
.. //depot/projects/fdt/sys/geom/multipath/g_multipath.c#3 integrate
.. //depot/projects/fdt/sys/i386/acpica/acpi_machdep.c#2 integrate
.. //depot/projects/fdt/sys/i386/conf/GENERIC#7 integrate
.. //depot/projects/fdt/sys/i386/i386/apic_vector.s#2 integrate
.. //depot/projects/fdt/sys/i386/i386/local_apic.c#4 integrate
.. //depot/projects/fdt/sys/i386/i386/machdep.c#4 integrate
.. //depot/projects/fdt/sys/i386/i386/mca.c#5 integrate
.. //depot/projects/fdt/sys/i386/i386/pmap.c#10 integrate
.. //depot/projects/fdt/sys/i386/i386/trap.c#5 integrate
.. //depot/projects/fdt/sys/i386/ibcs2/ibcs2_stat.c#2 integrate
.. //depot/projects/fdt/sys/i386/include/apicvar.h#4 integrate
.. //depot/projects/fdt/sys/i386/include/md_var.h#2 integrate
.. //depot/projects/fdt/sys/i386/include/specialreg.h#4 integrate
.. //depot/projects/fdt/sys/i386/linux/linux.h#2 integrate
.. //depot/projects/fdt/sys/i386/linux/linux_sysvec.c#2 integrate
.. //depot/projects/fdt/sys/ia64/conf/GENERIC#6 integrate
.. //depot/projects/fdt/sys/ia64/ia32/ia32_signal.c#2 integrate
.. //depot/projects/fdt/sys/ia64/ia64/autoconf.c#2 integrate
.. //depot/projects/fdt/sys/ia64/ia64/clock.c#4 integrate
.. //depot/projects/fdt/sys/ia64/ia64/db_machdep.c#3 integrate
.. //depot/projects/fdt/sys/ia64/ia64/exception.S#7 integrate
.. //depot/projects/fdt/sys/ia64/ia64/highfp.c#2 integrate
.. //depot/projects/fdt/sys/ia64/ia64/interrupt.c#8 integrate
.. //depot/projects/fdt/sys/ia64/ia64/locore.S#3 integrate
.. //depot/projects/fdt/sys/ia64/ia64/machdep.c#9 integrate
.. //depot/projects/fdt/sys/ia64/ia64/mp_machdep.c#5 integrate
.. //depot/projects/fdt/sys/ia64/ia64/nexus.c#5 integrate
.. //depot/projects/fdt/sys/ia64/ia64/pmap.c#5 integrate
.. //depot/projects/fdt/sys/ia64/ia64/sal.c#2 integrate
.. //depot/projects/fdt/sys/ia64/ia64/sapic.c#4 integrate
.. //depot/projects/fdt/sys/ia64/ia64/trap.c#6 integrate
.. //depot/projects/fdt/sys/ia64/include/acpica_machdep.h#2 integrate
.. //depot/projects/fdt/sys/ia64/include/clock.h#3 integrate
.. //depot/projects/fdt/sys/ia64/include/cpufunc.h#4 integrate
.. //depot/projects/fdt/sys/ia64/include/frame.h#2 integrate
.. //depot/projects/fdt/sys/ia64/include/intr.h#4 integrate
.. //depot/projects/fdt/sys/ia64/include/intrcnt.h#2 integrate
.. //depot/projects/fdt/sys/ia64/include/nexusvar.h#2 delete
.. //depot/projects/fdt/sys/ia64/include/pcb.h#2 integrate
.. //depot/projects/fdt/sys/ia64/include/pcpu.h#4 integrate
.. //depot/projects/fdt/sys/ia64/include/smp.h#2 integrate
.. //depot/projects/fdt/sys/ia64/pci/pci_cfgreg.c#3 integrate
.. //depot/projects/fdt/sys/kern/imgact_elf.c#4 integrate
.. //depot/projects/fdt/sys/kern/kern_alq.c#2 integrate
.. //depot/projects/fdt/sys/kern/kern_event.c#4 integrate
.. //depot/projects/fdt/sys/kern/kern_exec.c#2 integrate
.. //depot/projects/fdt/sys/kern/kern_rwlock.c#2 integrate
.. //depot/projects/fdt/sys/kern/kern_syscalls.c#2 integrate
.. //depot/projects/fdt/sys/kern/subr_eventhandler.c#3 integrate
.. //depot/projects/fdt/sys/kern/sys_pipe.c#2 integrate
.. //depot/projects/fdt/sys/kern/sysv_ipc.c#2 integrate
.. //depot/projects/fdt/sys/kern/sysv_msg.c#2 integrate
.. //depot/projects/fdt/sys/kern/sysv_sem.c#2 integrate
.. //depot/projects/fdt/sys/kern/sysv_shm.c#2 integrate
.. //depot/projects/fdt/sys/kern/tty_pts.c#4 integrate
.. //depot/projects/fdt/sys/kern/uipc_mqueue.c#2 integrate
.. //depot/projects/fdt/sys/kern/uipc_sem.c#3 integrate
.. //depot/projects/fdt/sys/kern/uipc_shm.c#2 integrate
.. //depot/projects/fdt/sys/kern/uipc_syscalls.c#5 integrate
.. //depot/projects/fdt/sys/kern/vfs_aio.c#3 integrate
.. //depot/projects/fdt/sys/kern/vfs_lookup.c#4 integrate
.. //depot/projects/fdt/sys/kern/vfs_syscalls.c#7 integrate
.. //depot/projects/fdt/sys/kern/vfs_vnops.c#4 integrate
.. //depot/projects/fdt/sys/mips/conf/AR71XX#5 integrate
.. //depot/projects/fdt/sys/mips/include/clock.h#2 integrate
.. //depot/projects/fdt/sys/mips/include/cpufunc.h#4 integrate
.. //depot/projects/fdt/sys/mips/include/db_machdep.h#3 integrate
.. //depot/projects/fdt/sys/mips/include/trap.h#4 integrate
.. //depot/projects/fdt/sys/mips/mips/db_trace.c#5 integrate
.. //depot/projects/fdt/sys/mips/mips/exception.S#8 integrate
.. //depot/projects/fdt/sys/mips/mips/nexus.c#4 integrate
.. //depot/projects/fdt/sys/mips/mips/pm_machdep.c#3 integrate
.. //depot/projects/fdt/sys/mips/mips/pmap.c#8 integrate
.. //depot/projects/fdt/sys/mips/mips/support.S#4 integrate
.. //depot/projects/fdt/sys/mips/mips/tick.c#5 integrate
.. //depot/projects/fdt/sys/mips/mips/trap.c#6 integrate
.. //depot/projects/fdt/sys/mips/sibyte/sb_asm.S#3 integrate
.. //depot/projects/fdt/sys/mips/sibyte/sb_machdep.c#5 integrate
.. //depot/projects/fdt/sys/mips/sibyte/sb_scd.c#3 integrate
.. //depot/projects/fdt/sys/mips/sibyte/sb_scd.h#3 integrate
.. //depot/projects/fdt/sys/modules/Makefile#8 integrate
.. //depot/projects/fdt/sys/modules/alq/Makefile#1 branch
.. //depot/projects/fdt/sys/modules/dummynet/Makefile#2 integrate
.. //depot/projects/fdt/sys/modules/em/Makefile#2 integrate
.. //depot/projects/fdt/sys/modules/ixgbe/Makefile#2 integrate
.. //depot/projects/fdt/sys/net/bpf.c#4 integrate
.. //depot/projects/fdt/sys/net/flowtable.c#4 integrate
.. //depot/projects/fdt/sys/net/if_llatbl.c#4 integrate
.. //depot/projects/fdt/sys/net/if_media.h#2 integrate
.. //depot/projects/fdt/sys/net/if_vlan.c#5 integrate
.. //depot/projects/fdt/sys/net/vnet.c#3 integrate
.. //depot/projects/fdt/sys/net/vnet.h#3 integrate
.. //depot/projects/fdt/sys/net80211/ieee80211.c#4 integrate
.. //depot/projects/fdt/sys/net80211/ieee80211_adhoc.c#3 integrate
.. //depot/projects/fdt/sys/net80211/ieee80211_hostap.c#4 integrate
.. //depot/projects/fdt/sys/net80211/ieee80211_ht.c#2 integrate
.. //depot/projects/fdt/sys/net80211/ieee80211_mesh.c#4 integrate
.. //depot/projects/fdt/sys/net80211/ieee80211_sta.c#5 integrate
.. //depot/projects/fdt/sys/net80211/ieee80211_var.h#4 integrate
.. //depot/projects/fdt/sys/netgraph/netflow/ng_netflow.c#2 integrate
.. //depot/projects/fdt/sys/netinet/ip_divert.c#6 integrate
.. //depot/projects/fdt/sys/netinet/ip_input.c#4 integrate
.. //depot/projects/fdt/sys/netinet/ipfw/dn_sched.h#2 integrate
.. //depot/projects/fdt/sys/netinet/ipfw/dn_sched_prio.c#1 branch
.. //depot/projects/fdt/sys/netinet/ipfw/ip_dn_io.c#3 integrate
.. //depot/projects/fdt/sys/netinet/ipfw/ip_fw_private.h#7 integrate
.. //depot/projects/fdt/sys/netinet/ipfw/ip_fw_sockopt.c#8 integrate
.. //depot/projects/fdt/sys/netinet/ipfw/ip_fw_table.c#7 integrate
.. //depot/projects/fdt/sys/netinet/ipfw/test/Makefile#2 integrate
.. //depot/projects/fdt/sys/netinet/raw_ip.c#7 integrate
.. //depot/projects/fdt/sys/netinet/sctp_indata.c#4 integrate
.. //depot/projects/fdt/sys/netinet/sctp_input.c#6 integrate
.. //depot/projects/fdt/sys/netinet/sctp_output.c#6 integrate
.. //depot/projects/fdt/sys/netinet/sctp_pcb.c#5 integrate
.. //depot/projects/fdt/sys/netinet/sctp_pcb.h#2 integrate
.. //depot/projects/fdt/sys/netinet/sctp_sysctl.c#3 integrate
.. //depot/projects/fdt/sys/netinet/sctp_uio.h#3 integrate
.. //depot/projects/fdt/sys/netinet/sctputil.c#6 integrate
.. //depot/projects/fdt/sys/netinet/sctputil.h#2 integrate
.. //depot/projects/fdt/sys/netinet/tcp_subr.c#3 integrate
.. //depot/projects/fdt/sys/netinet/tcp_timer.c#3 integrate
.. //depot/projects/fdt/sys/netinet/udp_usrreq.c#3 integrate
.. //depot/projects/fdt/sys/netinet6/nd6.c#6 integrate
.. //depot/projects/fdt/sys/netipsec/key.c#3 integrate
.. //depot/projects/fdt/sys/nfsserver/nfs_srvsubs.c#3 integrate
.. //depot/projects/fdt/sys/pc98/pc98/machdep.c#3 integrate
.. //depot/projects/fdt/sys/powerpc/aim/machdep.c#5 integrate
.. //depot/projects/fdt/sys/powerpc/aim/mmu_oea64.c#9 integrate
.. //depot/projects/fdt/sys/powerpc/aim/nexus.c#2 integrate
.. //depot/projects/fdt/sys/powerpc/aim/ofw_machdep.c#3 integrate
.. //depot/projects/fdt/sys/powerpc/booke/interrupt.c#3 integrate
.. //depot/projects/fdt/sys/powerpc/booke/machdep.c#8 integrate
.. //depot/projects/fdt/sys/powerpc/booke/trap_subr.S#2 integrate
.. //depot/projects/fdt/sys/powerpc/mpc85xx/ocpbus.c#3 integrate
.. //depot/projects/fdt/sys/powerpc/mpc85xx/ocpbus.h#2 integrate
.. //depot/projects/fdt/sys/powerpc/mpc85xx/pci_ocp.c#4 integrate
.. //depot/projects/fdt/sys/powerpc/ofw/ofw_real.c#3 integrate
.. //depot/projects/fdt/sys/powerpc/ofw/ofw_syscons.c#3 integrate
.. //depot/projects/fdt/sys/powerpc/powermac/cuda.c#2 integrate
.. //depot/projects/fdt/sys/powerpc/powermac/cudavar.h#2 integrate
.. //depot/projects/fdt/sys/powerpc/powermac/pmu.c#2 integrate
.. //depot/projects/fdt/sys/powerpc/powermac/smu.c#4 integrate
.. //depot/projects/fdt/sys/powerpc/powermac/uninorth.c#2 integrate
.. //depot/projects/fdt/sys/powerpc/powerpc/cpu.c#6 integrate
.. //depot/projects/fdt/sys/rpc/svc.c#2 integrate
.. //depot/projects/fdt/sys/sparc64/include/dcr.h#2 integrate
.. //depot/projects/fdt/sys/sparc64/include/tlb.h#2 integrate
.. //depot/projects/fdt/sys/sparc64/include/tte.h#2 integrate
.. //depot/projects/fdt/sys/sparc64/include/ver.h#3 integrate
.. //depot/projects/fdt/sys/sparc64/include/wstate.h#2 integrate
.. //depot/projects/fdt/sys/sparc64/pci/schizo.c#3 integrate
.. //depot/projects/fdt/sys/sparc64/pci/schizovar.h#3 integrate
.. //depot/projects/fdt/sys/sparc64/sparc64/cheetah.c#3 integrate
.. //depot/projects/fdt/sys/sparc64/sparc64/exception.S#2 integrate
.. //depot/projects/fdt/sys/sparc64/sparc64/genassym.c#3 integrate
.. //depot/projects/fdt/sys/sparc64/sparc64/locore.S#3 integrate
.. //depot/projects/fdt/sys/sparc64/sparc64/machdep.c#6 integrate
.. //depot/projects/fdt/sys/sparc64/sparc64/pmap.c#4 integrate
.. //depot/projects/fdt/sys/sparc64/sparc64/support.S#2 integrate
.. //depot/projects/fdt/sys/sparc64/sparc64/swtch.S#3 integrate
.. //depot/projects/fdt/sys/sun4v/sun4v/machdep.c#2 integrate
.. //depot/projects/fdt/sys/sys/_timespec.h#2 integrate
.. //depot/projects/fdt/sys/sys/eventhandler.h#3 integrate
.. //depot/projects/fdt/sys/sys/imgact.h#3 integrate
.. //depot/projects/fdt/sys/sys/param.h#10 integrate
.. //depot/projects/fdt/sys/sys/pcpu.h#3 integrate
.. //depot/projects/fdt/sys/sys/stat.h#2 integrate
.. //depot/projects/fdt/sys/sys/sysent.h#3 integrate
.. //depot/projects/fdt/sys/sys/timespec.h#2 integrate
.. //depot/projects/fdt/sys/sys/vtoc.h#2 integrate
.. //depot/projects/fdt/sys/vm/uma_int.h#3 integrate
.. //depot/projects/fdt/sys/vm/vm_mmap.c#2 integrate
.. //depot/projects/fdt/tools/build/mk/OptionalObsoleteFiles.inc#7 integrate
.. //depot/projects/fdt/tools/build/options/WITH_GNU_CPIO#2 delete
.. //depot/projects/fdt/tools/regression/usr.bin/ncal/regress.sh#2 integrate
.. //depot/projects/fdt/tools/tools/nanobsd/Files/root/updatep1#2 integrate
.. //depot/projects/fdt/tools/tools/nanobsd/Files/root/updatep2#2 integrate
.. //depot/projects/fdt/usr.bin/biff/biff.1#2 integrate
.. //depot/projects/fdt/usr.bin/calendar/Makefile#3 integrate
.. //depot/projects/fdt/usr.bin/calendar/calendar.1#2 integrate
.. //depot/projects/fdt/usr.bin/calendar/calendar.c#3 integrate
.. //depot/projects/fdt/usr.bin/calendar/calendar.h#2 integrate
.. //depot/projects/fdt/usr.bin/calendar/calendars/calendar.australia#2 integrate
.. //depot/projects/fdt/usr.bin/calendar/calendars/calendar.dutch#3 integrate
.. //depot/projects/fdt/usr.bin/calendar/calendars/calendar.freebsd#5 integrate
.. //depot/projects/fdt/usr.bin/calendar/dates.c#1 branch
.. //depot/projects/fdt/usr.bin/calendar/day.c#3 integrate
.. //depot/projects/fdt/usr.bin/calendar/events.c#1 branch
.. //depot/projects/fdt/usr.bin/calendar/io.c#3 integrate
.. //depot/projects/fdt/usr.bin/calendar/locale.c#1 branch
.. //depot/projects/fdt/usr.bin/calendar/ostern.c#4 integrate
.. //depot/projects/fdt/usr.bin/calendar/parsedata.c#1 branch
.. //depot/projects/fdt/usr.bin/calendar/paskha.c#3 integrate
.. //depot/projects/fdt/usr.bin/calendar/pathnames.h#2 integrate
.. //depot/projects/fdt/usr.bin/calendar/pom.c#1 branch
.. //depot/projects/fdt/usr.bin/calendar/sunpos.c#1 branch
.. //depot/projects/fdt/usr.bin/compress/compress.c#2 integrate
.. //depot/projects/fdt/usr.bin/cpio/Makefile#4 integrate
.. //depot/projects/fdt/usr.bin/find/find.1#2 integrate
.. //depot/projects/fdt/usr.bin/gzip/gzip.c#2 integrate
.. //depot/projects/fdt/usr.bin/kdump/kdump.c#6 integrate
.. //depot/projects/fdt/usr.bin/mail/util.c#2 integrate
.. //depot/projects/fdt/usr.bin/minigzip/Makefile#3 integrate
.. //depot/projects/fdt/usr.bin/ncal/ncal.1#4 integrate
.. //depot/projects/fdt/usr.bin/ncal/ncal.c#5 integrate
.. //depot/projects/fdt/usr.bin/sockstat/sockstat.c#3 integrate
.. //depot/projects/fdt/usr.bin/touch/touch.c#2 integrate
.. //depot/projects/fdt/usr.sbin/bsnmpd/modules/snmp_pf/BEGEMOT-PF-MIB.txt#2 integrate
.. //depot/projects/fdt/usr.sbin/bsnmpd/modules/snmp_pf/Makefile#3 integrate
.. //depot/projects/fdt/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c#3 integrate
.. //depot/projects/fdt/usr.sbin/bsnmpd/modules/snmp_pf/pf_tree.def#2 integrate
.. //depot/projects/fdt/usr.sbin/config/config.y#2 integrate
.. //depot/projects/fdt/usr.sbin/config/lang.l#3 integrate
.. //depot/projects/fdt/usr.sbin/config/main.c#2 integrate
.. //depot/projects/fdt/usr.sbin/config/mkmakefile.c#2 integrate
.. //depot/projects/fdt/usr.sbin/config/mkoptions.c#2 integrate
.. //depot/projects/fdt/usr.sbin/jls/jls.c#3 integrate
.. //depot/projects/fdt/usr.sbin/lastlogin/lastlogin.c#6 integrate
.. //depot/projects/fdt/usr.sbin/mailwrapper/mailwrapper.8#2 integrate
.. //depot/projects/fdt/usr.sbin/mailwrapper/mailwrapper.c#2 integrate
.. //depot/projects/fdt/usr.sbin/mtree/compare.c#2 integrate
.. //depot/projects/fdt/usr.sbin/mtree/create.c#2 integrate
.. //depot/projects/fdt/usr.sbin/mtree/mtree.8#2 integrate
.. //depot/projects/fdt/usr.sbin/pmcstat/pmcpl_calltree.c#3 integrate
.. //depot/projects/fdt/usr.sbin/pmcstat/pmcstat_log.c#5 integrate
.. //depot/projects/fdt/usr.sbin/ppp/arp.c#2 integrate
.. //depot/projects/fdt/usr.sbin/sysinstall/sysinstall.8#3 integrate
.. //depot/projects/fdt/usr.sbin/vidcontrol/vidcontrol.c#3 integrate
.. //depot/projects/fdt/usr.sbin/zic/Makefile#2 integrate

Differences ...

==== //depot/projects/fdt/MAINTAINERS#5 (text+ko) ====

@@ -1,4 +1,4 @@
-$FreeBSD: src/MAINTAINERS,v 1.157 2010/02/18 21:14:29 edwin Exp $
+$FreeBSD: src/MAINTAINERS,v 1.160 2010/03/26 12:59:15 des Exp $
 
 Please note that the content of this file is strictly advisory.
 No locks listed here are valid.  The only strict review requirements
@@ -36,8 +36,6 @@
 cdboot		jhb	Pre-commit review requested.
 pxeboot		jhb	Pre-commit review requested.
 witness		jhb	Pre-commit review requested.
-twe		aradford at amcc.com	Pre-commit review requested
-twa		aradford at amcc.com	Pre-commit review requested
 CAM		gibbs,
 		ken	Pre-commit review requested. send to scsi at freebsd.org
 devstat(9)	ken	Pre-commit review requested.
@@ -59,15 +57,12 @@
 fetch		des	Advance notification requested.
 libpam		des	Pre-commit review requested.
 openssh		des	Pre-commit review requested.
-pseudofs	des	Advance notification requested.
-procfs		des	Advance notification requested.
-linprocfs	des	Advance notification requested.
+pseudofs	des	Pre-commit review requested.
+procfs		des	Pre-commit review requested.
+linprocfs	des	Pre-commit review requested.
 lpr		gad	Pre-commit review requested, particularly for
 			lpd/recvjob.c and lpd/printjob.c.
 newsyslog(8)	gad	Heads-up appreciated.  I'm going thru the PR's for it.
-pkill		gad	Heads-up appreciated.
-ps		gad	I am working on a number of changes to this.  Would
-			like advance notice of major changes planned to it.
 cvs		peter	Heads-up appreciated, try not to break it.
 nvi		peter	Try not to break it.
 libz		peter	Try not to break it.
@@ -76,9 +71,6 @@
 			offer a pre-commit review for anything non-trivial.
 ipfw		ipfw	Pre-commit review preferred. send to ipfw at freebsd.org
 drm		rnoland	Just keep me informed of changes, try not to break it.
-libufs		jmallett	Willing to handle problems, help with work.
-fdc(4)		joerg	Just keep me informed of changes, try not to break it.
-sppp(4)		joerg	Just keep me informed of changes, try not to break it.
 unifdef(1)	fanf	Pre-commit review requested.
 ntp         	roberto	Pre-commit review requested.
 inetd		dwmalone	Recommends pre-commit review.
@@ -144,4 +136,3 @@
 sys/modules/3dfx/Makefile:MAINTAINER=	cokane at FreeBSD.org
 sys/modules/urio/Makefile:MAINTAINER=	Iwasa Kazmi <kzmi at ca2.so-net.ne.jp>
 tools/tools/sysdoc/Makefile:MAINTAINER=	trhodes at FreeBSD.org
-usr.sbin/zic/Makefile:MAINTAINER=	wollman at FreeBSD.org

==== //depot/projects/fdt/Makefile#7 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile,v 1.364 2010/03/03 21:08:44 imp Exp $
+# $FreeBSD: src/Makefile,v 1.365 2010/03/18 18:58:17 dougb Exp $
 #
 # The user-driven targets are:
 #
@@ -312,6 +312,7 @@
 	    "check _.${target}.buildworld for details" | ${MAKEFAIL}))
 	@echo ">> ${target} buildworld completed on `LC_ALL=C date`"
 .endif
+.if !defined(MAKE_JUST_WORLDS)
 .if exists(${.CURDIR}/sys/${target}/conf/NOTES)
 	@(cd ${.CURDIR}/sys/${target}/conf && env __MAKE_CONF=/dev/null \
 	    ${MAKE} LINT > ${.CURDIR}/_.${target}.makeLINT 2>&1 || \
@@ -320,6 +321,7 @@
 .endif
 	@cd ${.CURDIR} && ${MAKE} ${.MAKEFLAGS} TARGET=${target} \
 	    universe_kernels
+.endif
 	@echo ">> ${target} completed on `LC_ALL=C date`"
 .endfor
 universe_kernels: universe_kernconfs

==== //depot/projects/fdt/Makefile.inc1#13 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile.inc1,v 1.641 2010/03/07 14:55:43 antoine Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.642 2010/03/24 18:40:57 delphij Exp $
 #
 # Make command line options:
 #	-DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -283,6 +283,7 @@
 		VERSION="${VERSION}" \
 		MACHINE=i386 \
 		MACHINE_ARCH=i386 \
+		MACHINE_CPU="i686 mmx sse sse2" \
 		INSTALL="sh ${.CURDIR}/tools/install.sh" \
 		PATH=${TMPPATH} \
 		CC="${CC} ${LIB32FLAGS}" \

==== //depot/projects/fdt/ObsoleteFiles.inc#11 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.229 2010/03/14 10:18:58 ed Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.232 2010/03/27 03:17:39 marcel Exp $
 #
 # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
 # directories (OLD_DIRS) which should get removed at an update. Recently
@@ -14,6 +14,19 @@
 # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
 #
 
+# 20100326: [ia64] removed <machine/nexusvar.h>
+.if ${TARGET_ARCH} == "ia64"
+OLD_FILES+=usr/include/machine/nexusvar.h
+.endif
+# 20100326: gcpio removal
+OLD_FILES+=usr/bin/gcpio
+OLD_FILES+=usr/share/info/cpio.info.gz
+OLD_FILES+=usr/share/man/man1/gcpio.1.gz
+# 20100322: libz update
+OLD_LIBS+=lib/libz.so.5
+.if ${TARGET_ARCH} == "amd64"
+OLD_LIBS+=usr/lib32/libz.so.5
+.endif
 # 20100314: removal of regexp.h
 OLD_FILES+=usr/include/regexp.h
 OLD_FILES+=usr/share/man/man3/regexp.3.gz

==== //depot/projects/fdt/bin/cp/utils.c#3 (text+ko) ====

@@ -33,7 +33,7 @@
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.60 2010/01/17 09:37:31 gavin Exp $");
+__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.61 2010/03/28 13:16:08 ed Exp $");
 
 #include <sys/types.h>
 #include <sys/acl.h>
@@ -323,8 +323,8 @@
 	fs->st_mode &= S_ISUID | S_ISGID | S_ISVTX |
 		       S_IRWXU | S_IRWXG | S_IRWXO;
 
-	TIMESPEC_TO_TIMEVAL(&tv[0], &fs->st_atimespec);
-	TIMESPEC_TO_TIMEVAL(&tv[1], &fs->st_mtimespec);
+	TIMESPEC_TO_TIMEVAL(&tv[0], &fs->st_atim);
+	TIMESPEC_TO_TIMEVAL(&tv[1], &fs->st_mtim);
 	if (islink ? lutimes(to.p_path, tv) : utimes(to.p_path, tv)) {
 		warn("%sutimes: %s", islink ? "l" : "", to.p_path);
 		rval = 1;

==== //depot/projects/fdt/bin/ls/cmp.c#2 (text+ko) ====

@@ -36,7 +36,7 @@
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/ls/cmp.c,v 1.18 2006/03/24 16:38:02 jhb Exp $");
+__FBSDID("$FreeBSD: src/bin/ls/cmp.c,v 1.19 2010/03/28 13:16:08 ed Exp $");
 
 
 #include <sys/types.h>
@@ -66,17 +66,17 @@
 modcmp(const FTSENT *a, const FTSENT *b)
 {
 
-	if (b->fts_statp->st_mtimespec.tv_sec >
-	    a->fts_statp->st_mtimespec.tv_sec)
+	if (b->fts_statp->st_mtim.tv_sec >
+	    a->fts_statp->st_mtim.tv_sec)
 		return (1);
-	if (b->fts_statp->st_mtimespec.tv_sec <
-	    a->fts_statp->st_mtimespec.tv_sec)
+	if (b->fts_statp->st_mtim.tv_sec <
+	    a->fts_statp->st_mtim.tv_sec)
 		return (-1);
-	if (b->fts_statp->st_mtimespec.tv_nsec >
-	    a->fts_statp->st_mtimespec.tv_nsec)
+	if (b->fts_statp->st_mtim.tv_nsec >
+	    a->fts_statp->st_mtim.tv_nsec)
 		return (1);
-	if (b->fts_statp->st_mtimespec.tv_nsec <
-	    a->fts_statp->st_mtimespec.tv_nsec)
+	if (b->fts_statp->st_mtim.tv_nsec <
+	    a->fts_statp->st_mtim.tv_nsec)
 		return (-1);
 	return (strcoll(a->fts_name, b->fts_name));
 }
@@ -92,17 +92,17 @@
 acccmp(const FTSENT *a, const FTSENT *b)
 {
 
-	if (b->fts_statp->st_atimespec.tv_sec >
-	    a->fts_statp->st_atimespec.tv_sec)
+	if (b->fts_statp->st_atim.tv_sec >
+	    a->fts_statp->st_atim.tv_sec)
 		return (1);
-	if (b->fts_statp->st_atimespec.tv_sec <
-	    a->fts_statp->st_atimespec.tv_sec)
+	if (b->fts_statp->st_atim.tv_sec <
+	    a->fts_statp->st_atim.tv_sec)
 		return (-1);
-	if (b->fts_statp->st_atimespec.tv_nsec >
-	    a->fts_statp->st_atimespec.tv_nsec)
+	if (b->fts_statp->st_atim.tv_nsec >
+	    a->fts_statp->st_atim.tv_nsec)
 		return (1);
-	if (b->fts_statp->st_atimespec.tv_nsec <
-	    a->fts_statp->st_atimespec.tv_nsec)
+	if (b->fts_statp->st_atim.tv_nsec <
+	    a->fts_statp->st_atim.tv_nsec)
 		return (-1);
 	return (strcoll(a->fts_name, b->fts_name));
 }
@@ -118,17 +118,17 @@
 birthcmp(const FTSENT *a, const FTSENT *b)
 {
 
-	if (b->fts_statp->st_birthtimespec.tv_sec >
-	    a->fts_statp->st_birthtimespec.tv_sec)
+	if (b->fts_statp->st_birthtim.tv_sec >
+	    a->fts_statp->st_birthtim.tv_sec)
 		return (1);
-	if (b->fts_statp->st_birthtimespec.tv_sec <
-	    a->fts_statp->st_birthtimespec.tv_sec)
+	if (b->fts_statp->st_birthtim.tv_sec <
+	    a->fts_statp->st_birthtim.tv_sec)
 		return (-1);
-	if (b->fts_statp->st_birthtimespec.tv_nsec >
-	    a->fts_statp->st_birthtimespec.tv_nsec)
+	if (b->fts_statp->st_birthtim.tv_nsec >
+	    a->fts_statp->st_birthtim.tv_nsec)
 		return (1);
-	if (b->fts_statp->st_birthtimespec.tv_nsec <
-	    a->fts_statp->st_birthtimespec.tv_nsec)
+	if (b->fts_statp->st_birthtim.tv_nsec <
+	    a->fts_statp->st_birthtim.tv_nsec)
 		return (-1);
 	return (strcoll(a->fts_name, b->fts_name));
 }
@@ -144,17 +144,17 @@
 statcmp(const FTSENT *a, const FTSENT *b)
 {
 
-	if (b->fts_statp->st_ctimespec.tv_sec >
-	    a->fts_statp->st_ctimespec.tv_sec)
+	if (b->fts_statp->st_ctim.tv_sec >
+	    a->fts_statp->st_ctim.tv_sec)
 		return (1);
-	if (b->fts_statp->st_ctimespec.tv_sec <
-	    a->fts_statp->st_ctimespec.tv_sec)
+	if (b->fts_statp->st_ctim.tv_sec <
+	    a->fts_statp->st_ctim.tv_sec)
 		return (-1);
-	if (b->fts_statp->st_ctimespec.tv_nsec >
-	    a->fts_statp->st_ctimespec.tv_nsec)
+	if (b->fts_statp->st_ctim.tv_nsec >
+	    a->fts_statp->st_ctim.tv_nsec)
 		return (1);
-	if (b->fts_statp->st_ctimespec.tv_nsec <
-	    a->fts_statp->st_ctimespec.tv_nsec)
+	if (b->fts_statp->st_ctim.tv_nsec <
+	    a->fts_statp->st_ctim.tv_nsec)
 		return (-1);
 	return (strcoll(a->fts_name, b->fts_name));
 }

==== //depot/projects/fdt/bin/pax/Makefile#3 (text+ko) ====

@@ -1,5 +1,5 @@
 #       @(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD: src/bin/pax/Makefile,v 1.14 2010/02/07 17:05:22 imp Exp $
+# $FreeBSD: src/bin/pax/Makefile,v 1.15 2010/03/30 23:10:56 delphij Exp $
 
 # To install on versions prior to BSD 4.4 the following may have to be
 # defined with CFLAGS +=
@@ -29,8 +29,5 @@
 SRCS=	ar_io.c ar_subs.c buf_subs.c cache.c cpio.c file_subs.c ftree.c \
 	gen_subs.c getoldopt.c options.c pat_rep.c pax.c sel_subs.c \
 	tables.c tar.c tty_subs.c
-#XXX NOTYET
-#MAN=	pax.1 tar.1 cpio.1
-#LINKS=	${BINDIR}/pax ${BINDIR}/tar ${BINDIR}/pax ${BINDIR}/cpio
 
 .include <bsd.prog.mk>

==== //depot/projects/fdt/bin/pax/getoldopt.c#2 (text+ko) ====

@@ -1,4 +1,4 @@
-/*	$OpenBSD: getoldopt.c,v 1.4 2000/01/22 20:24:51 deraadt Exp $	*/
+/*	$OpenBSD: getoldopt.c,v 1.9 2009/10/27 23:59:22 deraadt Exp $	*/
 /*	$NetBSD: getoldopt.c,v 1.3 1995/03/21 09:07:28 cgd Exp $	*/
 
 /*-
@@ -7,11 +7,11 @@
  * otherwise, it uses the old rules used by tar, dump, and ps.
  *
  * Written 25 August 1985 by John Gilmore (ihnp4!hoptoad!gnu) and placed
- * in the Pubic Domain for your edification and enjoyment.
+ * in the Public Domain for your edification and enjoyment.
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/pax/getoldopt.c,v 1.5 2005/01/10 08:39:24 imp Exp $");
+__FBSDID("$FreeBSD: src/bin/pax/getoldopt.c,v 1.6 2010/03/30 23:14:35 delphij Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -33,7 +33,8 @@
 	optarg = NULL;
 
 	if (key == NULL) {		/* First time */
-		if (argc < 2) return EOF;
+		if (argc < 2)
+			return (-1);
 		key = argv[1];
 		if (*key == '-')

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


More information about the p4-projects mailing list