PERFORCE change 164977 for review
Alexander Motin
mav at FreeBSD.org
Tue Jun 23 16:17:04 UTC 2009
http://perforce.freebsd.org/chv.cgi?CH=164977
Change 164977 by mav at mav_mavbook on 2009/06/23 16:16:14
IFC.
Affected files ...
.. //depot/projects/scottl-camlock/src/UPDATING#6 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/input.c#3 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/output.c#2 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/redir.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/ipfilter/tools/ipfcomp.c#3 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssh/config.h#3 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssh/ssh_namespace.h#3 integrate
.. //depot/projects/scottl-camlock/src/gnu/lib/libgcov/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/include/rpc/svc_dg.h#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/archive_read.c#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/arm/stdlib/Makefile.inc#2 delete
.. //depot/projects/scottl-camlock/src/lib/libc/arm/string/strncmp.S#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/gen/initgroups.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/gen/initgroups.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/i386/stdlib/Makefile.inc#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/i386/stdlib/abs.S#3 delete
.. //depot/projects/scottl-camlock/src/lib/libc/i386/stdlib/div.S#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/i386/stdlib/labs.S#3 delete
.. //depot/projects/scottl-camlock/src/lib/libc/i386/stdlib/ldiv.S#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/ia64/stdlib/Makefile.inc#2 delete
.. //depot/projects/scottl-camlock/src/lib/libc/mips/stdlib/Makefile.inc#2 delete
.. //depot/projects/scottl-camlock/src/lib/libc/rpc/auth_unix.c#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/rpc/netname.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/rpc/netnamer.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/rpc/svc_dg.c#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/rpc/svc_generic.c#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/sparc64/stdlib/Makefile.inc#2 delete
.. //depot/projects/scottl-camlock/src/lib/libc/stdlib/Makefile.inc#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/sys/Symbol.map#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/sys/getgroups.2#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/sys/setgroups.2#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libdisk/change.c#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libkiconv/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libkiconv/kiconv_sysctl.c#1 branch
.. //depot/projects/scottl-camlock/src/lib/libkiconv/quirks.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libkiconv/xlat16_iconv.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libkiconv/xlat16_sysctl.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libkvm/kvm_proc.c#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libpam/modules/pam_unix/pam_unix.8#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libusb/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libusb/libusb.3#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libusb/libusb.h#1 branch
.. //depot/projects/scottl-camlock/src/lib/libusb/libusb10.c#1 branch
.. //depot/projects/scottl-camlock/src/lib/libusb/libusb10.h#1 branch
.. //depot/projects/scottl-camlock/src/lib/libusb/libusb10_desc.c#1 branch
.. //depot/projects/scottl-camlock/src/lib/libusb/libusb10_io.c#1 branch
.. //depot/projects/scottl-camlock/src/lib/libusb/libusb20.3#1 branch
.. //depot/projects/scottl-camlock/src/lib/libusb/libusb20_compat10.c#2 delete
.. //depot/projects/scottl-camlock/src/lib/libusb/libusb20_compat10.h#2 delete
.. //depot/projects/scottl-camlock/src/lib/libusb/libusb20_ugen20.c#3 integrate
.. //depot/projects/scottl-camlock/src/lib/ncurses/ncurses/pathnames.h#2 integrate
.. //depot/projects/scottl-camlock/src/libexec/rtld-elf/rtld.c#4 integrate
.. //depot/projects/scottl-camlock/src/libexec/rtld-elf/rtld.h#5 integrate
.. //depot/projects/scottl-camlock/src/release/picobsd/build/picobsd#3 integrate
.. //depot/projects/scottl-camlock/src/release/picobsd/mfs_tree/etc/motd#2 integrate
.. //depot/projects/scottl-camlock/src/sbin/fdisk/fdisk.c#4 integrate
.. //depot/projects/scottl-camlock/src/sbin/sysctl/sysctl.c#3 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssh/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/Makefile#5 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/acpi_hp.4#1 branch
.. //depot/projects/scottl-camlock/src/share/man/man4/acpi_wmi.4#1 branch
.. //depot/projects/scottl-camlock/src/share/man/man4/pcm.4#4 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/pts.4#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/lock.9#4 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/ucred.9#3 integrate
.. //depot/projects/scottl-camlock/src/share/zoneinfo/asia#4 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/include/pmap.h#14 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/arm/elf_trampoline.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/arm/pmap.c#20 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/conf/AVILA.hints#5 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/conf/CAMBRIA.hints#3 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/include/pmap.h#18 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/avila_ata.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/avila_machdep.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/cambria_exp_space.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/files.avila#3 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/if_npe.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/ixp425.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/ixp425_npe.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/ixp425_npereg.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/ixp425reg.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/ixp425var.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/uart_bus_ixp425.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/powerpc/uboot/version#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/cam_periph.c#29 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/cam_periph.h#16 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/vnode.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_proto.h#20 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_syscall.h#20 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_syscalls.c#20 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_sysent.c#20 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/syscalls.master#21 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_ioctl.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_misc.c#21 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_uid16.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/ndis/kern_ndis.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/ndis/subr_ndis.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/ndis/subr_usbd.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/NOTES#30 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/files#34 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/files.amd64#20 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/files.i386#20 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/files.powerpc#18 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/kmod.mk#18 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/options#26 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/acpi_support/acpi_hp.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/acpi_support/acpi_wmi.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/acpi_support/acpi_wmi_if.m#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/acpica/Osd/OsdSynch.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-usb.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/cxgb/common/cxgb_t3_cpl.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/cxgb/cxgb_adapter.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/cxgb/cxgb_main.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/cxgb/cxgb_multiq.c#6 delete
.. //depot/projects/scottl-camlock/src/sys/dev/cxgb/cxgb_osdep.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/cxgb/cxgb_sge.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/cxgb/sys/cxgb_support.c#3 delete
.. //depot/projects/scottl-camlock/src/sys/dev/cxgb/sys/mvec.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/cxgb/sys/uipc_mvec.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/drm/drm_bufs.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/drm/drm_context.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/drm/i915_dma.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/drm/i915_drv.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/drm/i915_irq.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/firewire/fwdev.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/fxp/if_fxp.c#20 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/fxp/if_fxpvar.h#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ic/ns16550.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/if_ndis/if_ndis.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/if_ndis/if_ndis_pccard.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/if_ndis/if_ndis_pci.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/if_ndis/if_ndis_usb.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/pci/pci.c#23 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/puc/pucdata.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/usb/uaudio.c#19 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/syscons/scterm-teken.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/syscons/teken/teken.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/at91dci.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/at91dci_atmelarm.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/atmegadci.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/atmegadci_atmelarm.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/avr32dci.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/ehci.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/ehci_ixp4xx.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/ehci_mbus.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/ehci_pci.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/musb_otg.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/musb_otg_atmelarm.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/ohci.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/ohci_atmelarm.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/ohci_pci.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/uhci.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/uhci_pci.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/usb_controller.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/uss820dci.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/uss820dci_atmelarm.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/input/uhid.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/input/ukbd.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/input/ums.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/misc/udbp.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/misc/ufm.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/net/if_aue.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/net/if_axe.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/net/if_cdce.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/net/if_cue.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/net/if_kue.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/net/if_rue.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/net/if_udav.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/net/usb_ethernet.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/quirk/usb_quirk.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/quirk/usb_quirk.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/u3g.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/uark.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/ubsa.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/ubser.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/uchcom.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/ucycom.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/ufoma.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/uftdi.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/ugensa.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/uipaq.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/ulpt.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/umct.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/umodem.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/umoscom.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/uplcom.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/usb_serial.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/uslcom.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/uvisor.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/uvscom.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/storage/umass.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/storage/urio.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/storage/ustorage_fs.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/template/usb_template.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/template/usb_template_cdce.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/template/usb_template_msc.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/template/usb_template_mtp.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb.h#12 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_busdma.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_busdma.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_compat_linux.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_compat_linux.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_controller.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_core.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_core.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_debug.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_debug.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_defs.h#3 delete
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_dev.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_dev.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_device.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_device.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_dynamic.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_dynamic.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_error.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_error.h#3 delete
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_freebsd.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_generic.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_handle_request.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_handle_request.h#3 delete
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_hid.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_hid.h#5 delete
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_hub.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_ioctl.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_lookup.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_lookup.h#4 delete
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_mbuf.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_mbuf.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_mfunc.h#3 delete
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_msctest.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_parse.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_parse.h#5 delete
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_process.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_process.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_request.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_request.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_revision.h#5 delete
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_transfer.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_transfer.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_util.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_util.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usbdevs#26 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usbhid.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_rum.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_uath.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_upgt.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_ural.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_urtw.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_zyd.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/devfs/devfs_vnops.c#21 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nfs/nfs.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nfs/nfs_commonport.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nfs/nfsport.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs_clbio.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs_clkrpc.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs_clport.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs_clvnops.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nfsserver/nfs_nfsdkrpc.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nfsserver/nfs_nfsdport.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nfsserver/nfs_nfsdstate.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/ntfs/ntfs.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nullfs/null_vnops.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/portalfs/portal.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/portalfs/portal_vnops.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/unionfs/union_vnops.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/geom/label/g_label_gpt.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/gnu/fs/ext2fs/ext2_lookup.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/gnu/fs/ext2fs/ext2_vnops.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/conf/NOTES#21 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/ibcs2/ibcs2_isc_sysent.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/ibcs2/ibcs2_misc.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/ibcs2/ibcs2_xenix_sysent.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/include/cpufunc.h#8 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/include/pmap.h#17 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/include/specialreg.h#15 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/ia64/vm_machdep.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/init_sysent.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_acct.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_alq.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_cpuset.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_exec.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_lock.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_lockf.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_mbuf.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_proc.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_prot.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_sig.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_sysctl.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/makesyscalls.sh#8 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/syscalls.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/syscalls.master#17 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/systrace_args.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/sysv_msg.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/tty.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/uipc_mbuf.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/uipc_sockbuf.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/uipc_socket.c#23 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/uipc_usrreq.c#22 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/vfs_cache.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/vfs_default.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/vfs_export.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/vfs_vnops.c#19 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/vnode_if.src#14 integrate
.. //depot/projects/scottl-camlock/src/sys/libkern/iconv.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/libkern/iconv_converter_if.m#3 integrate
.. //depot/projects/scottl-camlock/src/sys/libkern/iconv_xlat16.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/adm5120/if_admsw.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/conf/.cvsignore#1 branch
.. //depot/projects/scottl-camlock/src/sys/mips/idt/idtpci.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/idt/if_kr.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/acpi/Makefile#9 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/acpi/acpi/Makefile#12 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/acpi/acpi_hp/Makefile#1 branch
.. //depot/projects/scottl-camlock/src/sys/modules/acpi/acpi_wmi/Makefile#1 branch
.. //depot/projects/scottl-camlock/src/sys/modules/cxgb/cxgb/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/netgraph/Makefile#11 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/netgraph/pipe/Makefile#1 branch
.. //depot/projects/scottl-camlock/src/sys/modules/wlan/Makefile#10 integrate
.. //depot/projects/scottl-camlock/src/sys/net/bpf.c#22 integrate
.. //depot/projects/scottl-camlock/src/sys/net/bridgestp.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/net/fddi.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/net/firewire.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/net/flowtable.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/net/flowtable.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if.c#25 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if_arc.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if_arcsubr.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if_enc.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if_fddisubr.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if_fwsubr.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if_gre.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if_iso88025subr.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if_tun.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if_var.h#19 integrate
.. //depot/projects/scottl-camlock/src/sys/net/iso88025.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/net/route.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/net/route.h#10 integrate
.. //depot/projects/scottl-camlock/src/sys/net/rtsock.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/net/vnet.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_wds.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/netatalk/COPYRIGHT#5 integrate
.. //depot/projects/scottl-camlock/src/sys/netatalk/aarp.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/netatalk/at_control.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/netatalk/at_var.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/netatalk/ddp_input.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/netatalk/ddp_output.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/netatalk/ddp_pcb.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/netgraph/ng_ether.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/in.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/in_pcb.c#22 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/in_proto.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ip_input.c#19 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ip_mroute.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ip_mroute.h#9 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ip_output.c#19 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ip_var.h#13 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_fw2.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/raw_ip.c#20 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctp.h#8 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctp_indata.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctp_input.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctp_output.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/tcp_input.c#26 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/tcp_output.c#19 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/tcp_subr.c#23 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/tcp_timer.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/tcp_usrreq.c#22 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/tcp_var.h#23 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/vinet.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/in6.c#19 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/in6_ifattach.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/in6_proto.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/in6_rmx.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/ip6_mroute.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/ip6_mroute.h#8 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/nd6_nbr.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/raw_ip6.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/netipsec/key.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/netipsec/xform_tcp.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/netipx/README#5 integrate
.. //depot/projects/scottl-camlock/src/sys/netipx/ipx.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/netipx/ipx_if.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/netipx/ipx_input.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/netipx/ipx_outputfl.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/netipx/ipx_pcb.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/netipx/ipx_usrreq.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/netipx/ipx_var.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/netipx/spx.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/netipx/spx_reass.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/netipx/spx_usrreq.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/netipx/spx_var.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs_bio.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs_vnops.c#20 integrate
.. //depot/projects/scottl-camlock/src/sys/nfsserver/nfs_srvkrpc.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/nfsserver/nfs_srvsock.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/nfsserver/nfs_srvsubs.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/nlm/nlm_prot_impl.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/conf/GENERIC#20 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/conf/MPC85XX#6 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/conf/NOTES#10 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/cpufreq/pcr.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/powerpc/include/spr.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/mpc85xx/ds1553_bus_lbc.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/powerpc/mpc85xx/ds1553_core.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/powerpc/mpc85xx/ds1553_reg.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/powerpc/mpc85xx/i2c.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/powerpc/powermac/smu.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/cpu.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/rpc/svc.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/rpc/svc_auth.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/rpc/svc_auth_unix.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/rpc/svc_generic.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/rpc/svc_vc.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/security/mac_biba/mac_biba.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/security/mac_lomac/mac_lomac.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/cpuset.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/fcntl.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/iconv.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/ktr.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/lock.h#12 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/lock_profile.h#8 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/lockmgr.h#11 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/mbuf.h#20 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/mutex.h#17 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/param.h#24 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/priv.h#13 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/sched.h#16 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/socketvar.h#18 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/sx.h#14 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/syscall.h#17 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/syscall.mk#17 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/syslimits.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/sysproto.h#17 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/ucred.h#11 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/user.h#11 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/vimage.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/vnode.h#18 integrate
.. //depot/projects/scottl-camlock/src/sys/ufs/ufs/ufs_dirhash.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/ufs/ufs/ufs_lookup.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/ufs/ufs/ufs_vnops.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/device_pager.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/uma_core.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/vm_contig.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/vm_extern.h#10 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/vm_page.c#21 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/vm_phys.c#4 integrate
.. //depot/projects/scottl-camlock/src/tools/regression/bin/sh/builtins/trap2.0#1 branch
.. //depot/projects/scottl-camlock/src/tools/regression/bin/sh/errors/backquote-error1.0#1 branch
.. //depot/projects/scottl-camlock/src/tools/regression/netipx/spxloopback/spxloopback.c#2 integrate
.. //depot/projects/scottl-camlock/src/tools/tools/nanobsd/FlashDevice.sub#3 integrate
.. //depot/projects/scottl-camlock/src/tools/tools/nanobsd/gateworks/G2358#2 integrate
.. //depot/projects/scottl-camlock/src/tools/tools/nanobsd/nanobsd.sh#3 integrate
.. //depot/projects/scottl-camlock/src/tools/tools/tinybsd/tinybsd#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/catman/catman.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/gzip/gzip.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/gzip/unpack.c#1 branch
.. //depot/projects/scottl-camlock/src/usr.bin/id/id.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/ncal/ncal.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/netstat/bpf.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/netstat/netstat.1#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/newgrp/newgrp.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/quota/quota.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/chown/chown.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/chroot/chroot.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/getpmac/getpmac.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/jail/jail.c#4 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/jexec/jexec.c#4 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/jls/jls.c#4 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/lpr/lpc/lpc.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/mount_portalfs/portald.h#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/mountd/mountd.c#5 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/nfscbd/nfscbd.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/add/perform.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/create/perform.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/info/perform.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/lib/lib.h#4 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/lib/pen.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/lib/url.c#4 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/wpa/ndis_events/ndis_events.c#2 integrate
Differences ...
==== //depot/projects/scottl-camlock/src/UPDATING#6 (text+ko) ====
@@ -22,6 +22,35 @@
to maximize performance. (To disable malloc debugging, run
ln -s aj /etc/malloc.conf.)
+20090622:
+ Layout of struct vnet has changed as routing related variables
+ were moved to their own Vimage module. Modules need to be
+ recompiled. Bump __FreeBSD_version to 800099.
+
+20090619:
+ NGROUPS_MAX and NGROUPS have been increased from 16 to 1023
+ and 1024 respectively. As long as no more than 16 groups per
+ process are used, no changes should be visible. When more
+ than 16 groups are used, old binaries may fail if they call
+ getgroups() or getgrouplist() with statically sized storage.
+ Recompiling will work around this, but applications should be
+ modified to use dynamically allocated storage for group arrays
+ as POSIX.1-2008 does not cap an implementation's number of
+ supported groups at NGROUPS_MAX+1 as previous versions did.
+
+ NFS and portalfs mounts may also be affected as the list of
+ groups is truncated to 16. Users of NFS who use more than 16
+ groups, should take care that negative group permissions are not
+ used on the exported file systems as they will not be reliable
+ unless a GSSAPI based authentication method is used.
+
+20090616:
+ The compiling option ADAPTIVE_LOCKMGRS has been introduced.
+ This option compiles in the support for adaptive spinning for lockmgrs
+ which want to enable it. The lockinit() function now accepts the
+ flag LK_ADAPTIVE in order to make the lock object subject to
+ adaptive spinning when both held in write and read mode.
+
20090613:
The layout of the structure returned by IEEE80211_IOC_STA_INFO
has changed. User applications that use this ioctl need to be
@@ -1595,4 +1624,4 @@
Contact Warner Losh if you have any questions about your use of
this document.
-$FreeBSD: src/UPDATING,v 1.618 2009/06/13 23:44:56 sam Exp $
+$FreeBSD: src/UPDATING,v 1.621 2009/06/22 17:48:16 bz Exp $
==== //depot/projects/scottl-camlock/src/bin/sh/input.c#3 (text+ko) ====
@@ -36,7 +36,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/input.c,v 1.24 2009/06/13 21:17:45 jilles Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/input.c,v 1.25 2009/06/17 21:58:32 jilles Exp $");
#include <stdio.h> /* defines BUFSIZ */
#include <fcntl.h>
@@ -118,9 +118,9 @@
}
RESET {
+ popallfiles();
if (exception != EXSHELLPROC)
parselleft = parsenleft = 0; /* clear input buffer */
- popallfiles();
}
SHELLPROC {
==== //depot/projects/scottl-camlock/src/bin/sh/output.c#2 (text+ko) ====
@@ -36,7 +36,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/output.c,v 1.20 2005/12/08 21:00:39 stefanf Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/output.c,v 1.21 2009/06/19 22:09:55 jilles Exp $");
/*
* Shell output routines. We use our own output routines because:
@@ -133,32 +133,38 @@
outqstr(const char *p, struct output *file)
{
char ch;
+ int inquotes;
if (p[0] == '\0') {
outstr("''", file);
return;
}
- if (p[strcspn(p, "|&;<>()$`\\\"'")] == '\0' && (!ifsset() ||
- p[strcspn(p, ifsval())] == '\0')) {
+ /* Caller will handle '=' if necessary */
+ if (p[strcspn(p, "|&;<>()$`\\\"' \t\n*?[~#")] == '\0' ||
+ strcmp(p, "[") == 0) {
outstr(p, file);
return;
}
- out1c('\'');
+ inquotes = 0;
while ((ch = *p++) != '\0') {
switch (ch) {
case '\'':
- /*
- * Can't quote single quotes inside single quotes;
- * close them, write escaped single quote, open again.
- */
- outstr("'\\''", file);
+ /* Can't quote single quotes inside single quotes. */
+ if (inquotes)
+ outc('\'', file);
+ inquotes = 0;
+ outstr("\\'", file);
break;
default:
+ if (!inquotes)
+ outc('\'', file);
+ inquotes = 1;
outc(ch, file);
}
}
- out1c('\'');
+ if (inquotes)
+ outc('\'', file);
}
STATIC char out_junk[16];
==== //depot/projects/scottl-camlock/src/bin/sh/redir.c#2 (text+ko) ====
@@ -36,7 +36,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/redir.c,v 1.26 2004/04/06 20:06:51 markm Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/redir.c,v 1.27 2009/06/20 20:44:27 jilles Exp $");
#include <sys/types.h>
#include <sys/stat.h>
@@ -188,13 +188,25 @@
error("cannot create %s: %s", fname, strerror(errno));
goto movefd;
case NTO:
- fname = redir->nfile.expfname;
- if (Cflag && stat(fname, &sb) != -1 && S_ISREG(sb.st_mode))
- error("cannot create %s: %s", fname,
- strerror(EEXIST));
- if ((f = open(fname, O_WRONLY|O_CREAT|O_TRUNC, 0666)) < 0)
- error("cannot create %s: %s", fname, strerror(errno));
- goto movefd;
+ if (Cflag) {
+ fname = redir->nfile.expfname;
+ if (stat(fname, &sb) == -1) {
+ if ((f = open(fname, O_WRONLY|O_CREAT|O_EXCL, 0666)) < 0)
+ error("cannot create %s: %s", fname, strerror(errno));
+ } else if (!S_ISREG(sb.st_mode)) {
+ if ((f = open(fname, O_WRONLY, 0666)) < 0)
+ error("cannot create %s: %s", fname, strerror(errno));
+ if (fstat(f, &sb) != -1 && S_ISREG(sb.st_mode)) {
+ close(f);
+ error("cannot create %s: %s", fname,
+ strerror(EEXIST));
+ }
+ } else
+ error("cannot create %s: %s", fname,
+ strerror(EEXIST));
+ goto movefd;
+ }
+ /* FALLTHROUGH */
case NCLOBBER:
fname = redir->nfile.expfname;
if ((f = open(fname, O_WRONLY|O_CREAT|O_TRUNC, 0666)) < 0)
==== //depot/projects/scottl-camlock/src/contrib/ipfilter/tools/ipfcomp.c#3 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/contrib/ipfilter/tools/ipfcomp.c,v 1.5 2007/06/04 02:54:34 darrenr Exp $ */
+/* $FreeBSD: src/contrib/ipfilter/tools/ipfcomp.c,v 1.6 2009/06/16 13:31:01 rdivacky Exp $ */
/*
* Copyright (C) 2001-2005 by Darren Reed.
@@ -382,7 +382,7 @@
extern frentry_t *ipf_rules_out_%s[%d];\n",
grp->fg_name, grp->fg_name, outcount);
- for (g = groups; g != g; g = g->fg_next)
+ for (g = groups; g != grp; g = g->fg_next)
if ((strncmp(g->fg_name, grp->fg_name,
FR_GROUPLEN) == 0) &&
g->fg_flags == grp->fg_flags)
==== //depot/projects/scottl-camlock/src/crypto/openssh/config.h#3 (text+ko) ====
@@ -211,7 +211,7 @@
#define HAVE_CLOCK_T 1
/* Define to 1 if you have the `closefrom' function. */
-/* #undef HAVE_CLOSEFROM */
+#define HAVE_CLOSEFROM 1
/* Define if gai_strerror() returns const char * */
#define HAVE_CONST_GAI_STRERROR_PROTO 1
==== //depot/projects/scottl-camlock/src/crypto/openssh/ssh_namespace.h#3 (text) ====
@@ -9,7 +9,7 @@
*
* nm libssh.a | awk '$2 == "T" && $3 !~ /^ssh_/ { print "#define", $3, "ssh_" $3 }'
*
- * $FreeBSD: src/crypto/openssh/ssh_namespace.h,v 1.5 2009/05/22 18:46:28 des Exp $
+ * $FreeBSD: src/crypto/openssh/ssh_namespace.h,v 1.6 2009/06/16 15:30:10 jhb Exp $
*/
#define a2port ssh_a2port
@@ -153,7 +153,6 @@
#define ciphers_valid ssh_ciphers_valid
#define cleanhostname ssh_cleanhostname
#define cleanup_exit ssh_cleanup_exit
-#define closefrom ssh_closefrom
#define colon ssh_colon
#define compat_cipher_proposal ssh_compat_cipher_proposal
#define compat_datafellows ssh_compat_datafellows
==== //depot/projects/scottl-camlock/src/gnu/lib/libgcov/Makefile#3 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/lib/libgcov/Makefile,v 1.5 2007/05/19 04:25:55 kan Exp $
+# $FreeBSD: src/gnu/lib/libgcov/Makefile,v 1.6 2009/06/21 01:54:47 kan Exp $
NO_PROFILE=
.include <bsd.own.mk>
@@ -27,7 +27,15 @@
OBJS_P= ${SYMS:S/$/.po/}
OBJS_S= ${SYMS:S/$/.So/}
-COMMONHDRS= tm.h tconfig.h gcov-iov.h options.h
+#-----------------------------------------------------------------------
+#
+# Helpful shortcuts for compiler invocations.
+#
+CC_T = ${CC} -c ${CFLAGS} -fPIC
+CC_P = ${CC} -c ${CFLAGS} -p -fPIC
+CC_S = ${CC} -c ${CFLAGS} ${PICFLAG} -DSHARED
+
+COMMONHDRS= tm.h tconfig.h gcov-iov.h options.h
CLEANFILES+= ${COMMONHDRS} cs-tm.h cs-tconfig.h options.h optionlist
${COMMONHDRS}: ${.CURDIR}/../../usr.bin/cc/cc_tools/Makefile
@@ -36,16 +44,16 @@
${OBJS} beforedepend: ${COMMONHDRS}
${OBJS_T}: libgcov.c
- ${CC} -c ${CFLAGS} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c}
+ ${CC_T} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c}
.if !defined(NO_PIC)
${OBJS_S}: libgcov.c
- ${CC} -c ${PICFLAG} ${CFLAGS} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c}
+ ${CC_S} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c}
.endif
.if ${MK_PROFILE} != "no"
${OBJS_P}: libgcov.c
- ${CC} -c -p ${CFLAGS} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c}
+ ${CC_P} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c}
.endif
.include <bsd.lib.mk>
==== //depot/projects/scottl-camlock/src/include/rpc/svc_dg.h#2 (text+ko) ====
@@ -1,5 +1,5 @@
/* $NetBSD: svc_dg.h,v 1.1 2000/06/02 23:11:16 fvdl Exp $ */
-/* $FreeBSD: src/include/rpc/svc_dg.h,v 1.1 2001/03/19 12:49:47 alfred Exp $ */
+/* $FreeBSD: src/include/rpc/svc_dg.h,v 1.2 2009/06/18 17:10:43 kan Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -46,6 +46,7 @@
XDR su_xdrs; /* XDR handle */
char su_verfbody[MAX_AUTH_BYTES]; /* verifier body */
void *su_cache; /* cached data, NULL if none */
+ struct netbuf su_srcaddr; /* dst address of last msg */
};
#define __rpcb_get_dg_xidp(x) (&((struct svc_dg_data *)(x)->xp_p2)->su_xid)
==== //depot/projects/scottl-camlock/src/lib/libarchive/archive_read.c#4 (text+ko) ====
@@ -32,7 +32,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/archive_read.c,v 1.49 2009/04/27 17:42:02 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read.c,v 1.50 2009/06/20 06:02:21 kientzle Exp $");
#ifdef HAVE_ERRNO_H
#include <errno.h>
@@ -117,6 +117,7 @@
struct archive_read *a;
struct archive_format_descriptor *format;
char key[64], val[64];
+ char *valp;
size_t i;
int len, r;
@@ -135,10 +136,10 @@
while ((len = __archive_parse_options(s, format->name,
sizeof(key), key, sizeof(val), val)) > 0) {
- if (val[0] == '\0')
- r = format->options(a, key, NULL);
- else
- r = format->options(a, key, val);
+ valp = val[0] == '\0' ? NULL : val;
+ a->format = format;
+ r = format->options(a, key, valp);
+ a->format = NULL;
if (r == ARCHIVE_FATAL)
return (r);
s += len;
==== //depot/projects/scottl-camlock/src/lib/libc/arm/string/strncmp.S#3 (text+ko) ====
@@ -30,16 +30,19 @@
#include <machine/asm.h>
-__FBSDID("$FreeBSD: src/lib/libc/arm/string/strncmp.S,v 1.4 2009/05/06 01:50:04 sam Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/arm/string/strncmp.S,v 1.6 2009/06/21 13:15:56 stas Exp $");
ENTRY(strncmp)
-/* if ((len - 1) < 0) return 0 */
- subs r2, r2, #1
- movmi r0, #0
- movmi pc, lr
+/* if (len == 0) return 0 */
+ cmp r2, #0
+ moveq r0, #0
+ moveq pc, lr
/* ip == last src address to compare */
- add ip, r0, r2
+ adds ip, r0, r2
+/* Use last possible address on overflow. */
+ movcs ip, #0
+ sub ip, ip, #1
1:
ldrb r2, [r0], #1
ldrb r3, [r1], #1
==== //depot/projects/scottl-camlock/src/lib/libc/gen/initgroups.3#2 (text+ko) ====
@@ -26,7 +26,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)initgroups.3 8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: src/lib/libc/gen/initgroups.3,v 1.13 2007/01/09 00:27:54 imp Exp $
+.\" $FreeBSD: src/lib/libc/gen/initgroups.3,v 1.14 2009/06/19 15:58:24 brooks Exp $
.\"
.Dd June 4, 1993
.Dt INITGROUPS 3
@@ -65,6 +65,13 @@
.Va errno
for any of the errors specified for the library function
.Xr setgroups 2 .
+It may also return:
+.Bl -tag -width Er
+.It Bq Er ENOMEM
+The
+.Fn initgroups
+function was unable to allocate temporary storage.
+.El
.Sh SEE ALSO
.Xr setgroups 2 ,
.Xr getgrouplist 3
==== //depot/projects/scottl-camlock/src/lib/libc/gen/initgroups.c#2 (text+ko) ====
@@ -31,14 +31,16 @@
static char sccsid[] = "@(#)initgroups.c 8.1 (Berkeley) 6/4/93";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/initgroups.c,v 1.9 2007/01/09 00:27:54 imp Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gen/initgroups.c,v 1.10 2009/06/19 15:58:24 brooks Exp $");
#include <sys/param.h>
-#include <stdio.h>
#include "namespace.h"
#include <err.h>
#include "un-namespace.h"
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
#include <unistd.h>
int
@@ -46,14 +48,21 @@
const char *uname;
gid_t agroup;
{
- int ngroups;
+ int ngroups, ret;
+ long ngroups_max;
+ gid_t *groups;
+
/*
- * Provide space for one group more than NGROUPS to allow
+ * Provide space for one group more than possible to allow
* setgroups to fail and set errno.
*/
- gid_t groups[NGROUPS + 1];
+ ngroups_max = sysconf(_SC_NGROUPS_MAX) + 2;
+ if ((groups = malloc(sizeof(*groups) * ngroups_max)) == NULL)
+ return (ENOMEM);
- ngroups = NGROUPS + 1;
+ ngroups = (int)ngroups_max;
getgrouplist(uname, agroup, groups, &ngroups);
- return (setgroups(ngroups, groups));
+ ret = setgroups(ngroups, groups);
+ free(groups);
+ return (ret);
}
==== //depot/projects/scottl-camlock/src/lib/libc/i386/stdlib/Makefile.inc#2 (text+ko) ====
@@ -1,4 +1,4 @@
# @(#)Makefile.inc 8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/libc/i386/stdlib/Makefile.inc,v 1.7 1999/08/27 23:59:26 peter Exp $
+# $FreeBSD: src/lib/libc/i386/stdlib/Makefile.inc,v 1.8 2009/06/23 09:04:59 ed Exp $
-MDSRCS+=abs.S div.S labs.S ldiv.S
+MDSRCS+=div.S ldiv.S
==== //depot/projects/scottl-camlock/src/lib/libc/i386/stdlib/div.S#3 (text+ko) ====
@@ -26,14 +26,12 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD: src/lib/libc/i386/stdlib/div.S,v 1.12 2008/11/02 01:28:47 peter Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/i386/stdlib/div.S,v 1.13 2009/06/22 10:56:08 ed Exp $");
ENTRY(div)
movl 4(%esp),%eax
movl 8(%esp),%ecx
cdq
idiv %ecx
- movl %eax,4(%esp)
- movl %edx,8(%esp)
ret
END(div)
==== //depot/projects/scottl-camlock/src/lib/libc/i386/stdlib/ldiv.S#3 (text+ko) ====
@@ -29,14 +29,12 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD: src/lib/libc/i386/stdlib/ldiv.S,v 1.11 2008/11/02 01:28:47 peter Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/i386/stdlib/ldiv.S,v 1.12 2009/06/22 10:56:08 ed Exp $");
ENTRY(ldiv)
movl 4(%esp),%eax
movl 8(%esp),%ecx
cdq
idiv %ecx
- movl %eax,4(%esp)
- movl %edx,8(%esp)
ret
END(ldiv)
==== //depot/projects/scottl-camlock/src/lib/libc/rpc/auth_unix.c#3 (text+ko) ====
@@ -34,7 +34,7 @@
static char *sccsid = "@(#)auth_unix.c 2.2 88/08/01 4.0 RPCSRC";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/auth_unix.c,v 1.18 2007/06/14 20:07:35 harti Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/auth_unix.c,v 1.19 2009/06/19 15:58:24 brooks Exp $");
/*
* auth_unix.c, Implements UNIX style authentication parameters.
@@ -185,23 +185,29 @@
AUTH *
authunix_create_default()
{
- int len;
+ int ngids;
+ long ngids_max;
char machname[MAXHOSTNAMELEN + 1];
uid_t uid;
gid_t gid;
- gid_t gids[NGROUPS_MAX];
+ gid_t *gids;
+
+ ngids_max = sysconf(_SC_NGROUPS_MAX) + 1;
+ gids = malloc(sizeof(gid_t) * ngids_max);
+ if (gids == NULL)
+ return (NULL);
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list