Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 30 Sep 2008 00:39:35 GMT
From:      Peter Wemm <peter@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 150674 for review
Message-ID:  <200809300039.m8U0dZ2s050365@repoman.freebsd.org>

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

Change 150674 by peter@peter_overcee on 2008/09/30 00:38:55

	IFC @150672

Affected files ...

.. //depot/projects/hammer/Makefile.inc1#140 integrate
.. //depot/projects/hammer/ObsoleteFiles.inc#61 integrate
.. //depot/projects/hammer/bin/pkill/pkill.1#2 integrate
.. //depot/projects/hammer/bin/pkill/pkill.c#2 integrate
.. //depot/projects/hammer/cddl/contrib/opensolaris/lib/libdtrace/common/dt_printf.c#2 integrate
.. //depot/projects/hammer/crypto/openssh/moduli.5#2 integrate
.. //depot/projects/hammer/crypto/openssh/scp.1#11 integrate
.. //depot/projects/hammer/crypto/openssh/sftp-server.8#6 integrate
.. //depot/projects/hammer/crypto/openssh/sftp.1#11 integrate
.. //depot/projects/hammer/crypto/openssh/ssh-add.1#8 integrate
.. //depot/projects/hammer/crypto/openssh/ssh-agent.1#9 integrate
.. //depot/projects/hammer/crypto/openssh/ssh-keygen.1#10 integrate
.. //depot/projects/hammer/crypto/openssh/ssh-keyscan.1#9 integrate
.. //depot/projects/hammer/crypto/openssh/ssh-keysign.8#7 integrate
.. //depot/projects/hammer/crypto/openssh/ssh.1#13 integrate
.. //depot/projects/hammer/crypto/openssh/ssh_config.5#16 integrate
.. //depot/projects/hammer/crypto/openssh/sshconnect2.c#13 integrate
.. //depot/projects/hammer/crypto/openssh/sshd.8#13 integrate
.. //depot/projects/hammer/crypto/openssh/sshd_config.5#18 integrate
.. //depot/projects/hammer/crypto/openssl/FREEBSD-Xlist#5 delete
.. //depot/projects/hammer/crypto/openssl/FREEBSD-upgrade#3 delete
.. //depot/projects/hammer/etc/Makefile#64 integrate
.. //depot/projects/hammer/etc/periodic/daily/Makefile#8 integrate
.. //depot/projects/hammer/etc/periodic/monthly/Makefile#2 integrate
.. //depot/projects/hammer/etc/periodic/security/Makefile#6 integrate
.. //depot/projects/hammer/etc/periodic/weekly/Makefile#3 integrate
.. //depot/projects/hammer/etc/rc.d/jail#25 integrate
.. //depot/projects/hammer/gnu/lib/csu/Makefile#13 integrate
.. //depot/projects/hammer/gnu/lib/libgcc/Makefile#19 integrate
.. //depot/projects/hammer/gnu/lib/libgomp/Makefile#3 integrate
.. //depot/projects/hammer/gnu/usr.bin/Makefile#21 integrate
.. //depot/projects/hammer/gnu/usr.bin/gdb/kgdb/kld.c#4 integrate
.. //depot/projects/hammer/gnu/usr.bin/gdb/kgdb/trgt_i386.c#9 integrate
.. //depot/projects/hammer/include/Makefile#76 integrate
.. //depot/projects/hammer/include/unistd.h#27 integrate
.. //depot/projects/hammer/lib/Makefile#73 integrate
.. //depot/projects/hammer/lib/libarchive/archive.h#16 integrate
.. //depot/projects/hammer/lib/libarchive/archive_entry.h#25 integrate
.. //depot/projects/hammer/lib/libarchive/archive_read_support_format_mtree.c#7 integrate
.. //depot/projects/hammer/lib/libarchive/test/test_read_format_mtree.c#4 integrate
.. //depot/projects/hammer/lib/libc/gen/getosreldate.3#3 integrate
.. //depot/projects/hammer/lib/libc/powerpc/gen/syncicache.c#4 integrate
.. //depot/projects/hammer/lib/libc/sys/cpuset.2#3 integrate
.. //depot/projects/hammer/lib/libc/sys/cpuset_getaffinity.2#3 integrate
.. //depot/projects/hammer/lib/libc/uuid/Symbol.map#4 integrate
.. //depot/projects/hammer/lib/libpmc/pmc.3#17 integrate
.. //depot/projects/hammer/lib/libpmc/pmc_allocate.3#2 integrate
.. //depot/projects/hammer/lib/libpmc/pmc_capabilities.3#3 integrate
.. //depot/projects/hammer/lib/libpmc/pmc_disable.3#2 integrate
.. //depot/projects/hammer/lib/libpmc/pmc_start.3#2 integrate
.. //depot/projects/hammer/libexec/Makefile#35 integrate
.. //depot/projects/hammer/release/i386/fixit_crunch.conf#10 integrate
.. //depot/projects/hammer/release/pc98/fixit-small_crunch.conf#10 integrate
.. //depot/projects/hammer/release/pc98/fixit_crunch.conf#10 integrate
.. //depot/projects/hammer/sbin/Makefile#50 integrate
.. //depot/projects/hammer/sbin/bsdlabel/Makefile#11 integrate
.. //depot/projects/hammer/sbin/bsdlabel/bsdlabel.c#23 integrate
.. //depot/projects/hammer/sbin/fdisk/Makefile#5 integrate
.. //depot/projects/hammer/sbin/ifconfig/ifconfig.8#53 integrate
.. //depot/projects/hammer/sbin/ifconfig/ifconfig.c#41 integrate
.. //depot/projects/hammer/sbin/ifconfig/ifieee80211.c#37 integrate
.. //depot/projects/hammer/sbin/ifconfig/regdomain.c#4 integrate
.. //depot/projects/hammer/sbin/init/init.c#13 integrate
.. //depot/projects/hammer/sbin/ipfw/ipfw.8#68 integrate
.. //depot/projects/hammer/sbin/ipfw/ipfw2.c#66 integrate
.. //depot/projects/hammer/sbin/mount_nfs/mount_nfs.c#18 integrate
.. //depot/projects/hammer/sbin/setkey/setkey.8#6 integrate
.. //depot/projects/hammer/share/Makefile#12 integrate
.. //depot/projects/hammer/share/examples/drivers/make_pseudo_driver.sh#4 integrate
.. //depot/projects/hammer/share/man/man3/Makefile#21 integrate
.. //depot/projects/hammer/share/man/man3/makedev.3#1 branch
.. //depot/projects/hammer/share/man/man4/age.4#2 integrate
.. //depot/projects/hammer/share/man/man4/hwpmc.4#18 integrate
.. //depot/projects/hammer/share/man/man4/snd_hda.4#11 integrate
.. //depot/projects/hammer/share/man/man5/rc.conf.5#94 integrate
.. //depot/projects/hammer/share/man/man5/src.conf.5#20 integrate
.. //depot/projects/hammer/share/man/man9/Makefile#87 integrate
.. //depot/projects/hammer/share/man/man9/device_ids.9#4 delete
.. //depot/projects/hammer/share/man/man9/make_dev.9#13 integrate
.. //depot/projects/hammer/share/man/man9/spl.9#5 integrate
.. //depot/projects/hammer/share/misc/committers-src.dot#15 integrate
.. //depot/projects/hammer/share/mk/bsd.own.mk#28 integrate
.. //depot/projects/hammer/sys/amd64/amd64/elf_machdep.c#37 integrate
.. //depot/projects/hammer/sys/amd64/amd64/identcpu.c#61 integrate
.. //depot/projects/hammer/sys/amd64/amd64/mem.c#29 integrate
.. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#134 integrate
.. //depot/projects/hammer/sys/amd64/include/smp.h#37 integrate
.. //depot/projects/hammer/sys/amd64/linux32/linux32_sysvec.c#23 integrate
.. //depot/projects/hammer/sys/arm/arm/elf_machdep.c#8 integrate
.. //depot/projects/hammer/sys/arm/arm/mem.c#5 integrate
.. //depot/projects/hammer/sys/arm/arm/pmap.c#52 integrate
.. //depot/projects/hammer/sys/arm/at91/at91_mci.c#5 integrate
.. //depot/projects/hammer/sys/boot/Makefile#22 integrate
.. //depot/projects/hammer/sys/boot/ofw/libofw/Makefile#6 integrate
.. //depot/projects/hammer/sys/boot/ofw/libofw/ofw_console.c#8 integrate
.. //depot/projects/hammer/sys/cam/cam.h#3 integrate
.. //depot/projects/hammer/sys/cam/scsi/scsi_pass.c#12 integrate
.. //depot/projects/hammer/sys/cam/scsi/scsi_sa.c#22 integrate
.. //depot/projects/hammer/sys/cam/scsi/scsi_ses.c#17 integrate
.. //depot/projects/hammer/sys/cam/scsi/scsi_sg.c#4 integrate
.. //depot/projects/hammer/sys/cam/scsi/scsi_target.c#21 integrate
.. //depot/projects/hammer/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c#2 integrate
.. //depot/projects/hammer/sys/cddl/compat/opensolaris/sys/atomic.h#3 integrate
.. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#4 integrate
.. //depot/projects/hammer/sys/cddl/dev/dtrace/dtrace_clone.c#2 integrate
.. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_ioctl.c#1 branch
.. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_ioctl.h#1 branch
.. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_misc.c#58 integrate
.. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_proto.h#58 integrate
.. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscall.h#55 integrate
.. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscalls.c#55 integrate
.. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_sysent.c#55 integrate
.. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_util.h#5 integrate
.. //depot/projects/hammer/sys/compat/freebsd32/syscalls.master#60 integrate
.. //depot/projects/hammer/sys/compat/ia32/ia32_sysvec.c#22 integrate
.. //depot/projects/hammer/sys/compat/linprocfs/linprocfs.c#43 integrate
.. //depot/projects/hammer/sys/compat/linux/linux_misc.c#54 integrate
.. //depot/projects/hammer/sys/compat/svr4/svr4_sysvec.c#21 integrate
.. //depot/projects/hammer/sys/conf/files#188 integrate
.. //depot/projects/hammer/sys/conf/files.amd64#106 integrate
.. //depot/projects/hammer/sys/conf/files.i386#97 integrate
.. //depot/projects/hammer/sys/conf/files.ia64#42 integrate
.. //depot/projects/hammer/sys/conf/files.mips#3 integrate
.. //depot/projects/hammer/sys/conf/files.powerpc#33 integrate
.. //depot/projects/hammer/sys/conf/files.sparc64#47 integrate
.. //depot/projects/hammer/sys/conf/kern.pre.mk#55 integrate
.. //depot/projects/hammer/sys/conf/ldscript.mips#3 integrate
.. //depot/projects/hammer/sys/conf/options.mips#2 integrate
.. //depot/projects/hammer/sys/conf/options.sparc64#13 integrate
.. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_compat.h#17 integrate
.. //depot/projects/hammer/sys/contrib/pf/net/pf_ioctl.c#32 integrate
.. //depot/projects/hammer/sys/ddb/db_command.c#25 integrate
.. //depot/projects/hammer/sys/ddb/db_command.h#4 integrate
.. //depot/projects/hammer/sys/ddb/db_main.c#6 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_quirk.c#5 integrate
.. //depot/projects/hammer/sys/dev/agp/agp.c#3 integrate
.. //depot/projects/hammer/sys/dev/amr/amr.c#40 integrate
.. //depot/projects/hammer/sys/dev/arcmsr/arcmsr.c#16 integrate
.. //depot/projects/hammer/sys/dev/asr/asr.c#25 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#91 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-pci.c#48 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-pci.h#56 integrate
.. //depot/projects/hammer/sys/dev/ata/atapi-tape.c#25 integrate
.. //depot/projects/hammer/sys/dev/ath/if_ath.c#61 integrate
.. //depot/projects/hammer/sys/dev/ath/if_athvar.h#33 integrate
.. //depot/projects/hammer/sys/dev/atkbdc/psm.c#13 integrate
.. //depot/projects/hammer/sys/dev/bge/if_bge.c#84 integrate
.. //depot/projects/hammer/sys/dev/bktr/bktr_os.c#20 integrate
.. //depot/projects/hammer/sys/dev/bm/if_bm.c#4 integrate
.. //depot/projects/hammer/sys/dev/ce/if_ce.c#8 integrate
.. //depot/projects/hammer/sys/dev/cfe/cfe_api.c#1 branch
.. //depot/projects/hammer/sys/dev/cfe/cfe_api.h#1 branch
.. //depot/projects/hammer/sys/dev/cfe/cfe_api_int.h#1 branch
.. //depot/projects/hammer/sys/dev/cfe/cfe_console.c#1 branch
.. //depot/projects/hammer/sys/dev/cfe/cfe_error.h#1 branch
.. //depot/projects/hammer/sys/dev/cfe/cfe_ioctl.h#1 branch
.. //depot/projects/hammer/sys/dev/cfe/cfe_resource.c#1 branch
.. //depot/projects/hammer/sys/dev/cp/if_cp.c#27 integrate
.. //depot/projects/hammer/sys/dev/cpuctl/cpuctl.c#2 integrate
.. //depot/projects/hammer/sys/dev/ctau/if_ct.c#30 integrate
.. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_ael1002.c#8 integrate
.. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_common.h#10 integrate
.. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_mc5.c#7 integrate
.. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_mv88e1xxx.c#5 integrate
.. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_t3_hw.c#11 integrate
.. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_tn1010.c#2 integrate
.. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_vsc7323.c#4 integrate
.. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_vsc8211.c#6 integrate
.. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_xgmac.c#9 integrate
.. //depot/projects/hammer/sys/dev/cxgb/cxgb_adapter.h#21 integrate
.. //depot/projects/hammer/sys/dev/cxgb/cxgb_config.h#8 integrate
.. //depot/projects/hammer/sys/dev/cxgb/cxgb_include.h#6 integrate
.. //depot/projects/hammer/sys/dev/cxgb/cxgb_main.c#25 integrate
.. //depot/projects/hammer/sys/dev/cxgb/cxgb_multiq.c#4 integrate
.. //depot/projects/hammer/sys/dev/cxgb/cxgb_offload.c#11 integrate
.. //depot/projects/hammer/sys/dev/cxgb/cxgb_offload.h#11 integrate
.. //depot/projects/hammer/sys/dev/cxgb/cxgb_osdep.h#13 integrate
.. //depot/projects/hammer/sys/dev/cxgb/cxgb_sge.c#23 integrate
.. //depot/projects/hammer/sys/dev/cxgb/cxgb_t3fw.c#2 integrate
.. //depot/projects/hammer/sys/dev/cxgb/sys/cxgb_support.c#7 integrate
.. //depot/projects/hammer/sys/dev/cxgb/sys/mvec.h#9 integrate
.. //depot/projects/hammer/sys/dev/cxgb/sys/uipc_mvec.c#8 integrate
.. //depot/projects/hammer/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#3 integrate
.. //depot/projects/hammer/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c#2 integrate
.. //depot/projects/hammer/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cq.c#2 integrate
.. //depot/projects/hammer/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_dbg.c#2 integrate
.. //depot/projects/hammer/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_ev.c#2 integrate
.. //depot/projects/hammer/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_hal.c#2 integrate
.. //depot/projects/hammer/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_mem.c#2 integrate
.. //depot/projects/hammer/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.c#2 integrate
.. //depot/projects/hammer/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_qp.c#2 integrate
.. //depot/projects/hammer/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_resource.c#2 integrate
.. //depot/projects/hammer/sys/dev/cxgb/ulp/toecore/toedev.c#3 integrate
.. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#11 integrate
.. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#11 integrate
.. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_ddp.c#7 integrate
.. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_defs.h#5 integrate
.. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_l2t.c#3 integrate
.. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_l2t.h#2 integrate
.. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_listen.c#6 integrate
.. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_t3_ddp.h#4 integrate
.. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_tcp_offload.c#3 integrate
.. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_toepcb.h#4 integrate
.. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_tom.c#7 integrate
.. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_tom.h#3 integrate
.. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c#5 integrate
.. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_vm.c#2 integrate
.. //depot/projects/hammer/sys/dev/drm/drm_drv.c#7 integrate
.. //depot/projects/hammer/sys/dev/drm/drm_fops.c#4 integrate
.. //depot/projects/hammer/sys/dev/fb/fb.c#10 integrate
.. //depot/projects/hammer/sys/dev/fb/vgareg.h#5 integrate
.. //depot/projects/hammer/sys/dev/firewire/firewire.h#11 integrate
.. //depot/projects/hammer/sys/dev/firewire/fwdev.c#23 integrate
.. //depot/projects/hammer/sys/dev/hptiop/hptiop.c#4 integrate
.. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_amd.c#12 integrate
.. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_mod.c#24 integrate
.. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_piv.c#12 integrate
.. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_ppro.c#8 integrate
.. //depot/projects/hammer/sys/dev/iir/iir_ctrl.c#12 integrate
.. //depot/projects/hammer/sys/dev/iscsi/initiator/isc_cam.c#2 integrate
.. //depot/projects/hammer/sys/dev/iscsi/initiator/iscsi.c#3 integrate
.. //depot/projects/hammer/sys/dev/isp/isp_freebsd.c#33 integrate
.. //depot/projects/hammer/sys/dev/jme/if_jme.c#4 integrate
.. //depot/projects/hammer/sys/dev/jme/if_jmereg.h#3 integrate
.. //depot/projects/hammer/sys/dev/joy/joy.c#8 integrate
.. //depot/projects/hammer/sys/dev/kbd/kbd.c#16 integrate
.. //depot/projects/hammer/sys/dev/kbdmux/kbdmux.c#8 integrate
.. //depot/projects/hammer/sys/dev/le/if_le_cbus.c#4 integrate
.. //depot/projects/hammer/sys/dev/le/if_le_isa.c#4 integrate
.. //depot/projects/hammer/sys/dev/le/if_le_lebuffer.c#3 integrate
.. //depot/projects/hammer/sys/dev/le/if_le_pci.c#5 integrate
.. //depot/projects/hammer/sys/dev/le/lebuffer_sbus.c#2 integrate
.. //depot/projects/hammer/sys/dev/led/led.c#17 integrate
.. //depot/projects/hammer/sys/dev/mlx/mlx.c#14 integrate
.. //depot/projects/hammer/sys/dev/mly/mly.c#19 integrate
.. //depot/projects/hammer/sys/dev/mmc/mmc.c#3 integrate
.. //depot/projects/hammer/sys/dev/mmc/mmcbrvar.h#3 integrate
.. //depot/projects/hammer/sys/dev/mmc/mmcreg.h#3 integrate
.. //depot/projects/hammer/sys/dev/mmc/mmcsd.c#4 integrate
.. //depot/projects/hammer/sys/dev/mmc/mmcvar.h#3 integrate
.. //depot/projects/hammer/sys/dev/mse/mse.c#8 integrate
.. //depot/projects/hammer/sys/dev/msk/if_msk.c#12 integrate
.. //depot/projects/hammer/sys/dev/msk/if_mskreg.h#7 integrate
.. //depot/projects/hammer/sys/dev/pbio/pbio.c#7 integrate
.. //depot/projects/hammer/sys/dev/pci/vga_pci.c#4 integrate
.. //depot/projects/hammer/sys/dev/powermac_nvram/powermac_nvram.c#3 integrate
.. //depot/projects/hammer/sys/dev/ppbus/lpt.c#16 integrate
.. //depot/projects/hammer/sys/dev/ppbus/pcfclock.c#11 integrate
.. //depot/projects/hammer/sys/dev/ppbus/ppi.c#13 integrate
.. //depot/projects/hammer/sys/dev/rp/rpvar.h#7 integrate
.. //depot/projects/hammer/sys/dev/siba/siba.c#1 branch
.. //depot/projects/hammer/sys/dev/siba/siba_ids.h#1 branch
.. //depot/projects/hammer/sys/dev/siba/siba_pcib.c#1 branch
.. //depot/projects/hammer/sys/dev/siba/siba_pcibvar.h#1 branch
.. //depot/projects/hammer/sys/dev/siba/sibareg.h#1 branch
.. //depot/projects/hammer/sys/dev/siba/sibavar.h#1 branch
.. //depot/projects/hammer/sys/dev/snp/snp.c#28 integrate
.. //depot/projects/hammer/sys/dev/sound/midi/sequencer.c#12 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/emu10kx.c#7 integrate
.. //depot/projects/hammer/sys/dev/sound/pcm/dsp.c#36 integrate
.. //depot/projects/hammer/sys/dev/sound/pcm/mixer.c#25 integrate
.. //depot/projects/hammer/sys/dev/speaker/spkr.c#6 integrate
.. //depot/projects/hammer/sys/dev/streams/streams.c#18 integrate
.. //depot/projects/hammer/sys/dev/tdfx/tdfx_pci.c#18 integrate
.. //depot/projects/hammer/sys/dev/twa/tw_osl_freebsd.c#9 integrate
.. //depot/projects/hammer/sys/dev/twe/twe_freebsd.c#18 integrate
.. //depot/projects/hammer/sys/dev/usb/if_zyd.c#15 integrate
.. //depot/projects/hammer/sys/dev/usb/ubsa.c#24 integrate
.. //depot/projects/hammer/sys/dev/usb/ucomvar.h#11 integrate
.. //depot/projects/hammer/sys/dev/usb/ufm.c#15 integrate
.. //depot/projects/hammer/sys/dev/usb/ugen.c#32 integrate
.. //depot/projects/hammer/sys/dev/usb/uhid.c#25 integrate
.. //depot/projects/hammer/sys/dev/usb/ulpt.c#18 integrate
.. //depot/projects/hammer/sys/dev/usb/umass.c#51 integrate
.. //depot/projects/hammer/sys/dev/usb/ums.c#28 integrate
.. //depot/projects/hammer/sys/dev/usb/urio.c#13 integrate
.. //depot/projects/hammer/sys/dev/usb/usb.c#23 integrate
.. //depot/projects/hammer/sys/dev/usb/usbdevs#110 integrate
.. //depot/projects/hammer/sys/dev/usb/uscanner.c#32 integrate
.. //depot/projects/hammer/sys/dev/vkbd/vkbd.c#14 integrate
.. //depot/projects/hammer/sys/dev/xen/blkfront/blkfront.c#2 integrate
.. //depot/projects/hammer/sys/dev/xen/console/console.c#2 integrate
.. //depot/projects/hammer/sys/dev/xen/netfront/netfront.c#2 integrate
.. //depot/projects/hammer/sys/fs/coda/coda_fbsd.c#3 integrate
.. //depot/projects/hammer/sys/fs/devfs/devfs_devs.c#22 integrate
.. //depot/projects/hammer/sys/fs/devfs/devfs_vnops.c#61 integrate
.. //depot/projects/hammer/sys/fs/fdescfs/fdesc_vnops.c#26 integrate
.. //depot/projects/hammer/sys/fs/hpfs/hpfs_vnops.c#27 integrate
.. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_vnops.c#40 integrate
.. //depot/projects/hammer/sys/fs/ntfs/ntfs_vnops.c#24 integrate
.. //depot/projects/hammer/sys/fs/portalfs/portal_vnops.c#18 integrate
.. //depot/projects/hammer/sys/fs/pseudofs/pseudofs_vnops.c#29 integrate
.. //depot/projects/hammer/sys/fs/smbfs/smbfs_node.c#28 integrate
.. //depot/projects/hammer/sys/fs/tmpfs/tmpfs.h#9 integrate
.. //depot/projects/hammer/sys/fs/tmpfs/tmpfs_subr.c#12 integrate
.. //depot/projects/hammer/sys/fs/tmpfs/tmpfs_vnops.c#14 integrate
.. //depot/projects/hammer/sys/fs/udf/udf_vnops.c#41 integrate
.. //depot/projects/hammer/sys/geom/geom_dev.c#40 integrate
.. //depot/projects/hammer/sys/geom/geom_io.c#43 integrate
.. //depot/projects/hammer/sys/geom/part/g_part.c#16 integrate
.. //depot/projects/hammer/sys/geom/part/g_part_bsd.c#7 integrate
.. //depot/projects/hammer/sys/geom/part/g_part_pc98.c#5 integrate
.. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#8 integrate
.. //depot/projects/hammer/sys/i386/acpica/acpi_machdep.c#32 integrate
.. //depot/projects/hammer/sys/i386/bios/apm.c#18 integrate
.. //depot/projects/hammer/sys/i386/bios/apm.h#5 integrate
.. //depot/projects/hammer/sys/i386/bios/smapi.c#10 integrate
.. //depot/projects/hammer/sys/i386/i386/bios.c#21 integrate
.. //depot/projects/hammer/sys/i386/i386/db_trace.c#24 integrate
.. //depot/projects/hammer/sys/i386/i386/elf_machdep.c#16 integrate
.. //depot/projects/hammer/sys/i386/i386/identcpu.c#45 integrate
.. //depot/projects/hammer/sys/i386/i386/intr_machdep.c#28 integrate
.. //depot/projects/hammer/sys/i386/i386/mem.c#14 integrate
.. //depot/projects/hammer/sys/i386/i386/mp_machdep.c#77 integrate
.. //depot/projects/hammer/sys/i386/i386/pmap.c#116 integrate
.. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_sysvec.c#10 integrate
.. //depot/projects/hammer/sys/i386/include/param.h#15 integrate
.. //depot/projects/hammer/sys/i386/include/smp.h#20 integrate
.. //depot/projects/hammer/sys/i386/include/xen/evtchn.h#2 integrate
.. //depot/projects/hammer/sys/i386/linux/linux_sysvec.c#34 integrate
.. //depot/projects/hammer/sys/i386/xen/mp_machdep.c#2 integrate
.. //depot/projects/hammer/sys/i386/xen/pmap.c#3 integrate
.. //depot/projects/hammer/sys/i386/xen/xen_machdep.c#4 integrate
.. //depot/projects/hammer/sys/ia64/ia64/efi.c#4 integrate
.. //depot/projects/hammer/sys/ia64/ia64/elf_machdep.c#23 integrate
.. //depot/projects/hammer/sys/ia64/ia64/interrupt.c#32 integrate
.. //depot/projects/hammer/sys/ia64/ia64/mem.c#12 integrate
.. //depot/projects/hammer/sys/ia64/ia64/mp_machdep.c#23 integrate
.. //depot/projects/hammer/sys/ia64/ia64/sal.c#7 integrate
.. //depot/projects/hammer/sys/ia64/include/smp.h#5 integrate
.. //depot/projects/hammer/sys/kern/imgact_aout.c#20 integrate
.. //depot/projects/hammer/sys/kern/init_main.c#56 integrate
.. //depot/projects/hammer/sys/kern/init_sysent.c#71 integrate
.. //depot/projects/hammer/sys/kern/kern_condvar.c#30 integrate
.. //depot/projects/hammer/sys/kern/kern_conf.c#54 integrate
.. //depot/projects/hammer/sys/kern/kern_intr.c#54 integrate
.. //depot/projects/hammer/sys/kern/kern_pmc.c#7 integrate
.. //depot/projects/hammer/sys/kern/kern_shutdown.c#54 integrate
.. //depot/projects/hammer/sys/kern/kern_synch.c#70 integrate
.. //depot/projects/hammer/sys/kern/kern_syscalls.c#6 integrate
.. //depot/projects/hammer/sys/kern/makesyscalls.sh#14 integrate
.. //depot/projects/hammer/sys/kern/subr_clist.c#3 integrate
.. //depot/projects/hammer/sys/kern/subr_witness.c#77 integrate
.. //depot/projects/hammer/sys/kern/sys_generic.c#40 integrate
.. //depot/projects/hammer/sys/kern/syscalls.c#69 integrate
.. //depot/projects/hammer/sys/kern/syscalls.master#71 integrate
.. //depot/projects/hammer/sys/kern/systrace_args.c#15 integrate
.. //depot/projects/hammer/sys/kern/tty.c#63 integrate
.. //depot/projects/hammer/sys/kern/tty_pts.c#11 integrate
.. //depot/projects/hammer/sys/kern/tty_ttydisc.c#3 integrate
.. //depot/projects/hammer/sys/kern/uipc_mqueue.c#17 integrate
.. //depot/projects/hammer/sys/kern/vfs_cache.c#33 integrate
.. //depot/projects/hammer/sys/kern/vfs_mount.c#98 integrate
.. //depot/projects/hammer/sys/kern/vfs_vnops.c#58 integrate
.. //depot/projects/hammer/sys/libkern/memcmp.c#1 branch
.. //depot/projects/hammer/sys/mips/adm5120/if_admsw.c#3 integrate
.. //depot/projects/hammer/sys/mips/adm5120/obio.c#3 integrate
.. //depot/projects/hammer/sys/mips/conf/IDT#4 integrate
.. //depot/projects/hammer/sys/mips/idt/obio.c#3 integrate
.. //depot/projects/hammer/sys/mips/include/param.h#2 integrate
.. //depot/projects/hammer/sys/mips/include/smp.h#2 integrate
.. //depot/projects/hammer/sys/mips/malta/gt_pci.c#3 integrate
.. //depot/projects/hammer/sys/mips/mips/elf_machdep.c#2 integrate
.. //depot/projects/hammer/sys/mips/mips/intr_machdep.c#3 integrate
.. //depot/projects/hammer/sys/mips/mips/mem.c#2 integrate
.. //depot/projects/hammer/sys/mips/mips/mp_machdep.c#3 integrate
.. //depot/projects/hammer/sys/mips/mips/pmap.c#5 integrate
.. //depot/projects/hammer/sys/mips/mips/support.S#2 integrate
.. //depot/projects/hammer/sys/mips/mips/trap.c#3 integrate
.. //depot/projects/hammer/sys/mips/sentry5/s5_machdep.c#3 integrate
.. //depot/projects/hammer/sys/modules/cxgb/Makefile#11 integrate
.. //depot/projects/hammer/sys/modules/cxgb/cxgb/Makefile#9 integrate
.. //depot/projects/hammer/sys/modules/cxgb/cxgb_t3fw/Makefile#2 integrate
.. //depot/projects/hammer/sys/modules/cxgb/iw_cxgb/Makefile#2 integrate
.. //depot/projects/hammer/sys/modules/cxgb/toecore/Makefile#2 integrate
.. //depot/projects/hammer/sys/modules/cxgb/tom/Makefile#5 integrate
.. //depot/projects/hammer/sys/net/if.c#79 integrate
.. //depot/projects/hammer/sys/net/if_clone.c#12 integrate
.. //depot/projects/hammer/sys/net/if_clone.h#5 integrate
.. //depot/projects/hammer/sys/net/if_lagg.c#16 integrate
.. //depot/projects/hammer/sys/net/if_stf.c#31 integrate
.. //depot/projects/hammer/sys/net/if_tap.c#36 integrate
.. //depot/projects/hammer/sys/net/if_tun.c#34 integrate
.. //depot/projects/hammer/sys/net/route.c#38 integrate
.. //depot/projects/hammer/sys/net/route.h#23 integrate
.. //depot/projects/hammer/sys/net80211/ieee80211.h#21 integrate
.. //depot/projects/hammer/sys/net80211/ieee80211_adhoc.c#3 integrate
.. //depot/projects/hammer/sys/net80211/ieee80211_crypto.c#16 integrate
.. //depot/projects/hammer/sys/net80211/ieee80211_crypto.h#14 integrate
.. //depot/projects/hammer/sys/net80211/ieee80211_ddb.c#5 integrate
.. //depot/projects/hammer/sys/net80211/ieee80211_freebsd.c#18 integrate
.. //depot/projects/hammer/sys/net80211/ieee80211_freebsd.h#17 integrate
.. //depot/projects/hammer/sys/net80211/ieee80211_hostap.c#3 integrate
.. //depot/projects/hammer/sys/net80211/ieee80211_ht.c#13 integrate
.. //depot/projects/hammer/sys/net80211/ieee80211_ht.h#8 integrate
.. //depot/projects/hammer/sys/net80211/ieee80211_ioctl.c#40 integrate
.. //depot/projects/hammer/sys/net80211/ieee80211_ioctl.h#23 integrate
.. //depot/projects/hammer/sys/net80211/ieee80211_node.c#49 integrate
.. //depot/projects/hammer/sys/net80211/ieee80211_node.h#28 integrate
.. //depot/projects/hammer/sys/net80211/ieee80211_output.c#38 integrate
.. //depot/projects/hammer/sys/net80211/ieee80211_scan_sta.c#9 integrate
.. //depot/projects/hammer/sys/net80211/ieee80211_sta.c#3 integrate
.. //depot/projects/hammer/sys/net80211/ieee80211_var.h#36 integrate
.. //depot/projects/hammer/sys/net80211/ieee80211_wds.c#3 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#13 integrate
.. //depot/projects/hammer/sys/netgraph/netgraph.h#36 integrate
.. //depot/projects/hammer/sys/netgraph/ng_base.c#63 integrate
.. //depot/projects/hammer/sys/netgraph/ng_device.c#20 integrate
.. //depot/projects/hammer/sys/netgraph/ng_source.c#17 integrate
.. //depot/projects/hammer/sys/netinet/in_pcb.c#61 integrate
.. //depot/projects/hammer/sys/netinet/in_pcb.h#43 integrate
.. //depot/projects/hammer/sys/netinet/ip.h#11 integrate
.. //depot/projects/hammer/sys/netinet/ip_fw.h#37 integrate
.. //depot/projects/hammer/sys/netinet/ip_fw2.c#100 integrate
.. //depot/projects/hammer/sys/netinet/ip_input.c#75 integrate
.. //depot/projects/hammer/sys/netinet/tcp_input.c#88 integrate
.. //depot/projects/hammer/sys/netinet6/udp6_usrreq.c#41 integrate
.. //depot/projects/hammer/sys/netsmb/smb_dev.c#17 integrate
.. //depot/projects/hammer/sys/nfsclient/nfs_vnops.c#64 integrate
.. //depot/projects/hammer/sys/pc98/cbus/gdc.c#5 integrate
.. //depot/projects/hammer/sys/pc98/cbus/olpt.c#4 integrate
.. //depot/projects/hammer/sys/powerpc/aim/machdep.c#10 integrate
.. //depot/projects/hammer/sys/powerpc/aim/mmu_oea.c#7 integrate
.. //depot/projects/hammer/sys/powerpc/booke/machdep.c#6 integrate
.. //depot/projects/hammer/sys/powerpc/include/dbdma.h#2 integrate
.. //depot/projects/hammer/sys/powerpc/include/md_var.h#10 integrate
.. //depot/projects/hammer/sys/powerpc/include/pmap.h#14 integrate
.. //depot/projects/hammer/sys/powerpc/include/pte.h#4 integrate
.. //depot/projects/hammer/sys/powerpc/include/smp.h#4 integrate
.. //depot/projects/hammer/sys/powerpc/ofw/ofw_syscons.c#10 integrate
.. //depot/projects/hammer/sys/powerpc/powermac/ata_dbdma.c#1 branch
.. //depot/projects/hammer/sys/powerpc/powermac/ata_dbdma.h#1 branch
.. //depot/projects/hammer/sys/powerpc/powermac/ata_kauai.c#12 integrate
.. //depot/projects/hammer/sys/powerpc/powermac/ata_macio.c#15 integrate
.. //depot/projects/hammer/sys/powerpc/powermac/dbdma.c#2 integrate
.. //depot/projects/hammer/sys/powerpc/powermac/dbdmavar.h#2 integrate
.. //depot/projects/hammer/sys/powerpc/powerpc/cpu.c#11 integrate
.. //depot/projects/hammer/sys/powerpc/powerpc/elf_machdep.c#17 integrate
.. //depot/projects/hammer/sys/powerpc/powerpc/intr_machdep.c#20 integrate
.. //depot/projects/hammer/sys/powerpc/powerpc/mem.c#3 integrate
.. //depot/projects/hammer/sys/powerpc/powerpc/mp_machdep.c#10 integrate
.. //depot/projects/hammer/sys/powerpc/powerpc/syncicache.c#6 integrate
.. //depot/projects/hammer/sys/security/audit/audit_pipe.c#12 integrate
.. //depot/projects/hammer/sys/sparc64/include/smp.h#12 integrate
.. //depot/projects/hammer/sys/sparc64/include/tick.h#5 integrate
.. //depot/projects/hammer/sys/sparc64/pci/psycho.c#43 integrate
.. //depot/projects/hammer/sys/sparc64/pci/psychoreg.h#11 integrate
.. //depot/projects/hammer/sys/sparc64/pci/schizo.c#1 branch
.. //depot/projects/hammer/sys/sparc64/pci/schizoreg.h#1 branch
.. //depot/projects/hammer/sys/sparc64/pci/schizovar.h#1 branch
.. //depot/projects/hammer/sys/sparc64/sparc64/elf_machdep.c#20 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/genassym.c#18 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/intr_machdep.c#20 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/mem.c#16 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/mp_machdep.c#26 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/tick.c#15 integrate
.. //depot/projects/hammer/sys/sun4v/include/smp.h#4 integrate
.. //depot/projects/hammer/sys/sys/clist.h#4 integrate
.. //depot/projects/hammer/sys/sys/conf.h#47 integrate
.. //depot/projects/hammer/sys/sys/libkern.h#18 integrate
.. //depot/projects/hammer/sys/sys/mount.h#57 integrate
.. //depot/projects/hammer/sys/sys/param.h#119 integrate
.. //depot/projects/hammer/sys/sys/pmc.h#12 integrate
.. //depot/projects/hammer/sys/sys/pmckern.h#8 integrate
.. //depot/projects/hammer/sys/sys/syscall.h#68 integrate
.. //depot/projects/hammer/sys/sys/syscall.mk#68 integrate
.. //depot/projects/hammer/sys/sys/sysent.h#13 integrate
.. //depot/projects/hammer/sys/sys/sysproto.h#69 integrate
.. //depot/projects/hammer/sys/sys/systm.h#57 integrate
.. //depot/projects/hammer/sys/sys/tty.h#25 integrate
.. //depot/projects/hammer/sys/sys/ttydevsw.h#2 integrate
.. //depot/projects/hammer/sys/sys/ttydisc.h#3 integrate
.. //depot/projects/hammer/sys/sys/ttyhook.h#1 branch
.. //depot/projects/hammer/sys/sys/ttyqueue.h#2 integrate
.. //depot/projects/hammer/sys/sys/types.h#27 integrate
.. //depot/projects/hammer/sys/ufs/ffs/ffs_vfsops.c#79 integrate
.. //depot/projects/hammer/sys/ufs/ufs/ufs_dirhash.c#12 integrate
.. //depot/projects/hammer/sys/ufs/ufs/ufs_vnops.c#57 integrate
.. //depot/projects/hammer/sys/vm/device_pager.c#19 integrate
.. //depot/projects/hammer/sys/vm/swap_pager.c#61 integrate
.. //depot/projects/hammer/sys/vm/vm_mmap.c#56 integrate
.. //depot/projects/hammer/sys/vm/vm_page.c#75 integrate
.. //depot/projects/hammer/sys/vm/vm_page.h#33 integrate
.. //depot/projects/hammer/sys/vm/vm_pageout.c#51 integrate
.. //depot/projects/hammer/sys/vm/vm_pageout.h#12 integrate
.. //depot/projects/hammer/sys/xen/evtchn/evtchn.c#2 integrate
.. //depot/projects/hammer/sys/xen/gnttab.c#2 integrate
.. //depot/projects/hammer/sys/xen/gnttab.h#2 integrate
.. //depot/projects/hammer/sys/xen/interface/arch-ia64.h#2 integrate
.. //depot/projects/hammer/sys/xen/interface/arch-powerpc.h#2 integrate
.. //depot/projects/hammer/sys/xen/interface/arch-x86/cpuid.h#1 branch
.. //depot/projects/hammer/sys/xen/interface/arch-x86/hvm/save.h#1 branch
.. //depot/projects/hammer/sys/xen/interface/arch-x86/xen-mca.h#1 branch
.. //depot/projects/hammer/sys/xen/interface/arch-x86/xen-x86_32.h#2 integrate
.. //depot/projects/hammer/sys/xen/interface/arch-x86/xen-x86_64.h#2 integrate
.. //depot/projects/hammer/sys/xen/interface/arch-x86/xen.h#2 integrate
.. //depot/projects/hammer/sys/xen/interface/callback.h#2 integrate
.. //depot/projects/hammer/sys/xen/interface/domctl.h#2 integrate
.. //depot/projects/hammer/sys/xen/interface/features.h#2 integrate
.. //depot/projects/hammer/sys/xen/interface/foreign/mkchecker.py#2 integrate
.. //depot/projects/hammer/sys/xen/interface/foreign/mkheader.py#2 integrate
.. //depot/projects/hammer/sys/xen/interface/foreign/structs.py#2 integrate
.. //depot/projects/hammer/sys/xen/interface/grant_table.h#2 integrate
.. //depot/projects/hammer/sys/xen/interface/hvm/hvm_op.h#2 integrate
.. //depot/projects/hammer/sys/xen/interface/hvm/ioreq.h#2 integrate
.. //depot/projects/hammer/sys/xen/interface/hvm/params.h#2 integrate
.. //depot/projects/hammer/sys/xen/interface/hvm/save.h#2 integrate
.. //depot/projects/hammer/sys/xen/interface/io/blkif.h#2 integrate
.. //depot/projects/hammer/sys/xen/interface/io/fbif.h#2 integrate
.. //depot/projects/hammer/sys/xen/interface/io/kbdif.h#2 integrate
.. //depot/projects/hammer/sys/xen/interface/io/netif.h#2 integrate
.. //depot/projects/hammer/sys/xen/interface/io/pciif.h#2 integrate
.. //depot/projects/hammer/sys/xen/interface/io/protocols.h#2 integrate
.. //depot/projects/hammer/sys/xen/interface/io/ring.h#2 integrate
.. //depot/projects/hammer/sys/xen/interface/io/xenbus.h#2 integrate
.. //depot/projects/hammer/sys/xen/interface/io/xs_wire.h#2 integrate
.. //depot/projects/hammer/sys/xen/interface/kexec.h#2 integrate
.. //depot/projects/hammer/sys/xen/interface/libelf.h#2 integrate
.. //depot/projects/hammer/sys/xen/interface/memory.h#2 integrate
.. //depot/projects/hammer/sys/xen/interface/physdev.h#2 integrate
.. //depot/projects/hammer/sys/xen/interface/platform.h#2 integrate
.. //depot/projects/hammer/sys/xen/interface/sysctl.h#2 integrate
.. //depot/projects/hammer/sys/xen/interface/trace.h#2 integrate
.. //depot/projects/hammer/sys/xen/interface/vcpu.h#2 integrate
.. //depot/projects/hammer/sys/xen/interface/xen-compat.h#2 integrate
.. //depot/projects/hammer/sys/xen/interface/xen.h#2 integrate
.. //depot/projects/hammer/tools/build/options/WITHOUT_ACCT#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_AMD#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_APM#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_AT#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_BSNMP#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_CTM#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_FLOPPY#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_FREEBSD_UPDATE#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_IPFW#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_JAIL#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_LEGACY_CONSOLE#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_LOCATE#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_MAIL#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_MAKE#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_NDIS#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_NETGRAPH#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_NETGRAPH_SUPPORT#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_NTP#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_PKGTOOLS#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_PMC#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_PORTSNAP#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_PPP#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_QUOTAS#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_ROUTED#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_SLIP#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_SYSINSTALL#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_TELNET#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_TEXTPROC#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_WIRELESS#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_WIRELESS_SUPPORT#1 branch
.. //depot/projects/hammer/tools/tools/nanobsd/nanobsd.sh#19 integrate
.. //depot/projects/hammer/tools/tools/net80211/scripts/config#2 integrate
.. //depot/projects/hammer/usr.bin/Makefile#65 integrate
.. //depot/projects/hammer/usr.bin/ar/Makefile#5 integrate
.. //depot/projects/hammer/usr.bin/ar/acplex.l#1 branch
.. //depot/projects/hammer/usr.bin/ar/acpyacc.y#1 branch
.. //depot/projects/hammer/usr.bin/ar/ar.c#6 integrate
.. //depot/projects/hammer/usr.bin/ar/ar.h#3 integrate
.. //depot/projects/hammer/usr.bin/ar/write.c#4 integrate
.. //depot/projects/hammer/usr.bin/cpuset/cpuset.1#3 integrate
.. //depot/projects/hammer/usr.bin/make/job.c#33 integrate
.. //depot/projects/hammer/usr.bin/netstat/Makefile#17 integrate
.. //depot/projects/hammer/usr.bin/netstat/main.c#28 integrate
.. //depot/projects/hammer/usr.bin/netstat/netstat.h#23 integrate
.. //depot/projects/hammer/usr.sbin/Makefile#93 integrate
.. //depot/projects/hammer/usr.sbin/pmcstat/pmcstat.8#12 integrate
.. //depot/projects/hammer/usr.sbin/pmcstat/pmcstat.c#17 integrate
.. //depot/projects/hammer/usr.sbin/pstat/pstat.8#11 integrate
.. //depot/projects/hammer/usr.sbin/pstat/pstat.c#22 integrate
.. //depot/projects/hammer/usr.sbin/syslogd/syslogd.8#15 integrate
.. //depot/projects/hammer/usr.sbin/syslogd/syslogd.c#36 integrate
.. //depot/projects/hammer/usr.sbin/timed/timed/globals.h#3 integrate

Differences ...

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

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile.inc1,v 1.610 2008/08/19 14:23:26 jhb Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.611 2008/09/19 16:14:42 obrien Exp $
 #
 # Make command line options:
 #	-DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -27,6 +27,10 @@
 
 .include <bsd.own.mk>
 
+.if ${MACHINE_ARCH} == "mips"
+MK_RESCUE=no	# not yet
+.endif
+
 # We must do share/info early so that installation of info `dir'
 # entries works correctly.  Do it first since it is less likely to
 # grow dependencies on include and lib than vice versa.

==== //depot/projects/hammer/ObsoleteFiles.inc#61 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.161 2008/09/17 15:49:44 attilio Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.163 2008/09/28 20:15:45 ed Exp $
 #
 # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
 # directories (OLD_DIRS) which should get removed at an update. Recently
@@ -14,8 +14,15 @@
 # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
 #
 
+# 20080928: removal of inaccurate device_ids(9) manual page
+OLD_FILES+=usr/share/man/man9/device_ids.9.gz
+OLD_FILES+=usr/share/man/man9/major.9.gz
+OLD_FILES+=usr/share/man/man9/minor.9.gz
+OLD_FILES+=usr/share/man/man9/umajor.9.gz
+OLD_FILES+=usr/share/man/man9/uminor.9.gz
 # 20080917: removal of manpage for axed kernel primitive suser(9)
-OLD_FILES+=usr/share/man/man9/suser.9
+OLD_FILES+=usr/share/man/man9/suser.9.gz
+OLD_FILES+=usr/share/man/man9/suser_cred.9.gz
 # 20080913: pax removed from rescue
 OLD_FILES+=rescue/pax
 # 20080823: removal of unneeded pt_chown, to implement grantpt(3)

==== //depot/projects/hammer/bin/pkill/pkill.1#2 (text+ko) ====

@@ -1,6 +1,6 @@
 .\"	$NetBSD: pkill.1,v 1.8 2003/02/14 15:59:18 grant Exp $
 .\"
-.\" $FreeBSD: src/bin/pkill/pkill.1,v 1.1 2008/08/31 14:27:59 yar Exp $
+.\" $FreeBSD: src/bin/pkill/pkill.1,v 1.2 2008/09/28 16:44:15 ed Exp $
 .\"
 .\" Copyright (c) 2002 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -179,10 +179,9 @@
 Restrict matches to processes associated with a terminal in the
 comma-separated list
 .Ar tty .
-Terminal names may be of the form
-.Pa tty Ns Ar xx
-or the shortened form
-.Ar xx .
+The 
+.Pa /dev/
+prefix of the terminal names must be omitted.
 A single dash
 .Pq Ql -
 matches processes not associated with a terminal.

==== //depot/projects/hammer/bin/pkill/pkill.c#2 (text+ko) ====

@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/pkill/pkill.c,v 1.1 2008/08/31 14:27:59 yar Exp $");
+__FBSDID("$FreeBSD: src/bin/pkill/pkill.c,v 1.2 2008/09/28 16:44:15 ed Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -607,12 +607,11 @@
 	struct passwd *pw;
 	struct group *gr;
 	struct stat st;
-	const char *cp, *prefix;
+	const char *cp;
 	char *sp, *ep, buf[MAXPATHLEN];
 	int empty;
 
 	empty = 1;
-	prefix = _PATH_DEV;
 
 	while ((sp = strsep(&src, ",")) != NULL) {
 		if (*sp == '\0')
@@ -673,11 +672,9 @@
 				cp = "console";
 			} else {
 				cp = sp;
-				if (strncmp(sp, "tty", 3) != 0)
-					prefix = _PATH_TTY;
 			}
 
-			snprintf(buf, sizeof(buf), "%s%s", prefix, cp);
+			snprintf(buf, sizeof(buf), _PATH_DEV "%s", cp);
 
 			if (stat(buf, &st) == -1) {
 				if (errno == ENOENT) {

==== //depot/projects/hammer/cddl/contrib/opensolaris/lib/libdtrace/common/dt_printf.c#2 (text+ko) ====

@@ -306,7 +306,7 @@
 	case sizeof (double):
 		return (dt_printf(dtp, fp, format,
 		    *((double *)addr) / n));
-#if !defined(__arm__) && !defined(__powerpc__)
+#if !defined(__arm__) && !defined(__powerpc__) && !defined(__mips__)
 	case sizeof (long double):
 		return (dt_printf(dtp, fp, format,
 		    *((long double *)addr) / ldn));

==== //depot/projects/hammer/crypto/openssh/moduli.5#2 (text+ko) ====

@@ -13,7 +13,7 @@
 .\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-.Dd $Mdocdate: June 26 2008 $
+.Dd June 26 2008
 .Dt MODULI 5
 .Os
 .Sh NAME

==== //depot/projects/hammer/crypto/openssh/scp.1#11 (text+ko) ====

@@ -11,7 +11,7 @@
 .\"
 .\" $OpenBSD: scp.1,v 1.46 2008/07/12 05:33:41 djm Exp $
 .\"
-.Dd $Mdocdate: July 12 2008 $
+.Dd July 12 2008
 .Dt SCP 1
 .Os
 .Sh NAME

==== //depot/projects/hammer/crypto/openssh/sftp-server.8#6 (text+ko) ====

@@ -22,7 +22,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: July 18 2008 $
+.Dd July 18 2008
 .Dt SFTP-SERVER 8
 .Os
 .Sh NAME

==== //depot/projects/hammer/crypto/openssh/sftp.1#11 (text+ko) ====

@@ -22,7 +22,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: July 15 2008 $
+.Dd July 15 2008
 .Dt SFTP 1
 .Os
 .Sh NAME

==== //depot/projects/hammer/crypto/openssh/ssh-add.1#8 (text+ko) ====

@@ -37,7 +37,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: June 12 2007 $
+.Dd June 12 2007
 .Dt SSH-ADD 1
 .Os
 .Sh NAME

==== //depot/projects/hammer/crypto/openssh/ssh-agent.1#9 (text+ko) ====

@@ -34,7 +34,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: June 5 2007 $
+.Dd June 5 2007
 .Dt SSH-AGENT 1
 .Os
 .Sh NAME

==== //depot/projects/hammer/crypto/openssh/ssh-keygen.1#10 (text+ko) ====

@@ -37,7 +37,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: June 12 2008 $
+.Dd June 12 2008
 .Dt SSH-KEYGEN 1
 .Os
 .Sh NAME

==== //depot/projects/hammer/crypto/openssh/ssh-keyscan.1#9 (text+ko) ====

@@ -6,7 +6,7 @@
 .\" permitted provided that due credit is given to the author and the
 .\" OpenBSD project by leaving this copyright notice intact.
 .\"
-.Dd $Mdocdate: April 30 2008 $
+.Dd April 30 2008
 .Dt SSH-KEYSCAN 1
 .Os
 .Sh NAME

==== //depot/projects/hammer/crypto/openssh/ssh-keysign.8#7 (text+ko) ====

@@ -22,7 +22,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd May 31 2007
 .Dt SSH-KEYSIGN 8
 .Os
 .Sh NAME

==== //depot/projects/hammer/crypto/openssh/ssh.1#13 (text+ko) ====

@@ -35,8 +35,8 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" $OpenBSD: ssh.1,v 1.277 2008/07/02 13:47:39 djm Exp $
-.\" $FreeBSD: src/crypto/openssh/ssh.1,v 1.36 2008/08/01 02:48:36 des Exp $
-.Dd $Mdocdate: July 2 2008 $
+.\" $FreeBSD: src/crypto/openssh/ssh.1,v 1.37 2008/09/29 10:53:05 des Exp $
+.Dd July 2 2008
 .Dt SSH 1
 .Os
 .Sh NAME

==== //depot/projects/hammer/crypto/openssh/ssh_config.5#16 (text+ko) ====

@@ -35,8 +35,8 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" $OpenBSD: ssh_config.5,v 1.111 2008/06/26 11:46:31 grunk Exp $
-.\" $FreeBSD: src/crypto/openssh/ssh_config.5,v 1.24 2008/08/01 02:48:36 des Exp $
-.Dd $Mdocdate: June 26 2008 $
+.\" $FreeBSD: src/crypto/openssh/ssh_config.5,v 1.25 2008/09/29 10:53:05 des Exp $
+.Dd June 26 2008
 .Dt SSH_CONFIG 5
 .Os
 .Sh NAME

==== //depot/projects/hammer/crypto/openssh/sshconnect2.c#13 (text+ko) ====

@@ -386,8 +386,9 @@
 	if (options.log_level >= SYSLOG_LEVEL_INFO) {
 		if (len > 65536)
 			len = 65536;
-		msg = xmalloc(len * 4); /* max expansion from strnvis() */
+		msg = xmalloc(len * 4 + 1); /* max expansion from strnvis() */
 		strnvis(msg, raw, len * 4, VIS_SAFE|VIS_OCTAL);
+		msg[len*4] = '\0';
 		fprintf(stderr, "%s", msg);
 		xfree(msg);
 	}

==== //depot/projects/hammer/crypto/openssh/sshd.8#13 (text+ko) ====

@@ -35,8 +35,8 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" $OpenBSD: sshd.8,v 1.246 2008/07/02 02:24:18 djm Exp $
-.\" $FreeBSD: src/crypto/openssh/sshd.8,v 1.35 2008/08/01 02:48:36 des Exp $
-.Dd $Mdocdate: July 2 2008 $
+.\" $FreeBSD: src/crypto/openssh/sshd.8,v 1.36 2008/09/29 10:53:05 des Exp $
+.Dd July 2 2008
 .Dt SSHD 8
 .Os
 .Sh NAME

==== //depot/projects/hammer/crypto/openssh/sshd_config.5#18 (text+ko) ====

@@ -35,8 +35,8 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" $OpenBSD: sshd_config.5,v 1.96 2008/07/02 02:24:18 djm Exp $
-.\" $FreeBSD: src/crypto/openssh/sshd_config.5,v 1.30 2008/08/01 02:48:36 des Exp $
-.Dd $Mdocdate: July 2 2008 $
+.\" $FreeBSD: src/crypto/openssh/sshd_config.5,v 1.31 2008/09/29 10:53:05 des Exp $
+.Dd July 2 2008
 .Dt SSHD_CONFIG 5
 .Os
 .Sh NAME

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

@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.11 (Berkeley) 5/21/91
-# $FreeBSD: src/etc/Makefile,v 1.368 2008/05/26 10:39:45 bz Exp $
+# $FreeBSD: src/etc/Makefile,v 1.370 2008/09/22 15:37:47 sam Exp $
 
 .include <bsd.own.mk>
 
@@ -7,22 +7,19 @@
 SUBDIR=	sendmail
 .endif
 
-BIN1=	amd.map apmd.conf auth.conf \
+BIN1=	auth.conf \
 	crontab csh.cshrc csh.login csh.logout devd.conf devfs.conf \
-	ddb.conf dhclient.conf disktab fbtab freebsd-update.conf \
+	ddb.conf dhclient.conf disktab fbtab \
 	ftpusers gettytab group \
-	hosts hosts.allow hosts.equiv hosts.lpd \
+	hosts hosts.allow hosts.equiv \
 	inetd.conf libalias.conf login.access login.conf mac.conf motd \
 	netconfig network.subr networks newsyslog.conf nsswitch.conf \
-	portsnap.conf pf.os phones profile protocols \
+	phones profile protocols \
 	rc rc.bsdextended rc.firewall rc.firewall6 rc.initdiskless \
 	rc.sendmail rc.shutdown \
-	rc.subr regdomain.xml remote rpc services shells \
-	snmpd.config sysctl.conf syslog.conf \
-	etc.${MACHINE_ARCH}/ttys \
-	${.CURDIR}/../gnu/usr.bin/man/manpath/manpath.config \
-	${.CURDIR}/../usr.bin/mail/misc/mail.rc \
-	${.CURDIR}/../usr.bin/locate/locate/locate.rc
+	rc.subr remote rpc services shells \
+	sysctl.conf syslog.conf \
+	etc.${MACHINE_ARCH}/ttys
 
 OPENBSMDIR=			${.CURDIR}/../contrib/openbsm
 BSM_ETC_OPEN_FILES=		${OPENBSMDIR}/etc/audit_class \
@@ -32,12 +29,38 @@
 BSM_ETC_EXEC_FILES=		${OPENBSMDIR}/etc/audit_warn
 BSM_ETC_DIR=			${DESTDIR}/etc/security
 
+# NB: keep these sorted by MK_* knobs
+
+.if ${MK_AMD} != "no"
+BIN1+= amd.map
+.endif
+
+.if ${MK_APM} != "no"
+BIN1+= apmd.conf
+.endif
+
+.if ${MK_BSNMP} != "no"
+BIN1+= snmpd.config
+.endif
+
+.if ${MK_FREEBSD_UPDATE} != "no"
+BIN1+= freebsd-update.conf
+.endif
+
+.if ${MK_LOCATE} != "no"
+BIN1+=	${.CURDIR}/../usr.bin/locate/locate/locate.rc
+.endif
+
 .if ${MK_LPR} != "no"
-BIN1+=	printcap
+BIN1+=	hosts.lpd printcap
+.endif
+
+.if ${MK_MAIL} != "no"
+BIN1+=	${.CURDIR}/../usr.bin/mail/misc/mail.rc
 .endif
 
-.if ${MK_NS_CACHING} != "no"
-BIN1+= nscd.conf
+.if ${MK_MAN} != "no"
+BIN1+=	${.CURDIR}/../gnu/usr.bin/man/manpath/manpath.config
 .endif
 
 .if ${MK_OPENSSH} != "no"
@@ -49,6 +72,22 @@
 SSL=	${.CURDIR}/../crypto/openssl/apps/openssl.cnf
 .endif
 
+.if ${MK_NS_CACHING} != "no"
+BIN1+= nscd.conf
+.endif
+
+.if ${MK_PORTSNAP} != "no"
+BIN1+= portsnap.conf
+.endif
+
+.if ${MK_PF} != "no"
+BIN1+= pf.os
+.endif
+
+.if ${MK_WIRELESS} != "no"
+BIN1+= regdomain.xml
+.endif
+
 # -rwxr-xr-x root:wheel, for the new cron root:wheel
 BIN2=	netstart pccard_ether rc.suspend rc.resume
 
@@ -112,7 +151,9 @@
 		master.passwd nsmb.conf opieaccess ${DESTDIR}/etc; \
 	    pwd_mkdb ${PWD_MKDB_ENDIAN} -i -p -d ${DESTDIR}/etc \
 		${DESTDIR}/etc/master.passwd
+.if ${MK_BLUETOOTH} != "no"
 	${_+_}cd ${.CURDIR}/bluetooth; ${MAKE} install
+.endif

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



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