Date: Thu, 19 Mar 2009 22:16:22 GMT From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 159486 for review Message-ID: <200903192216.n2JMGMxF043830@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=159486 Change 159486 by peter@peter_daintree on 2009/03/19 22:16:22 IFC @159484 Affected files ... .. //depot/projects/hammer/Makefile#55 integrate .. //depot/projects/hammer/Makefile.inc1#144 integrate .. //depot/projects/hammer/ObsoleteFiles.inc#65 integrate .. //depot/projects/hammer/UPDATING#130 integrate .. //depot/projects/hammer/bin/cat/Makefile#2 integrate .. //depot/projects/hammer/bin/sh/miscbltin.c#9 integrate .. //depot/projects/hammer/cddl/Makefile.inc#6 integrate .. //depot/projects/hammer/cddl/lib/libzpool/Makefile#6 integrate .. //depot/projects/hammer/cddl/usr.bin/ztest/Makefile#6 integrate .. //depot/projects/hammer/cddl/usr.sbin/zdb/Makefile#6 integrate .. //depot/projects/hammer/contrib/csup/updater.c#5 integrate .. //depot/projects/hammer/contrib/gcc/c-cppbuiltin.c#3 integrate .. //depot/projects/hammer/contrib/gcc/c-decl.c#13 integrate .. //depot/projects/hammer/contrib/gcc/c-opts.c#5 integrate .. //depot/projects/hammer/contrib/gcc/c-tree.h#7 integrate .. //depot/projects/hammer/contrib/gcc/c-typeck.c#11 integrate .. //depot/projects/hammer/contrib/gcc/doc/extend.texi#10 integrate .. //depot/projects/hammer/contrib/libpcap/savefile.c#7 integrate .. //depot/projects/hammer/contrib/top/install#2 delete .. //depot/projects/hammer/contrib/top/install-sh#1 branch .. //depot/projects/hammer/contrib/wpa/hostapd/wme.h#2 integrate .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/ctrl_iface_unix.c#2 integrate .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/wpa_supplicant.conf#2 integrate .. //depot/projects/hammer/etc/defaults/rc.conf#94 integrate .. //depot/projects/hammer/etc/netstart#10 integrate .. //depot/projects/hammer/etc/network.subr#27 integrate .. //depot/projects/hammer/etc/rc.d/swap1#10 integrate .. //depot/projects/hammer/games/fortune/datfiles/fortunes#86 integrate .. //depot/projects/hammer/gnu/usr.bin/cc/Makefile.inc#5 integrate .. //depot/projects/hammer/include/arpa/inet.h#7 integrate .. //depot/projects/hammer/include/ctype.h#7 integrate .. //depot/projects/hammer/include/db.h#2 integrate .. //depot/projects/hammer/include/grp.h#5 integrate .. //depot/projects/hammer/include/ndbm.h#2 integrate .. //depot/projects/hammer/include/netdb.h#19 integrate .. //depot/projects/hammer/include/pthread.h#16 integrate .. //depot/projects/hammer/include/pwd.h#5 integrate .. //depot/projects/hammer/include/setjmp.h#3 integrate .. //depot/projects/hammer/include/signal.h#8 integrate .. //depot/projects/hammer/include/stdio.h#17 integrate .. //depot/projects/hammer/include/stdlib.h#19 integrate .. //depot/projects/hammer/include/string.h#13 integrate .. //depot/projects/hammer/include/unistd.h#29 integrate .. //depot/projects/hammer/lib/Makefile#76 integrate .. //depot/projects/hammer/lib/libarchive/Makefile#52 integrate .. //depot/projects/hammer/lib/libarchive/archive.h#19 integrate .. //depot/projects/hammer/lib/libarchive/archive_entry.c#39 integrate .. //depot/projects/hammer/lib/libarchive/archive_entry_copy_stat.c#3 integrate .. //depot/projects/hammer/lib/libarchive/archive_entry_stat.c#3 integrate .. //depot/projects/hammer/lib/libarchive/archive_platform.h#24 integrate .. //depot/projects/hammer/lib/libarchive/archive_private.h#28 integrate .. //depot/projects/hammer/lib/libarchive/archive_read.c#26 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_disk.c#1 branch .. //depot/projects/hammer/lib/libarchive/archive_read_disk_entry_from_file.c#1 branch .. //depot/projects/hammer/lib/libarchive/archive_read_disk_private.h#1 branch .. //depot/projects/hammer/lib/libarchive/archive_read_disk_set_standard_lookup.c#1 branch .. //depot/projects/hammer/lib/libarchive/archive_read_open_filename.c#6 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_private.h#8 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_compression_all.c#8 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_compression_bzip2.c#18 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_compression_compress.c#12 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_compression_gzip.c#18 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_compression_program.c#8 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_ar.c#11 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_cpio.c#25 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_empty.c#5 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_iso9660.c#20 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_mtree.c#9 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_tar.c#46 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_zip.c#23 integrate .. //depot/projects/hammer/lib/libarchive/archive_string.c#16 integrate .. //depot/projects/hammer/lib/libarchive/archive_string.h#14 integrate .. //depot/projects/hammer/lib/libarchive/archive_string_sprintf.c#11 integrate .. //depot/projects/hammer/lib/libarchive/archive_util.c#19 integrate .. //depot/projects/hammer/lib/libarchive/archive_write.c#20 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_disk.c#22 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_private.h#4 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_compression_gzip.c#18 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_compression_program.c#4 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_format_ar.c#9 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_format_cpio.c#14 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_format_cpio_newc.c#5 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_format_mtree.c#2 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_format_pax.c#38 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_format_shar.c#15 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_format_ustar.c#22 integrate .. //depot/projects/hammer/lib/libarchive/config_freebsd.h#12 integrate .. //depot/projects/hammer/lib/libarchive/test/Makefile#18 integrate .. //depot/projects/hammer/lib/libarchive/test/main.c#17 integrate .. //depot/projects/hammer/lib/libarchive/test/read_open_memory.c#5 integrate .. //depot/projects/hammer/lib/libarchive/test/test.h#10 integrate .. //depot/projects/hammer/lib/libarchive/test/test_acl_freebsd.c#3 integrate .. //depot/projects/hammer/lib/libarchive/test/test_compat_bzip2.c#3 integrate .. //depot/projects/hammer/lib/libarchive/test/test_compat_gzip.c#3 integrate .. //depot/projects/hammer/lib/libarchive/test/test_compat_zip.c#5 integrate .. //depot/projects/hammer/lib/libarchive/test/test_extattr_freebsd.c#1 branch .. //depot/projects/hammer/lib/libarchive/test/test_fuzz.c#3 integrate .. //depot/projects/hammer/lib/libarchive/test/test_pax_filename_encoding.c#5 integrate .. //depot/projects/hammer/lib/libarchive/test/test_read_compress_program.c#5 integrate .. //depot/projects/hammer/lib/libarchive/test/test_read_disk.c#1 branch .. //depot/projects/hammer/lib/libarchive/test/test_read_extract.c#7 integrate .. //depot/projects/hammer/lib/libarchive/test/test_read_file_nonexistent.c#1 branch .. //depot/projects/hammer/lib/libarchive/test/test_read_format_cpio_bin_Z.c#4 integrate .. //depot/projects/hammer/lib/libarchive/test/test_read_format_cpio_bin_bz2.c#5 integrate .. //depot/projects/hammer/lib/libarchive/test/test_read_format_cpio_bin_gz.c#4 integrate .. //depot/projects/hammer/lib/libarchive/test/test_read_format_cpio_svr4_gzip.c#4 integrate .. //depot/projects/hammer/lib/libarchive/test/test_read_format_gtar_gz.c#4 integrate .. //depot/projects/hammer/lib/libarchive/test/test_read_format_iso_gz.c#4 integrate .. //depot/projects/hammer/lib/libarchive/test/test_read_format_isojoliet_bz2.c#1 branch .. //depot/projects/hammer/lib/libarchive/test/test_read_format_isojoliet_bz2.iso.bz2.uu#1 branch .. //depot/projects/hammer/lib/libarchive/test/test_read_format_isojolietrr_bz2.iso.bz2.uu#1 branch .. //depot/projects/hammer/lib/libarchive/test/test_read_format_pax_bz2.c#4 integrate .. //depot/projects/hammer/lib/libarchive/test/test_read_format_tar.c#5 integrate .. //depot/projects/hammer/lib/libarchive/test/test_read_format_tbz.c#4 integrate .. //depot/projects/hammer/lib/libarchive/test/test_read_format_tgz.c#4 integrate .. //depot/projects/hammer/lib/libarchive/test/test_read_format_zip.c#8 integrate .. //depot/projects/hammer/lib/libarchive/test/test_read_pax_truncated.c#5 integrate .. //depot/projects/hammer/lib/libarchive/test/test_write_compress_program.c#5 integrate .. //depot/projects/hammer/lib/libarchive/test/test_write_disk.c#10 integrate .. //depot/projects/hammer/lib/libarchive/test/test_write_disk_failures.c#2 integrate .. //depot/projects/hammer/lib/libbluetooth/Makefile#7 integrate .. //depot/projects/hammer/lib/libbluetooth/bluetooth.3#8 integrate .. //depot/projects/hammer/lib/libbluetooth/bluetooth.c#3 integrate .. //depot/projects/hammer/lib/libbluetooth/bluetooth.h#4 integrate .. //depot/projects/hammer/lib/libbluetooth/dev.c#1 branch .. //depot/projects/hammer/lib/libbluetooth/hci.c#1 branch .. //depot/projects/hammer/lib/libc/Makefile#32 integrate .. //depot/projects/hammer/lib/libc/nls/Makefile.inc#7 integrate .. //depot/projects/hammer/lib/libc/nls/ca_ES.ISO8859-1.msg#1 branch .. //depot/projects/hammer/lib/libc/nls/de_DE.ISO8859-1.msg#1 branch .. //depot/projects/hammer/lib/libc/nls/el_GR.ISO8859-7.msg#1 branch .. //depot/projects/hammer/lib/libc/nls/es_ES.ISO8859-1.msg#1 branch .. //depot/projects/hammer/lib/libc/nls/fi_FI.ISO8859-1.msg#1 branch .. //depot/projects/hammer/lib/libc/nls/fr_FR.ISO8859-1.msg#1 branch .. //depot/projects/hammer/lib/libc/nls/hu_HU.ISO8859-2.msg#1 branch .. //depot/projects/hammer/lib/libc/nls/it_IT.ISO8859-15.msg#1 branch .. //depot/projects/hammer/lib/libc/nls/mn_MN.UTF-8.msg#1 branch .. //depot/projects/hammer/lib/libc/nls/nl_NL.ISO8859-1.msg#1 branch .. //depot/projects/hammer/lib/libc/nls/no_NO.ISO8859-1.msg#1 branch .. //depot/projects/hammer/lib/libc/nls/pt_BR.ISO8859-1.msg#1 branch .. //depot/projects/hammer/lib/libc/nls/sk_SK.ISO8859-2.msg#1 branch .. //depot/projects/hammer/lib/libc/nls/sv_SE.ISO8859-1.msg#1 branch .. //depot/projects/hammer/lib/libc/softfloat/fpgetmask.c#2 integrate .. //depot/projects/hammer/lib/libc/softfloat/fpgetround.c#2 integrate .. //depot/projects/hammer/lib/libc/softfloat/fpgetsticky.c#2 integrate .. //depot/projects/hammer/lib/libc/softfloat/fpsetmask.c#2 integrate .. //depot/projects/hammer/lib/libc/softfloat/fpsetround.c#2 integrate .. //depot/projects/hammer/lib/libc/softfloat/fpsetsticky.c#2 integrate .. //depot/projects/hammer/lib/libelf/Makefile#2 integrate .. //depot/projects/hammer/lib/libthr/Makefile#30 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_fork.c#9 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_syscalls.c#16 integrate .. //depot/projects/hammer/lib/libusb/Makefile#1 branch .. //depot/projects/hammer/lib/libusb/libusb.3#1 branch .. //depot/projects/hammer/lib/libusb/libusb20.c#1 branch .. //depot/projects/hammer/lib/libusb/libusb20.h#1 branch .. //depot/projects/hammer/lib/libusb/libusb20_compat01.c#1 branch .. //depot/projects/hammer/lib/libusb/libusb20_compat10.c#1 branch .. //depot/projects/hammer/lib/libusb/libusb20_compat10.h#1 branch .. //depot/projects/hammer/lib/libusb/libusb20_desc.c#1 branch .. //depot/projects/hammer/lib/libusb/libusb20_desc.h#1 branch .. //depot/projects/hammer/lib/libusb/libusb20_int.h#1 branch .. //depot/projects/hammer/lib/libusb/libusb20_ugen20.c#1 branch .. //depot/projects/hammer/lib/libusb/usb.h#1 branch .. //depot/projects/hammer/lib/libusb20/Makefile#2 delete .. //depot/projects/hammer/lib/libusb20/libusb20.3#4 delete .. //depot/projects/hammer/lib/libusb20/libusb20.c#4 delete .. //depot/projects/hammer/lib/libusb20/libusb20.h#4 delete .. //depot/projects/hammer/lib/libusb20/libusb20_compat01.c#4 delete .. //depot/projects/hammer/lib/libusb20/libusb20_compat01.h#3 delete .. //depot/projects/hammer/lib/libusb20/libusb20_compat10.c#2 delete .. //depot/projects/hammer/lib/libusb20/libusb20_compat10.h#2 delete .. //depot/projects/hammer/lib/libusb20/libusb20_desc.c#4 delete .. //depot/projects/hammer/lib/libusb20/libusb20_desc.h#3 delete .. //depot/projects/hammer/lib/libusb20/libusb20_int.h#3 delete .. //depot/projects/hammer/lib/libusb20/libusb20_ugen20.c#4 delete .. //depot/projects/hammer/lib/msun/src/math.h#40 integrate .. //depot/projects/hammer/lib/msun/src/math_private.h#12 integrate .. //depot/projects/hammer/lib/msun/src/s_cimag.c#3 integrate .. //depot/projects/hammer/lib/msun/src/s_cimagf.c#3 integrate .. //depot/projects/hammer/lib/msun/src/s_cimagl.c#3 integrate .. //depot/projects/hammer/libexec/rtld-elf/map_object.c#12 integrate .. //depot/projects/hammer/libexec/rtld-elf/rtld.c#45 integrate .. //depot/projects/hammer/libexec/rtld-elf/rtld.h#13 integrate .. //depot/projects/hammer/release/amd64/boot_crunch.conf#11 integrate .. //depot/projects/hammer/release/doc/share/misc/dev.archlist.txt#53 integrate .. //depot/projects/hammer/release/i386/boot_crunch.conf#12 integrate .. //depot/projects/hammer/release/ia64/boot_crunch.conf#15 integrate .. //depot/projects/hammer/release/picobsd/build/picobsd#10 integrate .. //depot/projects/hammer/release/picobsd/tinyware/simple_httpd/Makefile#4 integrate .. //depot/projects/hammer/release/picobsd/tinyware/simple_httpd/simple_httpd.c#5 integrate .. //depot/projects/hammer/release/powerpc/boot_crunch.conf#8 integrate .. //depot/projects/hammer/release/sparc64/boot_crunch.conf#11 integrate .. //depot/projects/hammer/release/sun4v/boot_crunch.conf#6 integrate .. //depot/projects/hammer/sbin/devd/devd.conf.5#6 integrate .. //depot/projects/hammer/sbin/fdisk_pc98/fdisk.c#14 integrate .. //depot/projects/hammer/sbin/ifconfig/ifclone.c#5 integrate .. //depot/projects/hammer/sbin/ifconfig/ifconfig.c#43 integrate .. //depot/projects/hammer/sbin/ifconfig/ifgroup.c#3 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw.8#71 integrate .. //depot/projects/hammer/sbin/recoverdisk/recoverdisk.1#2 integrate .. //depot/projects/hammer/sbin/recoverdisk/recoverdisk.c#3 integrate .. //depot/projects/hammer/share/man/man4/Makefile#117 integrate .. //depot/projects/hammer/share/man/man4/altq.4#21 integrate .. //depot/projects/hammer/share/man/man4/amdtemp.4#1 branch .. //depot/projects/hammer/share/man/man4/igmp.4#1 branch .. //depot/projects/hammer/share/man/man4/ip.4#23 integrate .. //depot/projects/hammer/share/man/man4/k8temp.4#2 delete .. //depot/projects/hammer/share/man/man4/lo.4#2 integrate .. //depot/projects/hammer/share/man/man4/multicast.4#7 integrate .. //depot/projects/hammer/share/man/man4/pccbb.4#9 integrate .. //depot/projects/hammer/share/man/man4/txp.4#11 integrate .. //depot/projects/hammer/share/man/man4/usb.4#13 integrate .. //depot/projects/hammer/share/man/man4/usb2_bluetooth.4#2 delete .. //depot/projects/hammer/share/man/man4/usb2_controller.4#2 delete .. //depot/projects/hammer/share/man/man4/usb2_ethernet.4#2 delete .. //depot/projects/hammer/share/man/man4/usb2_image.4#2 delete .. //depot/projects/hammer/share/man/man4/usb2_input.4#2 delete .. //depot/projects/hammer/share/man/man4/usb2_misc.4#2 delete .. //depot/projects/hammer/share/man/man4/usb2_ndis.4#2 delete .. //depot/projects/hammer/share/man/man4/usb2_quirk.4#2 delete .. //depot/projects/hammer/share/man/man4/usb2_serial.4#2 delete .. //depot/projects/hammer/share/man/man4/usb2_sound.4#2 delete .. //depot/projects/hammer/share/man/man4/usb2_storage.4#2 delete .. //depot/projects/hammer/share/man/man4/usb2_wlan.4#2 delete .. //depot/projects/hammer/share/man/man4/uscanner.4#22 delete .. //depot/projects/hammer/share/man/man5/devfs.rules.5#6 integrate .. //depot/projects/hammer/share/man/man5/rc.conf.5#96 integrate .. //depot/projects/hammer/share/man/man7/tuning.7#19 integrate .. //depot/projects/hammer/share/man/man8/diskless.8#15 integrate .. //depot/projects/hammer/share/man/man8/nanobsd.8#4 integrate .. //depot/projects/hammer/share/man/man9/VOP_VPTOCNP.9#2 integrate .. //depot/projects/hammer/share/misc/committers-src.dot#19 integrate .. //depot/projects/hammer/share/misc/iso3166#10 integrate .. //depot/projects/hammer/share/mk/bsd.sys.mk#19 integrate .. //depot/projects/hammer/share/zoneinfo/northamerica#17 integrate .. //depot/projects/hammer/sys/amd64/acpica/Makefile#1 branch .. //depot/projects/hammer/sys/amd64/acpica/acpi_machdep.c#25 integrate .. //depot/projects/hammer/sys/amd64/acpica/acpi_switch.S#1 branch .. //depot/projects/hammer/sys/amd64/acpica/acpi_wakecode.S#1 branch .. //depot/projects/hammer/sys/amd64/acpica/acpi_wakeup.c#17 integrate .. //depot/projects/hammer/sys/amd64/acpica/genwakecode.sh#1 branch .. //depot/projects/hammer/sys/amd64/acpica/genwakedata.sh#1 branch .. //depot/projects/hammer/sys/amd64/amd64/amd64_mem.c#14 integrate .. //depot/projects/hammer/sys/amd64/amd64/apic_vector.S#41 integrate .. //depot/projects/hammer/sys/amd64/amd64/cpu_switch.S#51 integrate .. //depot/projects/hammer/sys/amd64/amd64/db_trace.c#42 integrate .. //depot/projects/hammer/sys/amd64/amd64/elf_machdep.c#39 integrate .. //depot/projects/hammer/sys/amd64/amd64/genassym.c#57 integrate .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#174 integrate .. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#137 integrate .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#187 integrate .. //depot/projects/hammer/sys/amd64/amd64/trap.c#108 integrate .. //depot/projects/hammer/sys/amd64/conf/GENERIC#120 integrate .. //depot/projects/hammer/sys/amd64/conf/NOTES#118 integrate .. //depot/projects/hammer/sys/amd64/conf/XENHVM#1 branch .. //depot/projects/hammer/sys/amd64/include/apicvar.h#50 integrate .. //depot/projects/hammer/sys/amd64/include/elf.h#15 integrate .. //depot/projects/hammer/sys/amd64/include/pcb.h#31 integrate .. //depot/projects/hammer/sys/amd64/include/pcpu.h#34 integrate .. //depot/projects/hammer/sys/amd64/include/smp.h#38 integrate .. //depot/projects/hammer/sys/amd64/include/xen/hypercall.h#1 branch .. //depot/projects/hammer/sys/amd64/include/xen/synch_bitops.h#1 branch .. //depot/projects/hammer/sys/amd64/include/xen/xen-os.h#1 branch .. //depot/projects/hammer/sys/amd64/include/xen/xenfunc.h#1 branch .. //depot/projects/hammer/sys/amd64/include/xen/xenpmap.h#1 branch .. //depot/projects/hammer/sys/amd64/include/xen/xenvar.h#1 branch .. //depot/projects/hammer/sys/amd64/linux32/linux32_sysvec.c#28 integrate .. //depot/projects/hammer/sys/arm/arm/elf_machdep.c#11 integrate .. //depot/projects/hammer/sys/arm/conf/AVILA#17 integrate .. //depot/projects/hammer/sys/arm/conf/CAMBRIA#3 integrate .. //depot/projects/hammer/sys/arm/conf/CAMBRIA.hints#2 integrate .. //depot/projects/hammer/sys/arm/conf/HL200#9 integrate .. //depot/projects/hammer/sys/arm/conf/KB920X#14 integrate .. //depot/projects/hammer/sys/arm/include/elf.h#7 integrate .. //depot/projects/hammer/sys/arm/xscale/ixp425/avila_machdep.c#12 integrate .. //depot/projects/hammer/sys/arm/xscale/ixp425/files.ixp425#7 integrate .. //depot/projects/hammer/sys/arm/xscale/ixp425/if_npe.c#10 integrate .. //depot/projects/hammer/sys/arm/xscale/ixp425/ixp425.c#10 integrate .. //depot/projects/hammer/sys/arm/xscale/ixp425/ixp425_pci.c#6 integrate .. //depot/projects/hammer/sys/arm/xscale/ixp425/ixp425reg.h#5 integrate .. //depot/projects/hammer/sys/boot/forth/loader.conf#46 integrate .. //depot/projects/hammer/sys/boot/i386/boot2/Makefile#12 integrate .. //depot/projects/hammer/sys/boot/i386/boot2/boot1.S#8 integrate .. //depot/projects/hammer/sys/boot/i386/libi386/Makefile#21 integrate .. //depot/projects/hammer/sys/boot/i386/libi386/bioscd.c#8 integrate .. //depot/projects/hammer/sys/boot/i386/libi386/biosdisk.c#17 integrate .. //depot/projects/hammer/sys/boot/i386/libi386/devicename.c#8 integrate .. //depot/projects/hammer/sys/boot/i386/libi386/libi386.h#15 integrate .. //depot/projects/hammer/sys/boot/i386/loader/Makefile#19 integrate .. //depot/projects/hammer/sys/boot/i386/loader/main.c#18 integrate .. //depot/projects/hammer/sys/boot/pc98/libpc98/Makefile#12 integrate .. //depot/projects/hammer/sys/boot/pc98/libpc98/biosdisk.c#13 integrate .. //depot/projects/hammer/sys/boot/pc98/loader/Makefile#15 integrate .. //depot/projects/hammer/sys/boot/pc98/loader/main.c#12 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#3 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#8 integrate .. //depot/projects/hammer/sys/compat/ia32/ia32_sysvec.c#24 integrate .. //depot/projects/hammer/sys/compat/linux/linux_emul.h#5 integrate .. //depot/projects/hammer/sys/compat/linux/linux_futex.c#10 integrate .. //depot/projects/hammer/sys/compat/linux/linux_futex.h#6 integrate .. //depot/projects/hammer/sys/compat/ndis/hal_var.h#9 integrate .. //depot/projects/hammer/sys/compat/ndis/kern_ndis.c#46 integrate .. //depot/projects/hammer/sys/compat/ndis/kern_windrv.c#14 integrate .. //depot/projects/hammer/sys/compat/ndis/ndis_var.h#29 integrate .. //depot/projects/hammer/sys/compat/ndis/ntoskrnl_var.h#29 integrate .. //depot/projects/hammer/sys/compat/ndis/pe_var.h#12 integrate .. //depot/projects/hammer/sys/compat/ndis/resource_var.h#4 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_hal.c#20 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_ndis.c#50 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_ntoskrnl.c#51 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_pe.c#11 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_usbd.c#6 integrate .. //depot/projects/hammer/sys/compat/ndis/usbd_var.h#3 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_sysvec.c#24 integrate .. //depot/projects/hammer/sys/conf/NOTES#158 integrate .. //depot/projects/hammer/sys/conf/files#196 integrate .. //depot/projects/hammer/sys/conf/files.amd64#112 integrate .. //depot/projects/hammer/sys/conf/files.i386#103 integrate .. //depot/projects/hammer/sys/conf/files.pc98#76 integrate .. //depot/projects/hammer/sys/conf/options#140 integrate .. //depot/projects/hammer/sys/conf/options.amd64#49 integrate .. //depot/projects/hammer/sys/conf/options.arm#18 integrate .. //depot/projects/hammer/sys/ddb/db_expr.c#4 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi.c#88 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_ec.c#43 integrate .. //depot/projects/hammer/sys/dev/agp/agp.c#6 integrate .. //depot/projects/hammer/sys/dev/agp/agp_amd64.c#3 integrate .. //depot/projects/hammer/sys/dev/agp/agp_i810.c#8 integrate .. //depot/projects/hammer/sys/dev/agp/agp_intel.c#2 integrate .. //depot/projects/hammer/sys/dev/agp/agp_via.c#3 integrate .. //depot/projects/hammer/sys/dev/agp/agppriv.h#3 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/ahc_pci.c#18 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/ahd_pci.c#17 integrate .. //depot/projects/hammer/sys/dev/amdtemp/amdtemp.c#1 branch .. //depot/projects/hammer/sys/dev/ata/ata-card.c#29 integrate .. //depot/projects/hammer/sys/dev/ata/ata-cbus.c#17 integrate .. //depot/projects/hammer/sys/dev/ata/ata-isa.c#18 integrate .. //depot/projects/hammer/sys/dev/ata/ata-pci.c#52 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ah.c#4 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ah.h#3 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c#3 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c#3 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c#3 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar5416.h#3 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c#3 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c#3 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar9160_attach.c#3 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar9280.c#1 branch .. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar9280.h#1 branch .. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar9280_attach.c#1 branch .. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar9280v1.ini#1 branch .. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar9280v2.ini#1 branch .. //depot/projects/hammer/sys/dev/ath/if_ath.c#68 integrate .. //depot/projects/hammer/sys/dev/ath/if_ath_pci.c#22 integrate .. //depot/projects/hammer/sys/dev/ath/if_athvar.h#39 integrate .. //depot/projects/hammer/sys/dev/atkbdc/psm.c#17 integrate .. //depot/projects/hammer/sys/dev/cardbus/cardbus.c#31 integrate .. //depot/projects/hammer/sys/dev/cardbus/cardbus_cis.c#24 integrate .. //depot/projects/hammer/sys/dev/cfi/cfi_core.c#3 integrate .. //depot/projects/hammer/sys/dev/cfi/cfi_dev.c#3 integrate .. //depot/projects/hammer/sys/dev/cfi/cfi_disk.c#1 branch .. //depot/projects/hammer/sys/dev/cfi/cfi_var.h#3 integrate .. //depot/projects/hammer/sys/dev/cxgb/bin2h.pl#2 integrate .. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_ael1002.c#12 integrate .. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_common.h#12 integrate .. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_t3_cpl.h#9 integrate .. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_t3_hw.c#14 integrate .. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_xgmac.c#11 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_adapter.h#23 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_ioctl.h#8 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_main.c#32 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_multiq.c#7 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_sge.c#27 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_t3fw.c#3 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_t3fw.h#2 integrate .. //depot/projects/hammer/sys/dev/cxgb/t3c_protocol_sram.h#1 branch .. //depot/projects/hammer/sys/dev/cxgb/t3c_tp_eeprom.h#1 branch .. //depot/projects/hammer/sys/dev/dc/if_dc.c#18 integrate .. //depot/projects/hammer/sys/dev/dcons/dcons_os.c#19 integrate .. //depot/projects/hammer/sys/dev/drm/drmP.h#21 integrate .. //depot/projects/hammer/sys/dev/drm/drm_bufs.c#8 integrate .. //depot/projects/hammer/sys/dev/drm/drm_drv.c#11 integrate .. //depot/projects/hammer/sys/dev/drm/drm_irq.c#7 integrate .. //depot/projects/hammer/sys/dev/drm/drm_linux_list.h#6 integrate .. //depot/projects/hammer/sys/dev/drm/drm_lock.c#6 integrate .. //depot/projects/hammer/sys/dev/drm/drm_pci.c#6 integrate .. //depot/projects/hammer/sys/dev/drm/drm_pciids.h#11 integrate .. //depot/projects/hammer/sys/dev/drm/drm_scatter.c#7 integrate .. //depot/projects/hammer/sys/dev/drm/drm_sysctl.c#5 integrate .. //depot/projects/hammer/sys/dev/drm/drm_vm.c#5 integrate .. //depot/projects/hammer/sys/dev/drm/i915_dma.c#12 integrate .. //depot/projects/hammer/sys/dev/drm/i915_drv.c#8 integrate .. //depot/projects/hammer/sys/dev/drm/i915_drv.h#8 integrate .. //depot/projects/hammer/sys/dev/drm/i915_irq.c#8 integrate .. //depot/projects/hammer/sys/dev/drm/i915_reg.h#2 integrate .. //depot/projects/hammer/sys/dev/drm/i915_suspend.c#3 integrate .. //depot/projects/hammer/sys/dev/drm/mach64_drv.c#7 integrate .. //depot/projects/hammer/sys/dev/drm/mga_drv.c#13 integrate .. //depot/projects/hammer/sys/dev/drm/mga_irq.c#9 integrate .. //depot/projects/hammer/sys/dev/drm/r128_drv.c#13 integrate .. //depot/projects/hammer/sys/dev/drm/r600_cp.c#1 branch .. //depot/projects/hammer/sys/dev/drm/r600_microcode.h#1 branch .. //depot/projects/hammer/sys/dev/drm/radeon_cp.c#19 integrate .. //depot/projects/hammer/sys/dev/drm/radeon_drm.h#14 integrate .. //depot/projects/hammer/sys/dev/drm/radeon_drv.c#13 integrate .. //depot/projects/hammer/sys/dev/drm/radeon_drv.h#16 integrate .. //depot/projects/hammer/sys/dev/drm/radeon_irq.c#11 integrate .. //depot/projects/hammer/sys/dev/drm/radeon_state.c#16 integrate .. //depot/projects/hammer/sys/dev/drm/savage_drv.c#6 integrate .. //depot/projects/hammer/sys/dev/drm/sis_drv.c#10 integrate .. //depot/projects/hammer/sys/dev/drm/tdfx_drv.c#12 integrate .. //depot/projects/hammer/sys/dev/ed/if_ed_pccard.c#38 integrate .. //depot/projects/hammer/sys/dev/exca/exca.c#19 integrate .. //depot/projects/hammer/sys/dev/fe/if_fe_pccard.c#20 integrate .. //depot/projects/hammer/sys/dev/firewire/firewire.c#45 integrate .. //depot/projects/hammer/sys/dev/firewire/fwohci_pci.c#40 integrate .. //depot/projects/hammer/sys/dev/fxp/if_fxp.c#71 integrate .. //depot/projects/hammer/sys/dev/ichwd/ichwd.c#16 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndis.c#70 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndis_pccard.c#15 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndis_pci.c#17 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndis_usb.c#7 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndisvar.h#28 integrate .. //depot/projects/hammer/sys/dev/ipw/if_ipw.c#25 integrate .. //depot/projects/hammer/sys/dev/k8temp/k8temp.c#7 delete .. //depot/projects/hammer/sys/dev/malo/if_malo_pci.c#2 integrate .. //depot/projects/hammer/sys/dev/md/md.c#70 integrate .. //depot/projects/hammer/sys/dev/mii/ip1000phy.c#3 integrate .. //depot/projects/hammer/sys/dev/mii/ip1000phyreg.h#3 integrate .. //depot/projects/hammer/sys/dev/mmc/mmc.c#8 integrate .. //depot/projects/hammer/sys/dev/pccard/card_if.m#13 integrate .. //depot/projects/hammer/sys/dev/pccard/pccard_cis.c#21 integrate .. //depot/projects/hammer/sys/dev/pccard/pccarddevs#54 integrate .. //depot/projects/hammer/sys/dev/pccbb/pccbb.c#53 integrate .. //depot/projects/hammer/sys/dev/pci/pci.c#71 integrate .. //depot/projects/hammer/sys/dev/pci/pci_pci.c#26 integrate .. //depot/projects/hammer/sys/dev/pci/pcib_private.h#11 integrate .. //depot/projects/hammer/sys/dev/ppbus/lpbb.c#9 integrate .. //depot/projects/hammer/sys/dev/puc/puc_pci.c#14 integrate .. //depot/projects/hammer/sys/dev/ral/if_ral_pci.c#8 integrate .. //depot/projects/hammer/sys/dev/re/if_re.c#68 integrate .. //depot/projects/hammer/sys/dev/sio/sio_pci.c#14 integrate .. //depot/projects/hammer/sys/dev/smbus/smbus.c#6 integrate .. //depot/projects/hammer/sys/dev/smbus/smbus.h#4 integrate .. //depot/projects/hammer/sys/dev/sound/pci/emu10k1.c#26 integrate .. //depot/projects/hammer/sys/dev/sound/pci/emu10kx.c#8 integrate .. //depot/projects/hammer/sys/dev/sound/pci/hda/hdac.c#28 integrate .. //depot/projects/hammer/sys/dev/syscons/scterm-teken.c#3 integrate .. //depot/projects/hammer/sys/dev/syscons/syscons.c#51 integrate .. //depot/projects/hammer/sys/dev/syscons/syscons.h#18 integrate .. //depot/projects/hammer/sys/dev/syscons/teken/teken.c#3 integrate .. //depot/projects/hammer/sys/dev/syscons/teken/teken.h#3 integrate .. //depot/projects/hammer/sys/dev/txp/if_txp.c#31 integrate .. //depot/projects/hammer/sys/dev/txp/if_txpreg.h#7 integrate .. //depot/projects/hammer/sys/dev/uart/uart_bus_pci.c#11 integrate .. //depot/projects/hammer/sys/dev/usb/controller/atmegadci.c#2 integrate .. //depot/projects/hammer/sys/dev/usb/controller/atmegadci.h#2 integrate .. //depot/projects/hammer/sys/dev/usb/controller/atmegadci_atmelarm.c#2 integrate .. //depot/projects/hammer/sys/dev/usb/controller/ehci.c#2 integrate .. //depot/projects/hammer/sys/dev/usb/controller/ehci.h#2 integrate .. //depot/projects/hammer/sys/dev/usb/controller/ehci_ixp4xx.c#2 integrate .. //depot/projects/hammer/sys/dev/usb/controller/ehci_pci.c#2 integrate .. //depot/projects/hammer/sys/dev/usb/controller/musb_otg_atmelarm.c#2 integrate .. //depot/projects/hammer/sys/dev/usb/controller/ohci_pci.c#2 integrate .. //depot/projects/hammer/sys/dev/usb/controller/uhci_pci.c#2 integrate .. //depot/projects/hammer/sys/dev/usb/controller/usb_controller.c#2 integrate .. //depot/projects/hammer/sys/dev/usb/image/uscanner.c#2 delete .. //depot/projects/hammer/sys/dev/usb/input/ums.c#2 integrate .. //depot/projects/hammer/sys/dev/usb/net/if_axe.c#2 integrate .. //depot/projects/hammer/sys/dev/usb/net/if_cdce.c#2 integrate .. //depot/projects/hammer/sys/dev/usb/net/usb_ethernet.c#2 integrate .. //depot/projects/hammer/sys/dev/usb/net/usb_ethernet.h#2 integrate .. //depot/projects/hammer/sys/dev/usb/serial/u3g.c#2 integrate .. //depot/projects/hammer/sys/dev/usb/serial/uftdi.c#2 integrate .. //depot/projects/hammer/sys/dev/usb/serial/ulpt.c#2 integrate .. //depot/projects/hammer/sys/dev/usb/storage/umass.c#2 integrate .. //depot/projects/hammer/sys/dev/usb/usb_core.h#2 integrate .. //depot/projects/hammer/sys/dev/usb/usb_dev.c#2 integrate .. //depot/projects/hammer/sys/dev/usb/usb_dev.h#2 integrate .. //depot/projects/hammer/sys/dev/usb/usb_device.c#2 integrate .. //depot/projects/hammer/sys/dev/usb/usb_device.h#2 integrate .. //depot/projects/hammer/sys/dev/usb/usb_hid.c#2 integrate .. //depot/projects/hammer/sys/dev/usb/usb_hid.h#2 integrate .. //depot/projects/hammer/sys/dev/usb/usb_hub.c#2 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs#117 integrate .. //depot/projects/hammer/sys/dev/usb/wlan/if_zyd.c#2 integrate .. //depot/projects/hammer/sys/dev/vge/if_vge.c#21 integrate .. //depot/projects/hammer/sys/dev/xen/balloon/balloon.c#2 integrate .. //depot/projects/hammer/sys/dev/xen/blkfront/blkfront.c#5 integrate .. //depot/projects/hammer/sys/dev/xen/console/console.c#5 integrate .. //depot/projects/hammer/sys/dev/xen/console/xencons_ring.c#3 integrate .. //depot/projects/hammer/sys/dev/xen/netfront/netfront.c#7 integrate .. //depot/projects/hammer/sys/dev/xen/xenpci/evtchn.c#1 branch .. //depot/projects/hammer/sys/dev/xen/xenpci/machine_reboot.c#1 branch .. //depot/projects/hammer/sys/dev/xen/xenpci/xenpci.c#1 branch .. //depot/projects/hammer/sys/dev/xen/xenpci/xenpcivar.h#1 branch .. //depot/projects/hammer/sys/dev/xl/if_xl.c#2 integrate .. //depot/projects/hammer/sys/fs/cd9660/cd9660_vfsops.c#11 integrate .. //depot/projects/hammer/sys/fs/devfs/devfs_vnops.c#65 integrate .. //depot/projects/hammer/sys/fs/nullfs/null_vnops.c#37 integrate .. //depot/projects/hammer/sys/fs/udf/udf_vfsops.c#36 integrate .. //depot/projects/hammer/sys/geom/eli/g_eli.c#20 integrate .. //depot/projects/hammer/sys/geom/geom_redboot.c#1 branch .. //depot/projects/hammer/sys/geom/part/g_part.c#20 integrate .. //depot/projects/hammer/sys/geom/part/g_part_ebr.c#2 integrate .. //depot/projects/hammer/sys/geom/part/g_part_pc98.c#10 integrate .. //depot/projects/hammer/sys/gnu/fs/reiserfs/reiserfs_fs.h#4 integrate .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_buf.c#5 integrate .. //depot/projects/hammer/sys/i386/conf/GENERIC#79 integrate .. //depot/projects/hammer/sys/i386/conf/NOTES#111 integrate .. //depot/projects/hammer/sys/i386/conf/XBOX#10 integrate .. //depot/projects/hammer/sys/i386/i386/elf_machdep.c#18 integrate .. //depot/projects/hammer/sys/i386/i386/i686_mem.c#13 integrate .. //depot/projects/hammer/sys/i386/i386/in_cksum.c#7 integrate .. //depot/projects/hammer/sys/i386/i386/k6_mem.c#7 integrate .. //depot/projects/hammer/sys/i386/i386/mp_machdep.c#80 integrate .. //depot/projects/hammer/sys/i386/i386/pmap.c#118 integrate .. //depot/projects/hammer/sys/i386/i386/trap.c#64 integrate .. //depot/projects/hammer/sys/i386/include/elf.h#9 integrate .. //depot/projects/hammer/sys/i386/include/xen/xenpmap.h#3 integrate .. //depot/projects/hammer/sys/i386/linux/linux_sysvec.c#39 integrate .. //depot/projects/hammer/sys/ia64/ia64/elf_machdep.c#25 integrate .. //depot/projects/hammer/sys/ia64/include/elf.h#8 integrate .. //depot/projects/hammer/sys/kern/imgact_elf.c#52 integrate .. //depot/projects/hammer/sys/kern/kern_conf.c#56 integrate .. //depot/projects/hammer/sys/kern/kern_exec.c#88 integrate .. //depot/projects/hammer/sys/kern/kern_ktrace.c#39 integrate .. //depot/projects/hammer/sys/kern/kern_lock.c#45 integrate .. //depot/projects/hammer/sys/kern/kern_mutex.c#55 integrate .. //depot/projects/hammer/sys/kern/kern_poll.c#25 integrate .. //depot/projects/hammer/sys/kern/kern_prot.c#34 integrate .. //depot/projects/hammer/sys/kern/kern_rwlock.c#22 integrate .. //depot/projects/hammer/sys/kern/kern_sx.c#25 integrate .. //depot/projects/hammer/sys/kern/kern_sysctl.c#39 integrate .. //depot/projects/hammer/sys/kern/kern_tc.c#28 integrate .. //depot/projects/hammer/sys/kern/kern_thread.c#113 integrate .. //depot/projects/hammer/sys/kern/kern_umtx.c#34 integrate .. //depot/projects/hammer/sys/kern/sched_ule.c#103 integrate .. //depot/projects/hammer/sys/kern/subr_bus.c#66 integrate .. //depot/projects/hammer/sys/kern/subr_lock.c#15 integrate .. //depot/projects/hammer/sys/kern/subr_param.c#22 integrate .. //depot/projects/hammer/sys/kern/subr_smp.c#40 integrate .. //depot/projects/hammer/sys/kern/subr_witness.c#81 integrate .. //depot/projects/hammer/sys/kern/sys_generic.c#42 integrate .. //depot/projects/hammer/sys/kern/sys_pipe.c#42 integrate .. //depot/projects/hammer/sys/kern/uipc_sem.c#24 integrate .. //depot/projects/hammer/sys/kern/uipc_usrreq.c#61 integrate .. //depot/projects/hammer/sys/kern/vfs_bio.c#94 integrate .. //depot/projects/hammer/sys/kern/vfs_cache.c#38 integrate .. //depot/projects/hammer/sys/kern/vfs_default.c#58 integrate .. //depot/projects/hammer/sys/kern/vfs_extattr.c#7 integrate .. //depot/projects/hammer/sys/kern/vfs_lookup.c#42 integrate .. //depot/projects/hammer/sys/kern/vfs_vnops.c#64 integrate .. //depot/projects/hammer/sys/kern/vnode_if.src#33 integrate .. //depot/projects/hammer/sys/legacy/dev/usb/ehci_pci.c#2 integrate .. //depot/projects/hammer/sys/legacy/dev/usb/ohci_pci.c#2 integrate .. //depot/projects/hammer/sys/legacy/dev/usb/uhci_pci.c#2 integrate .. //depot/projects/hammer/sys/mips/include/elf.h#4 integrate .. //depot/projects/hammer/sys/mips/mips/elf64_machdep.c#2 integrate .. //depot/projects/hammer/sys/mips/mips/elf_machdep.c#5 integrate .. //depot/projects/hammer/sys/modules/Makefile#139 integrate .. //depot/projects/hammer/sys/modules/amdtemp/Makefile#1 branch .. //depot/projects/hammer/sys/modules/drm/radeon/Makefile#5 integrate .. //depot/projects/hammer/sys/modules/if_ndis/Makefile#6 integrate .. //depot/projects/hammer/sys/modules/ip6_mroute_mod/Makefile#1 branch .. //depot/projects/hammer/sys/modules/ip_mroute_mod/Makefile#9 integrate .. //depot/projects/hammer/sys/modules/k8temp/Makefile#2 delete .. //depot/projects/hammer/sys/modules/ndis/Makefile#11 integrate .. //depot/projects/hammer/sys/modules/netgraph/Makefile#25 integrate .. //depot/projects/hammer/sys/modules/usb/Makefile#11 integrate .. //depot/projects/hammer/sys/modules/usb/uscanner/Makefile#2 delete .. //depot/projects/hammer/sys/net/bpf.c#68 integrate .. //depot/projects/hammer/sys/net/bpf_zerocopy.c#5 integrate .. //depot/projects/hammer/sys/net/if.c#87 integrate .. //depot/projects/hammer/sys/net/if_bridge.c#47 integrate .. //depot/projects/hammer/sys/net/if_gif.h#13 integrate .. //depot/projects/hammer/sys/net/if_loop.c#42 integrate .. //depot/projects/hammer/sys/net/if_tap.c#38 integrate .. //depot/projects/hammer/sys/net/if_var.h#55 integrate .. //depot/projects/hammer/sys/net80211/ieee80211.h#23 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_input.c#48 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_node.h#32 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_output.c#44 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_scan_sta.c#14 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_tdma.c#2 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_tdma.h#2 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_var.h#41 integrate .. //depot/projects/hammer/sys/netinet/if_ether.c#55 integrate .. //depot/projects/hammer/sys/netinet/igmp.c#21 integrate .. //depot/projects/hammer/sys/netinet/igmp.h#7 integrate .. //depot/projects/hammer/sys/netinet/igmp_var.h#5 integrate .. //depot/projects/hammer/sys/netinet/in.c#37 integrate .. //depot/projects/hammer/sys/netinet/in.h#32 integrate .. //depot/projects/hammer/sys/netinet/in_gif.c#25 integrate .. //depot/projects/hammer/sys/netinet/in_mcast.c#11 integrate .. //depot/projects/hammer/sys/netinet/in_pcb.c#68 integrate .. //depot/projects/hammer/sys/netinet/in_pcb.h#49 integrate .. //depot/projects/hammer/sys/netinet/in_proto.c#29 integrate .. //depot/projects/hammer/sys/netinet/in_var.h#20 integrate .. //depot/projects/hammer/sys/netinet/ip_input.c#80 integrate .. //depot/projects/hammer/sys/netinet/ip_mroute.c#46 integrate .. //depot/projects/hammer/sys/netinet/ip_mroute.h#11 integrate .. //depot/projects/hammer/sys/netinet/ip_var.h#34 integrate .. //depot/projects/hammer/sys/netinet/raw_ip.c#62 integrate .. //depot/projects/hammer/sys/netinet/sctp.h#14 integrate .. //depot/projects/hammer/sys/netinet/sctp_constants.h#23 integrate .. //depot/projects/hammer/sys/netinet/sctp_indata.c#27 integrate .. //depot/projects/hammer/sys/netinet/sctp_output.c#30 integrate .. //depot/projects/hammer/sys/netinet/sctp_structs.h#18 integrate .. //depot/projects/hammer/sys/netinet/sctp_timer.c#22 integrate .. //depot/projects/hammer/sys/netinet/sctp_var.h#18 integrate .. //depot/projects/hammer/sys/netinet/sctputil.c#34 integrate .. //depot/projects/hammer/sys/netinet/sctputil.h#18 integrate .. //depot/projects/hammer/sys/netinet/tcp_input.c#95 integrate .. //depot/projects/hammer/sys/netinet/tcp_subr.c#92 integrate .. //depot/projects/hammer/sys/netinet/tcp_timer.c#38 integrate .. //depot/projects/hammer/sys/netinet/tcp_timewait.c#11 integrate .. //depot/projects/hammer/sys/netinet/tcp_usrreq.c#65 integrate .. //depot/projects/hammer/sys/netinet/udp_usrreq.c#66 integrate .. //depot/projects/hammer/sys/netinet/vinet.h#5 integrate .. //depot/projects/hammer/sys/netinet6/in6.c#39 integrate .. //depot/projects/hammer/sys/netinet6/in6_gif.c#21 integrate .. //depot/projects/hammer/sys/netinet6/in6_ifattach.c#30 integrate .. //depot/projects/hammer/sys/netinet6/in6_pcb.c#45 integrate .. //depot/projects/hammer/sys/netinet6/ip6_mroute.c#29 integrate .. //depot/projects/hammer/sys/netinet6/ip6_mroute.h#8 integrate .. //depot/projects/hammer/sys/netinet6/mld6.c#28 integrate .. //depot/projects/hammer/sys/netipsec/key.c#28 integrate .. //depot/projects/hammer/sys/netnatm/natm.c#24 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_vnops.c#69 integrate .. //depot/projects/hammer/sys/nfsserver/nfs_srvkrpc.c#3 integrate .. //depot/projects/hammer/sys/pc98/cbus/scterm-sck.c#5 integrate .. //depot/projects/hammer/sys/pc98/cbus/syscons_cbus.c#7 integrate .. //depot/projects/hammer/sys/pc98/conf/GENERIC#61 integrate .. //depot/projects/hammer/sys/pc98/conf/NOTES#71 integrate .. //depot/projects/hammer/sys/pc98/pc98/machdep.c#25 integrate .. //depot/projects/hammer/sys/pci/intpm.c#16 integrate .. //depot/projects/hammer/sys/powerpc/aim/mmu_oea.c#8 integrate .. //depot/projects/hammer/sys/powerpc/conf/GENERIC#47 integrate .. //depot/projects/hammer/sys/powerpc/include/elf.h#6 integrate .. //depot/projects/hammer/sys/powerpc/include/spr.h#11 integrate .. //depot/projects/hammer/sys/powerpc/mpc85xx/mpc85xx.c#3 integrate .. //depot/projects/hammer/sys/powerpc/mpc85xx/mpc85xx.h#2 integrate .. //depot/projects/hammer/sys/powerpc/mpc85xx/ocpbus.c#6 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/elf_machdep.c#19 integrate .. //depot/projects/hammer/sys/security/audit/audit.c#22 integrate .. //depot/projects/hammer/sys/security/audit/audit.h#15 integrate .. //depot/projects/hammer/sys/security/audit/audit_syscalls.c#18 integrate .. //depot/projects/hammer/sys/security/mac/mac_atalk.c#2 integrate .. //depot/projects/hammer/sys/security/mac/mac_audit.c#5 integrate .. //depot/projects/hammer/sys/security/mac/mac_cred.c#2 integrate .. //depot/projects/hammer/sys/security/mac/mac_framework.c#4 integrate .. //depot/projects/hammer/sys/security/mac/mac_framework.h#17 integrate .. //depot/projects/hammer/sys/security/mac/mac_inet.c#13 integrate .. //depot/projects/hammer/sys/security/mac/mac_inet6.c#4 integrate .. //depot/projects/hammer/sys/security/mac/mac_internal.h#17 integrate .. //depot/projects/hammer/sys/security/mac/mac_net.c#18 integrate .. //depot/projects/hammer/sys/security/mac/mac_pipe.c#11 integrate .. //depot/projects/hammer/sys/security/mac/mac_policy.h#19 integrate .. //depot/projects/hammer/sys/security/mac/mac_posix_sem.c#10 integrate .. //depot/projects/hammer/sys/security/mac/mac_posix_shm.c#3 integrate .. //depot/projects/hammer/sys/security/mac/mac_priv.c#3 integrate .. //depot/projects/hammer/sys/security/mac/mac_process.c#19 integrate .. //depot/projects/hammer/sys/security/mac/mac_socket.c#9 integrate .. //depot/projects/hammer/sys/security/mac/mac_syscalls.c#10 integrate .. //depot/projects/hammer/sys/security/mac/mac_system.c#10 integrate .. //depot/projects/hammer/sys/security/mac/mac_sysv_msg.c#7 integrate .. //depot/projects/hammer/sys/security/mac/mac_sysv_sem.c#7 integrate .. //depot/projects/hammer/sys/security/mac/mac_sysv_shm.c#6 integrate .. //depot/projects/hammer/sys/security/mac/mac_vfs.c#18 integrate .. //depot/projects/hammer/sys/security/mac_biba/mac_biba.c#54 integrate .. //depot/projects/hammer/sys/security/mac_bsdextended/mac_bsdextended.c#37 integrate .. //depot/projects/hammer/sys/security/mac_bsdextended/ugidfw_internal.h#3 integrate .. //depot/projects/hammer/sys/security/mac_bsdextended/ugidfw_vnode.c#3 integrate .. //depot/projects/hammer/sys/security/mac_lomac/mac_lomac.c#40 integrate .. //depot/projects/hammer/sys/security/mac_mls/mac_mls.c#53 integrate .. //depot/projects/hammer/sys/security/mac_portacl/mac_portacl.c#16 integrate .. //depot/projects/hammer/sys/security/mac_stub/mac_stub.c#36 integrate .. //depot/projects/hammer/sys/security/mac_test/mac_test.c#55 integrate .. //depot/projects/hammer/sys/sparc64/central/central.c#12 integrate .. //depot/projects/hammer/sys/sparc64/conf/GENERIC#70 integrate .. //depot/projects/hammer/sys/sparc64/ebus/ebus.c#22 integrate .. //depot/projects/hammer/sys/sparc64/fhc/fhc.c#14 integrate .. //depot/projects/hammer/sys/sparc64/include/elf.h#8 integrate .. //depot/projects/hammer/sys/sparc64/include/trap.h#6 integrate .. //depot/projects/hammer/sys/sparc64/isa/isa.c#18 integrate .. //depot/projects/hammer/sys/sparc64/isa/ofw_isa.c#9 integrate .. //depot/projects/hammer/sys/sparc64/pci/apb.c#14 integrate .. //depot/projects/hammer/sys/sparc64/pci/ofw_pcib.c#11 integrate .. //depot/projects/hammer/sys/sparc64/pci/ofw_pcibus.c#22 integrate .. //depot/projects/hammer/sys/sparc64/pci/psycho.c#45 integrate .. //depot/projects/hammer/sys/sparc64/pci/psychovar.h#15 integrate .. //depot/projects/hammer/sys/sparc64/pci/schizo.c#6 integrate .. //depot/projects/hammer/sys/sparc64/sbus/dma_sbus.c#7 integrate .. //depot/projects/hammer/sys/sparc64/sbus/sbus.c#33 integrate .. //depot/projects/hammer/sys/sparc64/sbus/sbusvar.h#7 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/db_disasm.c#5 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/eeprom.c#12 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/elf_machdep.c#22 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/jbusppm.c#2 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/machdep.c#57 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/mp_machdep.c#28 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/nexus.c#16 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/rtc.c#8 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/sc_machdep.c#4 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/schppm.c#2 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/trap.c#30 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/upa.c#8 integrate .. //depot/projects/hammer/sys/sun4v/conf/GENERIC#15 integrate .. //depot/projects/hammer/sys/sun4v/include/elf.h#3 integrate .. //depot/projects/hammer/sys/sun4v/include/trap.h#3 integrate .. //depot/projects/hammer/sys/sun4v/sun4v/trap.c#7 integrate .. //depot/projects/hammer/sys/sys/_pthreadtypes.h#2 integrate .. //depot/projects/hammer/sys/sys/aio.h#6 integrate .. //depot/projects/hammer/sys/sys/buf.h#38 integrate .. //depot/projects/hammer/sys/sys/diskpc98.h#8 integrate .. //depot/projects/hammer/sys/sys/elf_common.h#13 integrate .. //depot/projects/hammer/sys/sys/imgact.h#13 integrate .. //depot/projects/hammer/sys/sys/imgact_elf.h#9 integrate .. //depot/projects/hammer/sys/sys/ktrace.h#10 integrate .. //depot/projects/hammer/sys/sys/lock_profile.h#8 integrate .. //depot/projects/hammer/sys/sys/memrange.h#4 integrate .. //depot/projects/hammer/sys/sys/mount.h#63 integrate .. //depot/projects/hammer/sys/sys/param.h#127 integrate .. //depot/projects/hammer/sys/sys/pipe.h#11 integrate .. //depot/projects/hammer/sys/sys/proc.h#128 integrate .. //depot/projects/hammer/sys/sys/sem.h#7 integrate .. //depot/projects/hammer/sys/sys/shm.h#10 integrate .. //depot/projects/hammer/sys/sys/smp.h#17 integrate .. //depot/projects/hammer/sys/sys/stat.h#16 integrate .. //depot/projects/hammer/sys/sys/sysctl.h#48 integrate .. //depot/projects/hammer/sys/sys/syslog.h#6 integrate .. //depot/projects/hammer/sys/sys/systm.h#60 integrate .. //depot/projects/hammer/sys/sys/termios.h#8 integrate .. //depot/projects/hammer/sys/sys/time.h#17 integrate .. //depot/projects/hammer/sys/sys/uio.h#14 integrate .. //depot/projects/hammer/sys/sys/vimage.h#6 integrate .. //depot/projects/hammer/sys/sys/vnode.h#89 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_snapshot.c#59 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_vfsops.c#83 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_vnops.c#55 integrate .. //depot/projects/hammer/sys/ufs/ufs/inode.h#16 integrate .. //depot/projects/hammer/sys/vm/vm_init.c#15 integrate .. //depot/projects/hammer/sys/vm/vnode_pager.c#50 integrate .. //depot/projects/hammer/sys/xen/evtchn/evtchn.c#5 integrate .. //depot/projects/hammer/sys/xen/evtchn/evtchn_dev.c#3 integrate .. //depot/projects/hammer/sys/xen/features.c#3 integrate .. //depot/projects/hammer/sys/xen/features.h#1 branch .. //depot/projects/hammer/sys/xen/gnttab.c#5 integrate .. //depot/projects/hammer/sys/xen/gnttab.h#5 integrate .. //depot/projects/hammer/sys/xen/hypervisor.h#2 integrate .. //depot/projects/hammer/sys/xen/interface/arch-x86/xen.h#3 integrate .. //depot/projects/hammer/sys/xen/interface/hvm/params.h#3 integrate .. //depot/projects/hammer/sys/xen/reboot.c#1 branch .. //depot/projects/hammer/sys/xen/xen_intr.h#2 integrate .. //depot/projects/hammer/sys/xen/xenbus/xenbus_probe.c#4 integrate .. //depot/projects/hammer/sys/xen/xenbus/xenbus_xs.c#5 integrate .. //depot/projects/hammer/tools/regression/include/tgmath/Makefile#4 integrate .. //depot/projects/hammer/tools/regression/mac/mac_portacl/LICENSE#1 branch .. //depot/projects/hammer/tools/regression/mac/mac_portacl/misc.sh#1 branch .. //depot/projects/hammer/tools/regression/mac/mac_portacl/nobody.t#1 branch .. //depot/projects/hammer/tools/regression/mac/mac_portacl/root.t#1 branch .. //depot/projects/hammer/tools/regression/sockets/unix_gc/unix_gc.c#2 integrate .. //depot/projects/hammer/tools/regression/usr.bin/pkill/pgrep-G.t#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/pkill/pgrep-S.t#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/pkill/pgrep-_g.t#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/pkill/pgrep-_s.t#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/pkill/pkill-G.t#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/pkill/pkill-_g.t#1 branch .. //depot/projects/hammer/tools/tools/ath/Makefile#9 integrate .. //depot/projects/hammer/tools/tools/ath/athdecode/Makefile#1 branch .. //depot/projects/hammer/tools/tools/ath/athdecode/main.c#1 branch .. //depot/projects/hammer/tools/tools/ath/athpoke/Makefile#1 branch .. //depot/projects/hammer/tools/tools/ath/athpoke/athpoke.c#1 branch .. //depot/projects/hammer/tools/tools/ath/athregs/Makefile#2 integrate .. //depot/projects/hammer/tools/tools/ath/athregs/dumpregs.h#2 delete .. //depot/projects/hammer/tools/tools/ath/athregs/dumpregs_5210.c#2 delete .. //depot/projects/hammer/tools/tools/ath/athregs/dumpregs_5211.c#2 delete .. //depot/projects/hammer/tools/tools/ath/athregs/dumpregs_5212.c#2 delete .. //depot/projects/hammer/tools/tools/ath/athregs/dumpregs_5416.c#3 delete .. //depot/projects/hammer/tools/tools/ath/common/dumpregs.h#1 branch .. //depot/projects/hammer/tools/tools/ath/common/dumpregs_5210.c#1 branch .. //depot/projects/hammer/tools/tools/ath/common/dumpregs_5211.c#1 branch .. //depot/projects/hammer/tools/tools/ath/common/dumpregs_5212.c#1 branch .. //depot/projects/hammer/tools/tools/ath/common/dumpregs_5416.c#1 branch .. //depot/projects/hammer/tools/tools/nanobsd/rescue/AMD64#2 integrate .. //depot/projects/hammer/tools/tools/nanobsd/rescue/I386#2 integrate .. //depot/projects/hammer/tools/tools/netrate/tcpp/Makefile#1 branch .. //depot/projects/hammer/tools/tools/netrate/tcpp/README#1 branch .. //depot/projects/hammer/tools/tools/netrate/tcpp/tcpp.c#1 branch .. //depot/projects/hammer/tools/tools/netrate/tcpp/tcpp.h#1 branch .. //depot/projects/hammer/tools/tools/netrate/tcpp/tcpp_client.c#1 branch .. //depot/projects/hammer/tools/tools/netrate/tcpp/tcpp_server.c#1 branch .. //depot/projects/hammer/tools/tools/netrate/tcpp/tcpp_util.c#1 branch .. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.freebsd#69 integrate .. //depot/projects/hammer/usr.bin/kdump/kdump.1#13 integrate .. //depot/projects/hammer/usr.bin/kdump/kdump.c#27 integrate .. //depot/projects/hammer/usr.bin/ktrace/ktrace.1#6 integrate .. //depot/projects/hammer/usr.bin/ktrace/ktrace.h#3 integrate .. //depot/projects/hammer/usr.bin/ktrace/subr.c#5 integrate .. //depot/projects/hammer/usr.bin/ministat/ministat.c#4 integrate .. //depot/projects/hammer/usr.bin/ncal/ncal.1#8 integrate .. //depot/projects/hammer/usr.bin/ncal/ncal.c#5 integrate .. //depot/projects/hammer/usr.bin/netstat/inet.c#31 integrate .. //depot/projects/hammer/usr.bin/netstat/main.c#31 integrate .. //depot/projects/hammer/usr.bin/netstat/mroute.c#9 integrate .. //depot/projects/hammer/usr.bin/netstat/netstat.h#25 integrate .. //depot/projects/hammer/usr.bin/sockstat/sockstat.c#14 integrate .. //depot/projects/hammer/usr.bin/systat/netstat.c#8 integrate .. //depot/projects/hammer/usr.bin/systat/vmstat.c#12 integrate .. //depot/projects/hammer/usr.bin/tar/Makefile#30 integrate .. //depot/projects/hammer/usr.bin/tar/bsdtar.c#41 integrate .. //depot/projects/hammer/usr.bin/tar/bsdtar.h#26 integrate .. //depot/projects/hammer/usr.bin/tar/bsdtar_platform.h#18 integrate .. //depot/projects/hammer/usr.bin/tar/cmdline.c#2 integrate .. //depot/projects/hammer/usr.bin/tar/getdate.c#1 branch .. //depot/projects/hammer/usr.bin/tar/getdate.y#8 delete .. //depot/projects/hammer/usr.bin/tar/matching.c#15 integrate .. //depot/projects/hammer/usr.bin/tar/read.c#29 integrate .. //depot/projects/hammer/usr.bin/tar/siginfo.c#2 integrate .. //depot/projects/hammer/usr.bin/tar/test/Makefile#5 integrate .. //depot/projects/hammer/usr.bin/tar/test/main.c#5 integrate .. //depot/projects/hammer/usr.bin/tar/test/test.h#4 integrate .. //depot/projects/hammer/usr.bin/tar/test/test_0.c#2 integrate .. //depot/projects/hammer/usr.bin/tar/test/test_basic.c#2 integrate .. //depot/projects/hammer/usr.bin/tar/test/test_copy.c#3 integrate .. //depot/projects/hammer/usr.bin/tar/test/test_getdate.c#2 integrate .. //depot/projects/hammer/usr.bin/tar/test/test_option_T.c#3 integrate .. //depot/projects/hammer/usr.bin/tar/test/test_option_s.c#1 branch .. //depot/projects/hammer/usr.bin/tar/test/test_patterns.c#3 integrate .. //depot/projects/hammer/usr.bin/tar/test/test_patterns_2.tar.uu#1 branch .. //depot/projects/hammer/usr.bin/tar/test/test_patterns_2.tgz.uu#2 delete .. //depot/projects/hammer/usr.bin/tar/test/test_patterns_3.tar.uu#1 branch .. //depot/projects/hammer/usr.bin/tar/test/test_patterns_3.tgz.uu#2 delete .. //depot/projects/hammer/usr.bin/tar/test/test_patterns_4.tar.uu#1 branch .. //depot/projects/hammer/usr.bin/tar/test/test_strip_components.c#2 integrate .. //depot/projects/hammer/usr.bin/tar/test/test_symlink_dir.c#2 integrate .. //depot/projects/hammer/usr.bin/tar/test/test_version.c#2 integrate .. //depot/projects/hammer/usr.bin/tar/tree.c#8 integrate .. //depot/projects/hammer/usr.bin/tar/util.c#19 integrate .. //depot/projects/hammer/usr.bin/tar/write.c#38 integrate .. //depot/projects/hammer/usr.bin/top/machine.c#28 integrate .. //depot/projects/hammer/usr.sbin/cxgbtool/cxgbtool.c#4 integrate .. //depot/projects/hammer/usr.sbin/cxgbtool/version.h#3 integrate .. //depot/projects/hammer/usr.sbin/eeprom/ofw_options.c#5 integrate .. //depot/projects/hammer/usr.sbin/gstat/gstat.8#11 integrate .. //depot/projects/hammer/usr.sbin/gstat/gstat.c#13 integrate .. //depot/projects/hammer/usr.sbin/ifmcstat/Makefile#7 integrate .. //depot/projects/hammer/usr.sbin/ifmcstat/ifmcstat.8#7 integrate .. //depot/projects/hammer/usr.sbin/ifmcstat/ifmcstat.c#9 integrate .. //depot/projects/hammer/usr.sbin/mergemaster/mergemaster.8#12 integrate .. //depot/projects/hammer/usr.sbin/mergemaster/mergemaster.sh#18 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/config.c#32 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/dispatch.c#8 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/menus.c#53 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/modules.c#5 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/sysinstall.8#20 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/sysinstall.h#35 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/user.c#6 integrate .. //depot/projects/hammer/usr.sbin/usbconfig/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/usbconfig/usbconfig.c#4 integrate .. //depot/projects/hammer/usr.sbin/wpa/Makefile.inc#3 integrate Differences ... ==== //depot/projects/hammer/Makefile#55 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.356 2008/12/27 15:07:51 bz Exp $ +# $FreeBSD: src/Makefile,v 1.357 2009/03/13 07:23:58 imp Exp $ # # The user-driven targets are: # @@ -88,7 +88,7 @@ obj objlink regress rerelease showconfig tags toolchain update \ _worldtmp _legacy _bootstrap-tools _cleanobj _obj \ _build-tools _cross-tools _includes _libraries _depend \ - build32 distribute32 install32 + build32 distribute32 install32 xdev xdev-build xdev-install TGTS+= ${SUBDIR_TARGETS} BITGTS= files includes ==== //depot/projects/hammer/Makefile.inc1#144 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.617 2009/02/21 15:04:31 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.623 2009/03/19 00:44:22 imp Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -232,7 +232,7 @@ BOOTSTRAPPING=${OSRELDATE} \ SSP_CFLAGS= \ -DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT -DWITHOUT_MAN \ - -DWITHOUT_NLS -DNO_PIC -DWITHOUT_PROFILE -DNO_SHARED \ + -DNO_PIC -DWITHOUT_PROFILE -DNO_SHARED \ -DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF # build-tools stage @@ -291,7 +291,7 @@ SHLIBDIR=/usr/lib32 LIB32WMAKE= ${LIB32WMAKEENV} ${MAKE} -DNO_CPU_CFLAGS -DCOMPAT_32BIT \ - -DWITHOUT_BIND -DWITHOUT_MAN -DWITHOUT_NLS -DWITHOUT_INFO \ + -DWITHOUT_BIND -DWITHOUT_MAN -DWITHOUT_INFO \ -DWITHOUT_HTML -DNO_CTF DESTDIR=${LIB32TMP} LIB32IMAKE= ${LIB32WMAKE:NINSTALL=*:NDESTDIR=*} -DNO_INCS .endif @@ -344,30 +344,13 @@ rm -f ${OBJTREE}${.CURDIR}/usr.bin/truss/ioctl.c .endif .for _dir in \ - usr/bin usr/games usr/include/sys usr/lib \ - usr/libexec usr/sbin usr/share/dict \ - usr/share/groff_font/devX100 \ - usr/share/groff_font/devX100-12 \ - usr/share/groff_font/devX75 \ - usr/share/groff_font/devX75-12 \ - usr/share/groff_font/devascii \ - usr/share/groff_font/devcp1047 \ - usr/share/groff_font/devdvi \ - usr/share/groff_font/devhtml \ - usr/share/groff_font/devkoi8-r \ - usr/share/groff_font/devlatin1 \ - usr/share/groff_font/devlbp \ - usr/share/groff_font/devlj4 \ - usr/share/groff_font/devps \ - usr/share/groff_font/devutf8 \ - usr/share/tmac/mdoc usr/share/tmac/mm - mkdir -p ${WORLDTMP}/legacy/${_dir} -.endfor -.for _dir in \ - lib usr/bin usr/include usr/lib/compat/aout usr/libdata/ldscripts \ - usr/libexec usr/sbin usr/share/misc + lib usr legacy/usr mkdir -p ${WORLDTMP}/${_dir} .endfor + mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \ + -p ${WORLDTMP}/legacy/usr >/dev/null + mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \ + -p ${WORLDTMP}/usr >/dev/null mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \ -p ${WORLDTMP}/usr/include >/dev/null ln -sf ${.CURDIR}/sys ${WORLDTMP} @@ -429,7 +412,7 @@ @echo "--------------------------------------------------------------" ${_+_}cd ${.CURDIR}; \ ${WMAKE} -DNO_FSCHG -DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT \ - -DWITHOUT_MAN -DWITHOUT_NLS -DWITHOUT_PROFILE libraries + -DWITHOUT_MAN -DWITHOUT_PROFILE libraries _depend: @echo @echo "--------------------------------------------------------------" @@ -448,10 +431,9 @@ @echo "--------------------------------------------------------------" @echo ">>> stage 5.1: building 32 bit shim libraries" @echo "--------------------------------------------------------------" -.for _dir in \ - usr/include usr/lib32 usr/share/misc - mkdir -p ${LIB32TMP}/${_dir} -.endfor + mkdir -p ${LIB32TMP}/usr/lib32 + mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \ + -p ${LIB32TMP}/usr >/dev/null mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \ -p ${LIB32TMP}/usr/include >/dev/null mkdir -p ${WORLDTMP} @@ -620,8 +602,12 @@ # # Required install tools to be saved in a scratch dir for safety. # +.if ${MK_INFO} != "no" +_install-info= install-info +.endif + ITOOLS= [ awk cap_mkdb cat chflags chmod chown \ - date echo egrep find grep install-info \ + date echo egrep find grep ${_install-info} \ ln lockf make mkdir mtree mv pwd_mkdb rm sed sh sysctl \ test true uname wc zic @@ -1039,6 +1025,7 @@ .for _tool in \ gnu/usr.bin/binutils \ gnu/usr.bin/cc \ + usr.bin/ar \ usr.bin/sed \ usr.bin/xlint/lint1 usr.bin/xlint/lint2 usr.bin/xlint/xlint \ ${_btxld} \ @@ -1337,3 +1324,92 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200903192216.n2JMGMxF043830>