svn commit: r267008 - in user/attilio/rm_vmobj_cache: . bin/sh cddl/contrib/opensolaris/cmd/zfs contrib/bmake contrib/unbound/libunbound etc etc/etc.amd64 etc/etc.i386 etc/mtree include include/xlo...

Attilio Rao attilio at FreeBSD.org
Tue Jun 3 13:47:09 UTC 2014 

Author: attilio
Date: Tue Jun  3 13:47:00 2014
New Revision: 267008
URL: http://svnweb.freebsd.org/changeset/base/267008

Log:
  Merge from HEAD.

Added:
  user/attilio/rm_vmobj_cache/.arclint
     - copied unchanged from r267007, head/.arclint
  user/attilio/rm_vmobj_cache/include/xlocale/_strings.h
     - copied unchanged from r267007, head/include/xlocale/_strings.h
  user/attilio/rm_vmobj_cache/share/vt/
     - copied from r267007, head/share/vt/
  user/attilio/rm_vmobj_cache/sys/arm/conf/ARNDALE-OCTA
     - copied unchanged from r267007, head/sys/arm/conf/ARNDALE-OCTA
  user/attilio/rm_vmobj_cache/sys/arm/conf/CHROMEBOOK-SNOW
     - copied unchanged from r267007, head/sys/arm/conf/CHROMEBOOK-SNOW
  user/attilio/rm_vmobj_cache/sys/arm/conf/CHROMEBOOK-SPRING
     - copied unchanged from r267007, head/sys/arm/conf/CHROMEBOOK-SPRING
  user/attilio/rm_vmobj_cache/sys/arm/conf/EXYNOS5.common
     - copied unchanged from r267007, head/sys/arm/conf/EXYNOS5.common
  user/attilio/rm_vmobj_cache/sys/arm/conf/EXYNOS5250
     - copied unchanged from r267007, head/sys/arm/conf/EXYNOS5250
  user/attilio/rm_vmobj_cache/sys/arm/conf/EXYNOS5420
     - copied unchanged from r267007, head/sys/arm/conf/EXYNOS5420
  user/attilio/rm_vmobj_cache/sys/arm/conf/RADXA-LITE
     - copied unchanged from r267007, head/sys/arm/conf/RADXA-LITE
  user/attilio/rm_vmobj_cache/sys/arm/conf/RK3188
     - copied unchanged from r267007, head/sys/arm/conf/RK3188
  user/attilio/rm_vmobj_cache/sys/arm/samsung/exynos/exynos_uart.c
     - copied unchanged from r267007, head/sys/arm/samsung/exynos/exynos_uart.c
  user/attilio/rm_vmobj_cache/sys/arm/samsung/exynos/exynos_uart.h
     - copied unchanged from r267007, head/sys/arm/samsung/exynos/exynos_uart.h
  user/attilio/rm_vmobj_cache/sys/arm/samsung/exynos/std.exynos5250
     - copied unchanged from r267007, head/sys/arm/samsung/exynos/std.exynos5250
  user/attilio/rm_vmobj_cache/sys/arm/samsung/exynos/std.exynos5420
     - copied unchanged from r267007, head/sys/arm/samsung/exynos/std.exynos5420
  user/attilio/rm_vmobj_cache/sys/boot/fdt/dts/arm/exynos5.dtsi
     - copied unchanged from r267007, head/sys/boot/fdt/dts/arm/exynos5.dtsi
  user/attilio/rm_vmobj_cache/sys/boot/fdt/dts/arm/exynos5250-chromebook-snow.dts
     - copied unchanged from r267007, head/sys/boot/fdt/dts/arm/exynos5250-chromebook-snow.dts
  user/attilio/rm_vmobj_cache/sys/boot/fdt/dts/arm/exynos5250-chromebook-spring.dts
     - copied unchanged from r267007, head/sys/boot/fdt/dts/arm/exynos5250-chromebook-spring.dts
  user/attilio/rm_vmobj_cache/sys/boot/fdt/dts/arm/exynos5420-arndale-octa.dts
     - copied unchanged from r267007, head/sys/boot/fdt/dts/arm/exynos5420-arndale-octa.dts
  user/attilio/rm_vmobj_cache/sys/boot/fdt/dts/arm/exynos5420.dtsi
     - copied unchanged from r267007, head/sys/boot/fdt/dts/arm/exynos5420.dtsi
  user/attilio/rm_vmobj_cache/sys/boot/fdt/dts/arm/rk3188-radxa-lite.dts
     - copied unchanged from r267007, head/sys/boot/fdt/dts/arm/rk3188-radxa-lite.dts
  user/attilio/rm_vmobj_cache/sys/boot/usb/storage/
     - copied from r267007, head/sys/boot/usb/storage/
  user/attilio/rm_vmobj_cache/sys/dev/cxgbe/t4_netmap.c
     - copied unchanged from r267007, head/sys/dev/cxgbe/t4_netmap.c
  user/attilio/rm_vmobj_cache/sys/dev/usb/controller/saf1761_otg_boot.c
     - copied unchanged from r267007, head/sys/dev/usb/controller/saf1761_otg_boot.c
  user/attilio/rm_vmobj_cache/sys/dev/virtio/virtio_config.h
     - copied unchanged from r267007, head/sys/dev/virtio/virtio_config.h
  user/attilio/rm_vmobj_cache/sys/dev/virtio/virtio_ids.h
     - copied unchanged from r267007, head/sys/dev/virtio/virtio_ids.h
  user/attilio/rm_vmobj_cache/sys/modules/usb/saf1761otg/
     - copied from r267007, head/sys/modules/usb/saf1761otg/
  user/attilio/rm_vmobj_cache/tools/ifnet/
     - copied from r267007, head/tools/ifnet/
  user/attilio/rm_vmobj_cache/usr.sbin/bsnmpd/modules/snmp_lm75/
     - copied from r267007, head/usr.sbin/bsnmpd/modules/snmp_lm75/
Deleted:
  user/attilio/rm_vmobj_cache/sys/arm/conf/EXYNOS5250.common
  user/attilio/rm_vmobj_cache/sys/arm/samsung/exynos/std.exynos5
  user/attilio/rm_vmobj_cache/sys/arm/samsung/exynos/uart.c
  user/attilio/rm_vmobj_cache/sys/arm/samsung/exynos/uart.h
  user/attilio/rm_vmobj_cache/sys/boot/fdt/dts/arm/exynos5250-chromebook.dts
  user/attilio/rm_vmobj_cache/sys/dev/vt/hw/xboxfb/
  user/attilio/rm_vmobj_cache/sys/modules/usb/saf1761/
Modified:
  user/attilio/rm_vmobj_cache/bin/sh/arith_yacc.c
  user/attilio/rm_vmobj_cache/bin/sh/exec.c
  user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/cmd/zfs/zfs.8
  user/attilio/rm_vmobj_cache/contrib/bmake/var.c
  user/attilio/rm_vmobj_cache/contrib/unbound/libunbound/libworker.h
  user/attilio/rm_vmobj_cache/contrib/unbound/libunbound/worker.h
  user/attilio/rm_vmobj_cache/etc/etc.amd64/ttys
  user/attilio/rm_vmobj_cache/etc/etc.i386/ttys
  user/attilio/rm_vmobj_cache/etc/mtree/BSD.usr.dist
  user/attilio/rm_vmobj_cache/etc/mtree/BSD.var.dist
  user/attilio/rm_vmobj_cache/etc/snmpd.config
  user/attilio/rm_vmobj_cache/include/strings.h
  user/attilio/rm_vmobj_cache/include/xlocale/Makefile
  user/attilio/rm_vmobj_cache/include/xlocale/_string.h
  user/attilio/rm_vmobj_cache/lib/libc/gen/sem_wait.3
  user/attilio/rm_vmobj_cache/lib/libc/stdio/fmemopen.c
  user/attilio/rm_vmobj_cache/lib/libc/stdio/fopen.3
  user/attilio/rm_vmobj_cache/lib/libc/string/strcasecmp.3
  user/attilio/rm_vmobj_cache/lib/libc/sys/mlock.2
  user/attilio/rm_vmobj_cache/lib/libcrypt/crypt.c
  user/attilio/rm_vmobj_cache/lib/libstand/printf.c
  user/attilio/rm_vmobj_cache/lib/libstand/stand.h
  user/attilio/rm_vmobj_cache/lib/libvmmapi/vmmapi.c
  user/attilio/rm_vmobj_cache/lib/libvmmapi/vmmapi.h
  user/attilio/rm_vmobj_cache/release/doc/en_US.ISO8859-1/relnotes/article.xml
  user/attilio/rm_vmobj_cache/release/picobsd/floppy.tree/etc/ttys
  user/attilio/rm_vmobj_cache/release/picobsd/mfs_tree/etc/gettytab
  user/attilio/rm_vmobj_cache/sbin/geom/class/label/glabel.8
  user/attilio/rm_vmobj_cache/sbin/ifconfig/ifconfig.8
  user/attilio/rm_vmobj_cache/sbin/ipfw/dummynet.c
  user/attilio/rm_vmobj_cache/sbin/ipfw/ipfw.8
  user/attilio/rm_vmobj_cache/sbin/ipfw/ipfw2.h
  user/attilio/rm_vmobj_cache/share/man/man4/carp.4
  user/attilio/rm_vmobj_cache/share/man/man4/iwn.4
  user/attilio/rm_vmobj_cache/share/man/man4/man4.arm/ti_adc.4
  user/attilio/rm_vmobj_cache/share/man/man4/netmap.4
  user/attilio/rm_vmobj_cache/share/man/man4/snd_envy24.4
  user/attilio/rm_vmobj_cache/share/man/man4/snd_envy24ht.4
  user/attilio/rm_vmobj_cache/share/man/man5/passwd.5
  user/attilio/rm_vmobj_cache/share/man/man5/src.conf.5
  user/attilio/rm_vmobj_cache/share/man/man9/Makefile
  user/attilio/rm_vmobj_cache/share/man/man9/socket.9
  user/attilio/rm_vmobj_cache/share/misc/committers-src.dot
  user/attilio/rm_vmobj_cache/share/mk/bsd.opts.mk
  user/attilio/rm_vmobj_cache/share/mk/bsd.own.mk
  user/attilio/rm_vmobj_cache/sys/Makefile
  user/attilio/rm_vmobj_cache/sys/amd64/amd64/exception.S
  user/attilio/rm_vmobj_cache/sys/amd64/amd64/sys_machdep.c
  user/attilio/rm_vmobj_cache/sys/amd64/amd64/trap.c
  user/attilio/rm_vmobj_cache/sys/amd64/include/vmm.h   (contents, props changed)
  user/attilio/rm_vmobj_cache/sys/amd64/include/vmm_dev.h   (contents, props changed)
  user/attilio/rm_vmobj_cache/sys/amd64/linux32/linux32_sysvec.c
  user/attilio/rm_vmobj_cache/sys/amd64/vmm/intel/vmx.c
  user/attilio/rm_vmobj_cache/sys/amd64/vmm/io/vlapic.c
  user/attilio/rm_vmobj_cache/sys/amd64/vmm/vmm.c
  user/attilio/rm_vmobj_cache/sys/amd64/vmm/vmm_dev.c
  user/attilio/rm_vmobj_cache/sys/amd64/vmm/vmm_host.c
  user/attilio/rm_vmobj_cache/sys/amd64/vmm/x86.c
  user/attilio/rm_vmobj_cache/sys/arm/arm/locore.S
  user/attilio/rm_vmobj_cache/sys/arm/broadcom/bcm2835/files.bcm2835
  user/attilio/rm_vmobj_cache/sys/arm/conf/ARNDALE
  user/attilio/rm_vmobj_cache/sys/arm/conf/CHROMEBOOK
  user/attilio/rm_vmobj_cache/sys/arm/conf/RADXA
  user/attilio/rm_vmobj_cache/sys/arm/rockchip/files.rk30xx
  user/attilio/rm_vmobj_cache/sys/arm/samsung/exynos/chrome_ec.c
  user/attilio/rm_vmobj_cache/sys/arm/samsung/exynos/chrome_kb.c
  user/attilio/rm_vmobj_cache/sys/arm/samsung/exynos/chrome_kb.h
  user/attilio/rm_vmobj_cache/sys/arm/samsung/exynos/exynos5_ehci.c
  user/attilio/rm_vmobj_cache/sys/arm/samsung/exynos/exynos5_i2c.c
  user/attilio/rm_vmobj_cache/sys/arm/samsung/exynos/exynos5_pad.c
  user/attilio/rm_vmobj_cache/sys/arm/samsung/exynos/files.exynos5
  user/attilio/rm_vmobj_cache/sys/arm/ti/am335x/am335x_pwm.c
  user/attilio/rm_vmobj_cache/sys/arm/ti/ti_adc.c
  user/attilio/rm_vmobj_cache/sys/arm/ti/ti_adcreg.h
  user/attilio/rm_vmobj_cache/sys/arm/ti/ti_adcvar.h
  user/attilio/rm_vmobj_cache/sys/arm/xscale/i80321/ep80219_machdep.c
  user/attilio/rm_vmobj_cache/sys/arm/xscale/i80321/iq31244_machdep.c
  user/attilio/rm_vmobj_cache/sys/arm/xscale/i8134x/crb_machdep.c
  user/attilio/rm_vmobj_cache/sys/arm/xscale/ixp425/avila_machdep.c
  user/attilio/rm_vmobj_cache/sys/arm/xscale/pxa/pxa_machdep.c
  user/attilio/rm_vmobj_cache/sys/boot/fdt/dts/arm/exynos5250-arndale.dts
  user/attilio/rm_vmobj_cache/sys/boot/fdt/dts/arm/exynos5250.dtsi
  user/attilio/rm_vmobj_cache/sys/boot/fdt/dts/mips/beripad-de4.dts
  user/attilio/rm_vmobj_cache/sys/boot/forth/brand.4th
  user/attilio/rm_vmobj_cache/sys/boot/mips/beri/loader/Makefile
  user/attilio/rm_vmobj_cache/sys/boot/mips/beri/loader/loader.ldscript
  user/attilio/rm_vmobj_cache/sys/boot/mips/beri/loader/main.c
  user/attilio/rm_vmobj_cache/sys/boot/usb/Makefile
  user/attilio/rm_vmobj_cache/sys/boot/usb/bsd_kernel.c
  user/attilio/rm_vmobj_cache/sys/boot/usb/bsd_kernel.h
  user/attilio/rm_vmobj_cache/sys/boot/usb/bsd_usbloader_test.c
  user/attilio/rm_vmobj_cache/sys/boot/usb/usb_busdma_loader.c
  user/attilio/rm_vmobj_cache/sys/cam/scsi/scsi_sg.c
  user/attilio/rm_vmobj_cache/sys/cam/scsi/scsi_sg.h
  user/attilio/rm_vmobj_cache/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c
  user/attilio/rm_vmobj_cache/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c
  user/attilio/rm_vmobj_cache/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c
  user/attilio/rm_vmobj_cache/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c
  user/attilio/rm_vmobj_cache/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h
  user/attilio/rm_vmobj_cache/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h
  user/attilio/rm_vmobj_cache/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h
  user/attilio/rm_vmobj_cache/sys/compat/freebsd32/freebsd32_ioctl.c
  user/attilio/rm_vmobj_cache/sys/compat/freebsd32/freebsd32_ioctl.h
  user/attilio/rm_vmobj_cache/sys/compat/linux/linux_futex.c
  user/attilio/rm_vmobj_cache/sys/compat/linux/linux_ioctl.c
  user/attilio/rm_vmobj_cache/sys/conf/files
  user/attilio/rm_vmobj_cache/sys/ddb/db_command.c
  user/attilio/rm_vmobj_cache/sys/dev/bxe/bxe.c
  user/attilio/rm_vmobj_cache/sys/dev/bxe/bxe.h
  user/attilio/rm_vmobj_cache/sys/dev/bxe/bxe_debug.c
  user/attilio/rm_vmobj_cache/sys/dev/bxe/bxe_stats.c
  user/attilio/rm_vmobj_cache/sys/dev/cfe/cfe_console.c
  user/attilio/rm_vmobj_cache/sys/dev/cxgbe/adapter.h
  user/attilio/rm_vmobj_cache/sys/dev/cxgbe/common/common.h
  user/attilio/rm_vmobj_cache/sys/dev/cxgbe/common/t4_hw.c
  user/attilio/rm_vmobj_cache/sys/dev/cxgbe/t4_main.c
  user/attilio/rm_vmobj_cache/sys/dev/cxgbe/t4_sge.c
  user/attilio/rm_vmobj_cache/sys/dev/dc/dcphy.c
  user/attilio/rm_vmobj_cache/sys/dev/dc/pnphy.c
  user/attilio/rm_vmobj_cache/sys/dev/drm2/radeon/radeon_device.c
  user/attilio/rm_vmobj_cache/sys/dev/e1000/if_em.c
  user/attilio/rm_vmobj_cache/sys/dev/e1000/if_em.h
  user/attilio/rm_vmobj_cache/sys/dev/e1000/if_igb.c
  user/attilio/rm_vmobj_cache/sys/dev/e1000/if_lem.c
  user/attilio/rm_vmobj_cache/sys/dev/e1000/if_lem.h
  user/attilio/rm_vmobj_cache/sys/dev/firewire/sbp.c
  user/attilio/rm_vmobj_cache/sys/dev/fxp/if_fxp.c
  user/attilio/rm_vmobj_cache/sys/dev/fxp/if_fxpvar.h
  user/attilio/rm_vmobj_cache/sys/dev/fxp/inphy.c
  user/attilio/rm_vmobj_cache/sys/dev/gpio/gpioiic.c
  user/attilio/rm_vmobj_cache/sys/dev/hwpmc/pmc_events.h
  user/attilio/rm_vmobj_cache/sys/dev/iicbus/iic.c
  user/attilio/rm_vmobj_cache/sys/dev/iwn/if_iwn.c
  user/attilio/rm_vmobj_cache/sys/dev/iwn/if_iwn_devid.h
  user/attilio/rm_vmobj_cache/sys/dev/mfi/mfi.c
  user/attilio/rm_vmobj_cache/sys/dev/mfi/mfi_cam.c
  user/attilio/rm_vmobj_cache/sys/dev/mfi/mfi_disk.c
  user/attilio/rm_vmobj_cache/sys/dev/mfi/mfi_syspd.c
  user/attilio/rm_vmobj_cache/sys/dev/mfi/mfivar.h
  user/attilio/rm_vmobj_cache/sys/dev/mii/brgphy.c
  user/attilio/rm_vmobj_cache/sys/dev/mii/e1000phy.c
  user/attilio/rm_vmobj_cache/sys/dev/mii/ip1000phy.c
  user/attilio/rm_vmobj_cache/sys/dev/mii/jmphy.c
  user/attilio/rm_vmobj_cache/sys/dev/mii/mii.c
  user/attilio/rm_vmobj_cache/sys/dev/mii/miivar.h
  user/attilio/rm_vmobj_cache/sys/dev/mii/nsphy.c
  user/attilio/rm_vmobj_cache/sys/dev/mii/rgephy.c
  user/attilio/rm_vmobj_cache/sys/dev/mii/truephy.c
  user/attilio/rm_vmobj_cache/sys/dev/netmap/netmap_generic.c
  user/attilio/rm_vmobj_cache/sys/dev/netmap/netmap_kern.h
  user/attilio/rm_vmobj_cache/sys/dev/sound/pci/emu10k1.c
  user/attilio/rm_vmobj_cache/sys/dev/uart/uart_bus_pci.c
  user/attilio/rm_vmobj_cache/sys/dev/uart/uart_dev_ns8250.c
  user/attilio/rm_vmobj_cache/sys/dev/usb/controller/dwc_otg.c
  user/attilio/rm_vmobj_cache/sys/dev/usb/controller/saf1761_otg.c
  user/attilio/rm_vmobj_cache/sys/dev/usb/controller/saf1761_otg.h
  user/attilio/rm_vmobj_cache/sys/dev/usb/controller/saf1761_otg_fdt.c
  user/attilio/rm_vmobj_cache/sys/dev/usb/controller/saf1761_otg_reg.h
  user/attilio/rm_vmobj_cache/sys/dev/usb/controller/usb_controller.c
  user/attilio/rm_vmobj_cache/sys/dev/usb/usb_busdma.h
  user/attilio/rm_vmobj_cache/sys/dev/usb/usb_freebsd.h
  user/attilio/rm_vmobj_cache/sys/dev/usb/usb_freebsd_loader.h
  user/attilio/rm_vmobj_cache/sys/dev/usb/usb_msctest.c
  user/attilio/rm_vmobj_cache/sys/dev/usb/usb_msctest.h
  user/attilio/rm_vmobj_cache/sys/dev/virtio/pci/virtio_pci.c
  user/attilio/rm_vmobj_cache/sys/dev/virtio/virtio.c
  user/attilio/rm_vmobj_cache/sys/dev/virtio/virtio.h
  user/attilio/rm_vmobj_cache/sys/dev/virtio/virtqueue.c
  user/attilio/rm_vmobj_cache/sys/dev/vt/vt.h
  user/attilio/rm_vmobj_cache/sys/dev/vt/vt_buf.c
  user/attilio/rm_vmobj_cache/sys/dev/vt/vt_core.c
  user/attilio/rm_vmobj_cache/sys/geom/part/g_part_apm.c
  user/attilio/rm_vmobj_cache/sys/geom/part/g_part_gpt.c
  user/attilio/rm_vmobj_cache/sys/geom/part/g_part_pc98.c
  user/attilio/rm_vmobj_cache/sys/i386/conf/PAE
  user/attilio/rm_vmobj_cache/sys/i386/conf/XEN
  user/attilio/rm_vmobj_cache/sys/i386/i386/trap.c
  user/attilio/rm_vmobj_cache/sys/i386/linux/linux_sysvec.c
  user/attilio/rm_vmobj_cache/sys/kern/imgact_elf.c
  user/attilio/rm_vmobj_cache/sys/kern/kern_dtrace.c
  user/attilio/rm_vmobj_cache/sys/kern/kern_poll.c
  user/attilio/rm_vmobj_cache/sys/kern/subr_rman.c
  user/attilio/rm_vmobj_cache/sys/kern/subr_taskqueue.c
  user/attilio/rm_vmobj_cache/sys/kern/uipc_mbuf.c
  user/attilio/rm_vmobj_cache/sys/mips/conf/BERI_DE4_BASE
  user/attilio/rm_vmobj_cache/sys/mips/mips/trap.c
  user/attilio/rm_vmobj_cache/sys/modules/Makefile
  user/attilio/rm_vmobj_cache/sys/modules/cxgbe/if_cxgbe/Makefile
  user/attilio/rm_vmobj_cache/sys/modules/geom/Makefile
  user/attilio/rm_vmobj_cache/sys/modules/usb/Makefile
  user/attilio/rm_vmobj_cache/sys/net/if.c
  user/attilio/rm_vmobj_cache/sys/net/if_media.h
  user/attilio/rm_vmobj_cache/sys/net/if_var.h
  user/attilio/rm_vmobj_cache/sys/net/ifq.h
  user/attilio/rm_vmobj_cache/sys/net/route.c
  user/attilio/rm_vmobj_cache/sys/net/rtsock.c
  user/attilio/rm_vmobj_cache/sys/netgraph/ng_pipe.c
  user/attilio/rm_vmobj_cache/sys/netinet/in.h
  user/attilio/rm_vmobj_cache/sys/netinet/in_pcb.c
  user/attilio/rm_vmobj_cache/sys/netinet/ip_dummynet.h
  user/attilio/rm_vmobj_cache/sys/netinet/ip_options.c
  user/attilio/rm_vmobj_cache/sys/netinet/ip_output.c
  user/attilio/rm_vmobj_cache/sys/netinet/tcp_timewait.c
  user/attilio/rm_vmobj_cache/sys/netinet/udp_var.h
  user/attilio/rm_vmobj_cache/sys/netinet6/ip6_forward.c
  user/attilio/rm_vmobj_cache/sys/netinet6/ip6_ipsec.c
  user/attilio/rm_vmobj_cache/sys/netinet6/ip6_ipsec.h
  user/attilio/rm_vmobj_cache/sys/netinet6/ip6_output.c
  user/attilio/rm_vmobj_cache/sys/netinet6/ip6_var.h
  user/attilio/rm_vmobj_cache/sys/netinet6/nd6.c
  user/attilio/rm_vmobj_cache/sys/netinet6/nd6_nbr.c
  user/attilio/rm_vmobj_cache/sys/netipsec/ipsec6.h
  user/attilio/rm_vmobj_cache/sys/netipsec/ipsec_input.c
  user/attilio/rm_vmobj_cache/sys/netipsec/ipsec_output.c
  user/attilio/rm_vmobj_cache/sys/netipsec/xform_ipip.c
  user/attilio/rm_vmobj_cache/sys/netpfil/ipfw/ip_dn_io.c
  user/attilio/rm_vmobj_cache/sys/netpfil/ipfw/ip_dummynet.c
  user/attilio/rm_vmobj_cache/sys/netpfil/pf/pf.c
  user/attilio/rm_vmobj_cache/sys/powerpc/aim/trap.c
  user/attilio/rm_vmobj_cache/sys/powerpc/powerpc/sigcode32.S
  user/attilio/rm_vmobj_cache/sys/powerpc/powerpc/sigcode64.S
  user/attilio/rm_vmobj_cache/sys/sys/dtrace_bsd.h
  user/attilio/rm_vmobj_cache/sys/sys/imgact_elf.h
  user/attilio/rm_vmobj_cache/sys/sys/param.h
  user/attilio/rm_vmobj_cache/sys/vm/vm_map.c
  user/attilio/rm_vmobj_cache/sys/x86/x86/busdma_bounce.c
  user/attilio/rm_vmobj_cache/tests/sys/netinet/fibs_test.sh
  user/attilio/rm_vmobj_cache/tests/sys/netinet/udp_dontroute.c
  user/attilio/rm_vmobj_cache/tools/build/options/WITHOUT_DOCCOMPRESS
  user/attilio/rm_vmobj_cache/tools/build/options/WITHOUT_GNU_GREP_COMPAT
  user/attilio/rm_vmobj_cache/tools/build/options/WITHOUT_MANCOMPRESS
  user/attilio/rm_vmobj_cache/tools/build/options/WITH_FMAKE
  user/attilio/rm_vmobj_cache/tools/regression/lib/libc/stdio/test-fmemopen.c
  user/attilio/rm_vmobj_cache/tools/tools/vt/mkkfont/mkkfont.c
  user/attilio/rm_vmobj_cache/usr.bin/calendar/Makefile
  user/attilio/rm_vmobj_cache/usr.bin/calendar/calendars/calendar.freebsd
  user/attilio/rm_vmobj_cache/usr.bin/printf/printf.c
  user/attilio/rm_vmobj_cache/usr.bin/printf/tests/Makefile
  user/attilio/rm_vmobj_cache/usr.bin/printf/tests/regress.m2.out
  user/attilio/rm_vmobj_cache/usr.bin/printf/tests/regress.sh
  user/attilio/rm_vmobj_cache/usr.bin/top/machine.c
  user/attilio/rm_vmobj_cache/usr.sbin/bhyve/bhyverun.c
  user/attilio/rm_vmobj_cache/usr.sbin/bhyve/inout.c
  user/attilio/rm_vmobj_cache/usr.sbin/bhyve/pci_lpc.c
  user/attilio/rm_vmobj_cache/usr.sbin/bhyve/pci_virtio_block.c
  user/attilio/rm_vmobj_cache/usr.sbin/bhyvectl/bhyvectl.c
  user/attilio/rm_vmobj_cache/usr.sbin/bsnmpd/modules/Makefile
  user/attilio/rm_vmobj_cache/usr.sbin/bsnmpd/modules/snmp_hast/snmp_hast.3
  user/attilio/rm_vmobj_cache/usr.sbin/kbdcontrol/kbdcontrol.c
  user/attilio/rm_vmobj_cache/usr.sbin/kbdcontrol/path.h
  user/attilio/rm_vmobj_cache/usr.sbin/makefs/ffs/mkfs.c
  user/attilio/rm_vmobj_cache/usr.sbin/mixer/mixer.8
  user/attilio/rm_vmobj_cache/usr.sbin/pmcstat/pmcstat.h
  user/attilio/rm_vmobj_cache/usr.sbin/unbound/local-setup/local-unbound-setup.sh
  user/attilio/rm_vmobj_cache/usr.sbin/usbdump/usbdump.c
  user/attilio/rm_vmobj_cache/usr.sbin/vidcontrol/path.h
  user/attilio/rm_vmobj_cache/usr.sbin/vidcontrol/vidcontrol.c
Directory Properties:
  user/attilio/rm_vmobj_cache/   (props changed)
  user/attilio/rm_vmobj_cache/cddl/   (props changed)
  user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/   (props changed)
  user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/cmd/zfs/   (props changed)
  user/attilio/rm_vmobj_cache/contrib/bmake/   (props changed)
  user/attilio/rm_vmobj_cache/contrib/unbound/   (props changed)
  user/attilio/rm_vmobj_cache/etc/   (props changed)
  user/attilio/rm_vmobj_cache/include/   (props changed)
  user/attilio/rm_vmobj_cache/lib/libc/   (props changed)
  user/attilio/rm_vmobj_cache/lib/libvmmapi/   (props changed)
  user/attilio/rm_vmobj_cache/sbin/   (props changed)
  user/attilio/rm_vmobj_cache/sbin/ipfw/   (props changed)
  user/attilio/rm_vmobj_cache/share/   (props changed)
  user/attilio/rm_vmobj_cache/share/man/man4/   (props changed)
  user/attilio/rm_vmobj_cache/sys/   (props changed)
  user/attilio/rm_vmobj_cache/sys/amd64/vmm/   (props changed)
  user/attilio/rm_vmobj_cache/sys/boot/   (props changed)
  user/attilio/rm_vmobj_cache/sys/cddl/contrib/opensolaris/   (props changed)
  user/attilio/rm_vmobj_cache/sys/conf/   (props changed)
  user/attilio/rm_vmobj_cache/usr.bin/calendar/   (props changed)
  user/attilio/rm_vmobj_cache/usr.sbin/bhyve/   (props changed)
  user/attilio/rm_vmobj_cache/usr.sbin/bhyvectl/   (props changed)

Copied: user/attilio/rm_vmobj_cache/.arclint (from r267007, head/.arclint)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/attilio/rm_vmobj_cache/.arclint	Tue Jun  3 13:47:00 2014	(r267008, copy of r267007, head/.arclint)
@@ -0,0 +1,9 @@
+{
+  "linters": {
+    "python": {
+      "type": "pep8",
+      "exclude": "(contrib)",
+      "include": "(\\.py$)"
+    }
+  }
+}

Modified: user/attilio/rm_vmobj_cache/bin/sh/arith_yacc.c
==============================================================================
--- user/attilio/rm_vmobj_cache/bin/sh/arith_yacc.c	Tue Jun  3 13:33:43 2014	(r267007)
+++ user/attilio/rm_vmobj_cache/bin/sh/arith_yacc.c	Tue Jun  3 13:47:00 2014	(r267008)
@@ -139,7 +139,7 @@ static arith_t do_binop(int op, arith_t 
 	case ARITH_SUB:
 		return (uintmax_t)a - (uintmax_t)b;
 	case ARITH_LSHIFT:
-		return a << b;
+		return (uintmax_t)a << b;
 	case ARITH_RSHIFT:
 		return a >> b;
 	case ARITH_LT:

Modified: user/attilio/rm_vmobj_cache/bin/sh/exec.c
==============================================================================
--- user/attilio/rm_vmobj_cache/bin/sh/exec.c	Tue Jun  3 13:33:43 2014	(r267007)
+++ user/attilio/rm_vmobj_cache/bin/sh/exec.c	Tue Jun  3 13:47:00 2014	(r267008)
@@ -362,15 +362,13 @@ find_command(const char *name, struct cm
 
 	e = ENOENT;
 	idx = -1;
-loop:
-	while ((fullname = padvance(&path, name)) != NULL) {
-		stunalloc(fullname);
+	for (;(fullname = padvance(&path, name)) != NULL; stunalloc(fullname)) {
 		idx++;
 		if (pathopt) {
 			if (prefix("func", pathopt)) {
 				/* handled below */
 			} else {
-				goto loop;	/* ignore unimplemented options */
+				continue; /* ignore unimplemented options */
 			}
 		}
 		if (fullname[0] != '/')
@@ -378,13 +376,12 @@ loop:
 		if (stat(fullname, &statb) < 0) {
 			if (errno != ENOENT && errno != ENOTDIR)
 				e = errno;
-			goto loop;
+			continue;
 		}
 		e = EACCES;	/* if we fail, this will be the error */
 		if (!S_ISREG(statb.st_mode))
-			goto loop;
+			continue;
 		if (pathopt) {		/* this is a %func directory */
-			stalloc(strlen(fullname) + 1);
 			readcmdfile(fullname);
 			if ((cmdp = cmdlookup(name, 0)) == NULL || cmdp->cmdtype != CMDFUNCTION)
 				error("%s not defined in %s", name, fullname);
@@ -405,6 +402,7 @@ loop:
 #endif
 		TRACE(("searchexec \"%s\" returns \"%s\"\n", name, fullname));
 		INTOFF;
+		stunalloc(fullname);
 		cmdp = cmdlookup(name, 1);
 		if (cmdp->cmdtype == CMDFUNCTION)
 			cmdp = &loc_cmd;

Modified: user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/cmd/zfs/zfs.8
==============================================================================
--- user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/cmd/zfs/zfs.8	Tue Jun  3 13:33:43 2014	(r267007)
+++ user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/cmd/zfs/zfs.8	Tue Jun  3 13:47:00 2014	(r267008)
@@ -18,7 +18,7 @@
 .\" information: Portions Copyright [yyyy] [name of copyright owner]
 .\"
 .\" Copyright (c) 2010, Sun Microsystems, Inc. All Rights Reserved.
-.\" Copyright (c) 2013 by Delphix. All rights reserved.
+.\" Copyright (c) 2014 by Delphix. All rights reserved.
 .\" Copyright (c) 2011, Pawel Jakub Dawidek <pjd at FreeBSD.org>
 .\" Copyright (c) 2012, Glen Barber <gjb at FreeBSD.org>
 .\" Copyright (c) 2012, Bryan Drewery <bdrewery at FreeBSD.org>
@@ -30,7 +30,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd April 23, 2014
+.Dd May 27, 2014
 .Dt ZFS 8
 .Os
 .Sh NAME
@@ -1193,6 +1193,53 @@ affects only files created afterward; ex
 .Pp
 This property can also be referred to by its shortened column name,
 .Sy recsize .
+.It Sy redundant_metadata Ns = Ns Cm all | most
+Controls what types of metadata are stored redundantly.
+ZFS stores an extra copy of metadata, so that if a single block is corrupted,
+the amount of user data lost is limited.
+This extra copy is in addition to any redundancy provided at the pool level
+.Pq e.g. by mirroring or RAID-Z ,
+and is in addition to an extra copy specified by the
+.Sy copies
+property
+.Pq up to a total of 3 copies .
+For example if the pool is mirrored,
+.Cm copies Ns = Ns Ar 2 ,
+and
+.Cm redundant_metadata Ns = Ns Ar most ,
+then ZFS
+stores 6 copies of most metadata, and 4 copies of data and some
+metadata.
+.Pp
+When set to
+.Cm all ,
+ZFS stores an extra copy of all metadata.
+If a
+single on-disk block is corrupt, at worst a single block of user data
+.Po which is
+.Cm recordsize
+bytes long
+can be lost.
+.Pc
+.Pp
+When set to
+.Cm most ,
+ZFS stores an extra copy of most types of
+metadata.
+This can improve performance of random writes, because less
+metadata must be written.
+In practice, at worst about 100 blocks
+.Po of
+.Cm recordsize
+bytes each
+.Pc
+of user data can be lost if a single
+on-disk block is corrupt.
+The exact behavior of which metadata blocks
+are stored redundantly may change in future releases.
+.Pp
+The default value is
+.Cm all .
 .It Sy refquota Ns = Ns Ar size | Cm none
 Limits the amount of space a dataset can consume. This property enforces a hard
 limit on the amount of space used. This hard limit does not include space used

Modified: user/attilio/rm_vmobj_cache/contrib/bmake/var.c
==============================================================================
--- user/attilio/rm_vmobj_cache/contrib/bmake/var.c	Tue Jun  3 13:33:43 2014	(r267007)
+++ user/attilio/rm_vmobj_cache/contrib/bmake/var.c	Tue Jun  3 13:47:00 2014	(r267008)
@@ -141,17 +141,6 @@ __RCSID("$NetBSD: var.c,v 1.184 2013/09/
 
 extern int makelevel;
 /*
- * XXX transition hack for FreeBSD ports.
- * bsd.port.mk can set .MAKE.FreeBSD_UL=yes
- * to cause us to treat :[LU] as aliases for :t[lu]
- * To be reverted when ports converts to :t[lu] (when 8.3 is EOL)
- */
-#define MAKE_FREEBSD_UL ".MAKE.FreeBSD_UL"
-#ifdef MAKE_FREEBSD_UL
-static int FreeBSD_UL = FALSE;
-#endif
-
-/*
  * This lets us tell if we have replaced the original environ
  * (which we cannot free).
  */
@@ -990,12 +979,6 @@ Var_Set(const char *name, const char *va
 
 	Var_Append(MAKEOVERRIDES, name, VAR_GLOBAL);
     }
-	
-#ifdef MAKE_FREEBSD_UL
-    if (strcmp(MAKE_FREEBSD_UL, name) == 0) {
-	FreeBSD_UL = getBoolean(MAKE_FREEBSD_UL, FALSE);
-    }
-#endif
 
 
  out:
@@ -2689,24 +2672,8 @@ ApplyModifiers(char *nstr, const char *t
 		free(loop.str);
 		break;
 	    }
-	case 'U':
-#ifdef MAKE_FREEBSD_UL
-	    if (FreeBSD_UL) {
-		int nc = tstr[1];
-
-		/* we have to be careful, since :U is used internally */
-		if (nc == ':' || nc == endc) {
-		    char *dp = bmake_strdup(nstr);
-		    for (newStr = dp; *dp; dp++)
-			*dp = toupper((unsigned char)*dp);
-		    cp = tstr + 1;
-		    termc = *cp;
-		    break;		/* yes inside the conditional */
-		}
-		/* FALLTHROUGH */
-	    }
-#endif
 	case 'D':
+	case 'U':
 	    {
 		Buffer  buf;    	/* Buffer for patterns */
 		int	    wantit;	/* want data in buffer */
@@ -2766,17 +2733,6 @@ ApplyModifiers(char *nstr, const char *t
 		break;
 	    }
 	case 'L':
-#ifdef MAKE_FREEBSD_UL
-	    if (FreeBSD_UL) {
-		char *dp = bmake_strdup(nstr);
-		for (newStr = dp; *dp; dp++)
-		    *dp = tolower((unsigned char)*dp);
-		cp = tstr + 1;
-		termc = *cp;
-		break;
-	    }
-	    /* FALLTHROUGH */
-#endif
 	    {
 		if ((v->flags & VAR_JUNK) != 0)
 		    v->flags |= VAR_KEEP;

Modified: user/attilio/rm_vmobj_cache/contrib/unbound/libunbound/libworker.h
==============================================================================
--- user/attilio/rm_vmobj_cache/contrib/unbound/libunbound/libworker.h	Tue Jun  3 13:33:43 2014	(r267007)
+++ user/attilio/rm_vmobj_cache/contrib/unbound/libunbound/libworker.h	Tue Jun  3 13:47:00 2014	(r267008)
@@ -136,10 +136,6 @@ void libworker_delete_event(struct libwo
 /** cleanup the cache to remove all rrset IDs from it, arg is libworker */
 void libworker_alloc_cleanup(void* arg);
 
-/** mesh callback with event results */
-void libworker_event_done_cb(void* arg, int rcode, struct sldns_buffer* buf, 
-	enum sec_status s, char* why_bogus);
-
 /** 
  * fill result from parsed message, on error fills servfail 
  * @param res: is clear at start, filled in at end.

Modified: user/attilio/rm_vmobj_cache/contrib/unbound/libunbound/worker.h
==============================================================================
--- user/attilio/rm_vmobj_cache/contrib/unbound/libunbound/worker.h	Tue Jun  3 13:33:43 2014	(r267007)
+++ user/attilio/rm_vmobj_cache/contrib/unbound/libunbound/worker.h	Tue Jun  3 13:47:00 2014	(r267008)
@@ -91,6 +91,10 @@ void libworker_fg_done_cb(void* arg, int
 void libworker_bg_done_cb(void* arg, int rcode, sldns_buffer* buf, 
 	enum sec_status s, char* why_bogus);
 
+/** mesh callback with event results */
+void libworker_event_done_cb(void* arg, int rcode, struct sldns_buffer* buf, 
+	enum sec_status s, char* why_bogus);
+
 /**
  * Worker signal handler function. User argument is the worker itself.
  * @param sig: signal number.

Modified: user/attilio/rm_vmobj_cache/etc/etc.amd64/ttys
==============================================================================
--- user/attilio/rm_vmobj_cache/etc/etc.amd64/ttys	Tue Jun  3 13:33:43 2014	(r267007)
+++ user/attilio/rm_vmobj_cache/etc/etc.amd64/ttys	Tue Jun  3 13:47:00 2014	(r267008)
@@ -41,7 +41,7 @@ ttyv7	"/usr/libexec/getty Pc"		xterm	on 
 ttyv8	"/usr/local/bin/xdm -nodaemon"	xterm	off secure
 # Serial terminals
 # The 'dialup' keyword identifies dialin lines to login, fingerd etc.
-ttyu0	"/usr/libexec/getty std.9600"	dialup	off secure
+ttyu0	"/usr/libexec/getty std.9600"	vt100	onifconsole secure
 ttyu1	"/usr/libexec/getty std.9600"	dialup	off secure
 ttyu2	"/usr/libexec/getty std.9600"	dialup	off secure
 ttyu3	"/usr/libexec/getty std.9600"	dialup	off secure

Modified: user/attilio/rm_vmobj_cache/etc/etc.i386/ttys
==============================================================================
--- user/attilio/rm_vmobj_cache/etc/etc.i386/ttys	Tue Jun  3 13:33:43 2014	(r267007)
+++ user/attilio/rm_vmobj_cache/etc/etc.i386/ttys	Tue Jun  3 13:47:00 2014	(r267008)
@@ -41,7 +41,7 @@ ttyv7	"/usr/libexec/getty Pc"		xterm	on 
 ttyv8	"/usr/local/bin/xdm -nodaemon"	xterm	off secure
 # Serial terminals
 # The 'dialup' keyword identifies dialin lines to login, fingerd etc.
-ttyu0	"/usr/libexec/getty std.9600"	dialup	off secure
+ttyu0	"/usr/libexec/getty std.9600"	vt100	onifconsole secure
 ttyu1	"/usr/libexec/getty std.9600"	dialup	off secure
 ttyu2	"/usr/libexec/getty std.9600"	dialup	off secure
 ttyu3	"/usr/libexec/getty std.9600"	dialup	off secure

Modified: user/attilio/rm_vmobj_cache/etc/mtree/BSD.usr.dist
==============================================================================
--- user/attilio/rm_vmobj_cache/etc/mtree/BSD.usr.dist	Tue Jun  3 13:33:43 2014	(r267007)
+++ user/attilio/rm_vmobj_cache/etc/mtree/BSD.usr.dist	Tue Jun  3 13:47:00 2014	(r267008)
@@ -101,6 +101,10 @@
             ..
             include
             ..
+            includes
+                include
+                ..
+            ..
         ..
         bsdinstall
         ..

Modified: user/attilio/rm_vmobj_cache/etc/mtree/BSD.var.dist
==============================================================================
--- user/attilio/rm_vmobj_cache/etc/mtree/BSD.var.dist	Tue Jun  3 13:33:43 2014	(r267007)
+++ user/attilio/rm_vmobj_cache/etc/mtree/BSD.var.dist	Tue Jun  3 13:47:00 2014	(r267008)
@@ -96,6 +96,8 @@
         ..
     ..
     unbound         uname=unbound gname=unbound mode=0755
+        conf.d          uname=unbound gname=unbound mode=0755
+        ..
     ..
     yp
     ..

Modified: user/attilio/rm_vmobj_cache/etc/snmpd.config
==============================================================================
--- user/attilio/rm_vmobj_cache/etc/snmpd.config	Tue Jun  3 13:33:43 2014	(r267007)
+++ user/attilio/rm_vmobj_cache/etc/snmpd.config	Tue Jun  3 13:47:00 2014	(r267008)
@@ -279,6 +279,11 @@ begemotSnmpdModulePath."mibII"	= "/usr/l
 #begemotNgControlNodeName = "snmpd"
 
 #
+# LM75 Sensor module
+#
+#begemotSnmpdModulePath."lm75" = "/usr/lib/snmp_lm75.so"
+
+#
 # pf(4) module
 #
 #begemotSnmpdModulePath."pf"	= "/usr/lib/snmp_pf.so"

Modified: user/attilio/rm_vmobj_cache/include/strings.h
==============================================================================
--- user/attilio/rm_vmobj_cache/include/strings.h	Tue Jun  3 13:33:43 2014	(r267007)
+++ user/attilio/rm_vmobj_cache/include/strings.h	Tue Jun  3 13:47:00 2014	(r267008)
@@ -59,6 +59,10 @@ char	*rindex(const char *, int) __pure;	
 #endif
 int	 strcasecmp(const char *, const char *) __pure;
 int	 strncasecmp(const char *, const char *, size_t) __pure;
+
+#if __POSIX_VISIBLE >= 200809 || defined(_XLOCALE_H_)
+#include <xlocale/_strings.h>
+#endif
 __END_DECLS
 
 #endif /* _STRINGS_H_ */

Modified: user/attilio/rm_vmobj_cache/include/xlocale/Makefile
==============================================================================
--- user/attilio/rm_vmobj_cache/include/xlocale/Makefile	Tue Jun  3 13:33:43 2014	(r267007)
+++ user/attilio/rm_vmobj_cache/include/xlocale/Makefile	Tue Jun  3 13:47:00 2014	(r267008)
@@ -2,7 +2,7 @@
 
 NO_OBJ=
 INCS=	_ctype.h _inttypes.h _langinfo.h _locale.h _monetary.h _stdio.h\
-	_stdlib.h _string.h _time.h _uchar.h _wchar.h
+	_stdlib.h _string.h _strings.h _time.h _uchar.h _wchar.h
 INCSDIR=${INCLUDEDIR}/xlocale
 
 .include <bsd.prog.mk>

Modified: user/attilio/rm_vmobj_cache/include/xlocale/_string.h
==============================================================================
--- user/attilio/rm_vmobj_cache/include/xlocale/_string.h	Tue Jun  3 13:33:43 2014	(r267007)
+++ user/attilio/rm_vmobj_cache/include/xlocale/_string.h	Tue Jun  3 13:47:00 2014	(r267008)
@@ -53,9 +53,7 @@ size_t	 strxfrm_l(char *, const char *, 
 #ifdef _XLOCALE_H_
 #ifndef _XLOCALE_STRING2_H
 #define _XLOCALE_STRING2_H
-int	 strcasecmp_l(const char *, const char *, locale_t);
 char	*strcasestr_l(const char *, const char *, locale_t);
-int	 strncasecmp_l(const char *, const char *, size_t, locale_t);
 
 #endif /* _XLOCALE_STRING2_H */
 #endif /* _XLOCALE_H_ */

Copied: user/attilio/rm_vmobj_cache/include/xlocale/_strings.h (from r267007, head/include/xlocale/_strings.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/attilio/rm_vmobj_cache/include/xlocale/_strings.h	Tue Jun  3 13:47:00 2014	(r267008, copy of r267007, head/include/xlocale/_strings.h)
@@ -0,0 +1,48 @@
+/*-
+ * Copyright (c) 2011, 2012 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ */
+
+#ifndef _LOCALE_T_DEFINED
+#define _LOCALE_T_DEFINED
+typedef struct	_xlocale *locale_t;
+#endif
+
+/*
+ * This file is included from both strings.h and xlocale.h.  We need to expose
+ * the declarations unconditionally if we are included from xlocale.h, but only
+ * if we are in POSIX2008 mode if included from string.h.
+ */
+
+#ifndef _XLOCALE_STRINGS1_H
+#define _XLOCALE_STRINGS1_H
+
+/*
+ * POSIX2008 functions
+ */
+int	 strcasecmp_l(const char *, const char *, locale_t);
+int	 strncasecmp_l(const char *, const char *, size_t, locale_t);
+#endif /* _XLOCALE_STRINGS1_H */

Modified: user/attilio/rm_vmobj_cache/lib/libc/gen/sem_wait.3
==============================================================================
--- user/attilio/rm_vmobj_cache/lib/libc/gen/sem_wait.3	Tue Jun  3 13:33:43 2014	(r267007)
+++ user/attilio/rm_vmobj_cache/lib/libc/gen/sem_wait.3	Tue Jun  3 13:47:00 2014	(r267008)
@@ -81,6 +81,7 @@ will fail if:
 .It Bq Er EINTR
 A signal interrupted this function.
 .El
+.Pp
 Additionally,
 .Fn sem_trywait
 will fail if:

Modified: user/attilio/rm_vmobj_cache/lib/libc/stdio/fmemopen.c
==============================================================================
--- user/attilio/rm_vmobj_cache/lib/libc/stdio/fmemopen.c	Tue Jun  3 13:33:43 2014	(r267007)
+++ user/attilio/rm_vmobj_cache/lib/libc/stdio/fmemopen.c	Tue Jun  3 13:47:00 2014	(r267008)
@@ -57,6 +57,14 @@ fmemopen(void * __restrict buf, size_t s
 	int flags, rc;
 
 	/*
+	 * POSIX says we shall return EINVAL if size is 0.
+	 */
+	if (size == 0) {
+		errno = EINVAL;
+		return (NULL);
+	}
+
+	/*
 	 * Retrieve the flags as used by open(2) from the mode argument, and
 	 * validate them.
 	 */
@@ -119,14 +127,7 @@ fmemopen(void * __restrict buf, size_t s
 	 */
 	switch (mode[0]) {
 	case 'a':
-		if (ck->bin) {
-			/*
-			 * This isn't useful, since the buffer isn't allowed
-			 * to grow.
-			 */
-			ck->off = ck->len = size;
-		} else
-			ck->off = ck->len = strnlen(ck->buf, ck->size);
+		ck->off = ck->len = strnlen(ck->buf, ck->size);
 		break;
 	case 'r':
 		ck->len = size;

Modified: user/attilio/rm_vmobj_cache/lib/libc/stdio/fopen.3
==============================================================================
--- user/attilio/rm_vmobj_cache/lib/libc/stdio/fopen.3	Tue Jun  3 13:33:43 2014	(r267007)
+++ user/attilio/rm_vmobj_cache/lib/libc/stdio/fopen.3	Tue Jun  3 13:47:00 2014	(r267008)
@@ -302,6 +302,15 @@ for any of the errors specified for the 
 .Xr fclose 3
 and
 .Xr fflush 3 .
+.Pp
+The
+.Fn fmemopen
+function
+may also fail and set
+.Va errno
+if the
+.Fa size
+argument is 0.
 .Sh SEE ALSO
 .Xr open 2 ,
 .Xr fclose 3 ,

Modified: user/attilio/rm_vmobj_cache/lib/libc/string/strcasecmp.3
==============================================================================
--- user/attilio/rm_vmobj_cache/lib/libc/string/strcasecmp.3	Tue Jun  3 13:33:43 2014	(r267007)
+++ user/attilio/rm_vmobj_cache/lib/libc/string/strcasecmp.3	Tue Jun  3 13:47:00 2014	(r267008)
@@ -30,7 +30,7 @@
 .\"     @(#)strcasecmp.3	8.1 (Berkeley) 6/9/93
 .\" $FreeBSD$
 .\"
-.Dd June 9, 1993
+.Dd May 29, 2014
 .Dt STRCASECMP 3
 .Os
 .Sh NAME
@@ -45,7 +45,7 @@
 .Fn strcasecmp "const char *s1" "const char *s2"
 .Ft int
 .Fn strncasecmp "const char *s1" "const char *s2" "size_t len"
-.In string.h
+.In strings.h
 .In xlocale.h
 .Ft int
 .Fn strcasecmp_l "const char *s1" "const char *s2" "locale_t loc"

Modified: user/attilio/rm_vmobj_cache/lib/libc/sys/mlock.2
==============================================================================
--- user/attilio/rm_vmobj_cache/lib/libc/sys/mlock.2	Tue Jun  3 13:33:43 2014	(r267007)
+++ user/attilio/rm_vmobj_cache/lib/libc/sys/mlock.2	Tue Jun  3 13:47:00 2014	(r267008)
@@ -94,7 +94,7 @@ limited in how much they can lock down.
 The amount of memory that a single process can
 .Fn mlock
 is limited by both the per-process
-.Li RLIMIT_MEMLOCK
+.Dv RLIMIT_MEMLOCK
 resource limit and the
 system-wide
 .Dq wired pages

Modified: user/attilio/rm_vmobj_cache/lib/libcrypt/crypt.c
==============================================================================
--- user/attilio/rm_vmobj_cache/lib/libcrypt/crypt.c	Tue Jun  3 13:33:43 2014	(r267007)
+++ user/attilio/rm_vmobj_cache/lib/libcrypt/crypt.c	Tue Jun  3 13:47:00 2014	(r267008)
@@ -104,12 +104,16 @@ char *
 crypt(const char *passwd, const char *salt)
 {
 	const struct crypt_format *cf;
+#ifdef HAS_DES
+	int len;
+#endif
 
 	for (cf = crypt_formats; cf->name != NULL; ++cf)
 		if (cf->magic != NULL && strstr(salt, cf->magic) == salt)
 			return (cf->func(passwd, salt));
 #ifdef HAS_DES
-	if (strlen(salt) == 13 && strspn(salt, DES_SALT_ALPHABET) == 13)
+	len = strlen(salt);
+	if ((len == 13 || len == 2) && strspn(salt, DES_SALT_ALPHABET) == len)
 		return (crypt_des(passwd, salt));
 #endif
 	return (crypt_format->func(passwd, salt));

Modified: user/attilio/rm_vmobj_cache/lib/libstand/printf.c
==============================================================================
--- user/attilio/rm_vmobj_cache/lib/libstand/printf.c	Tue Jun  3 13:33:43 2014	(r267007)
+++ user/attilio/rm_vmobj_cache/lib/libstand/printf.c	Tue Jun  3 13:47:00 2014	(r267008)
@@ -56,8 +56,17 @@ __FBSDID("$FreeBSD$");
 
 #define MAXNBUF (sizeof(intmax_t) * CHAR_BIT + 1)
 
+typedef void (kvprintf_fn_t)(int, void *);
+
 static char	*ksprintn (char *buf, uintmax_t num, int base, int *len, int upper);
-static int	kvprintf(char const *fmt, void (*func)(int), void *arg, int radix, va_list ap);
+static int	kvprintf(char const *fmt, kvprintf_fn_t *func, void *arg, int radix, va_list ap);
+
+static void
+putchar_wrapper(int cc, void *arg)
+{
+
+	putchar(cc);
+}
 
 int
 printf(const char *fmt, ...)
@@ -66,7 +75,7 @@ printf(const char *fmt, ...)
 	int retval;
 
 	va_start(ap, fmt);
-	retval = kvprintf(fmt, putchar, NULL, 10, ap);
+	retval = kvprintf(fmt, putchar_wrapper, NULL, 10, ap);
 	va_end(ap);
 	return retval;
 }
@@ -75,7 +84,7 @@ void
 vprintf(const char *fmt, va_list ap)
 {
 
-	kvprintf(fmt, putchar, NULL, 10, ap);
+	kvprintf(fmt, putchar_wrapper, NULL, 10, ap);
 }
 
 int
@@ -91,6 +100,46 @@ sprintf(char *buf, const char *cfmt, ...
 	return retval;
 }
 
+struct print_buf {
+	char *buf;
+	size_t size;
+};
+
+static void
+snprint_func(int ch, void *arg)
+{
+	struct print_buf *pbuf = arg;
+
+	if (pbuf->size < 2) {
+		/*
+		 * Reserve last buffer position for the terminating
+		 * character:
+		 */
+		return;
+	}
+	*(pbuf->buf)++ = ch;
+	pbuf->size--;
+}
+
+int
+snprintf(char *buf, size_t size, const char *cfmt, ...)
+{
+	int retval;
+	va_list ap;
+	struct print_buf arg;
+
+	arg.buf = buf;
+	arg.size = size;
+
+	va_start(ap, cfmt);
+	retval = kvprintf(cfmt, &snprint_func, &arg, 10, ap);
+	va_end(ap);
+
+	if (arg.size >= 1)
+		*(arg.buf)++ = 0;
+	return retval;
+}
+
 void
 vsprintf(char *buf, const char *cfmt, va_list ap)
 {
@@ -149,9 +198,9 @@ ksprintn(char *nbuf, uintmax_t num, int 
  *		("%*D", len, ptr, " " -> XX XX XX XX ...
  */
 static int
-kvprintf(char const *fmt, void (*func)(int), void *arg, int radix, va_list ap)
+kvprintf(char const *fmt, kvprintf_fn_t *func, void *arg, int radix, va_list ap)
 {
-#define PCHAR(c) {int cc=(c); if (func) (*func)(cc); else *d++ = cc; retval++; }
+#define PCHAR(c) {int cc=(c); if (func) (*func)(cc, arg); else *d++ = cc; retval++; }
 	char nbuf[MAXNBUF];
 	char *d;
 	const char *p, *percent, *q;

Modified: user/attilio/rm_vmobj_cache/lib/libstand/stand.h
==============================================================================
--- user/attilio/rm_vmobj_cache/lib/libstand/stand.h	Tue Jun  3 13:33:43 2014	(r267007)
+++ user/attilio/rm_vmobj_cache/lib/libstand/stand.h	Tue Jun  3 13:47:00 2014	(r267008)
@@ -238,6 +238,7 @@ extern void	mallocstats(void);
 extern int	printf(const char *fmt, ...) __printflike(1, 2);
 extern void	vprintf(const char *fmt, __va_list);
 extern int	sprintf(char *buf, const char *cfmt, ...) __printflike(2, 3);
+extern int	snprintf(char *buf, size_t size, const char *cfmt, ...) __printflike(3, 4);
 extern void	vsprintf(char *buf, const char *cfmt, __va_list);
 
 extern void	twiddle(void);

Modified: user/attilio/rm_vmobj_cache/lib/libvmmapi/vmmapi.c
==============================================================================
--- user/attilio/rm_vmobj_cache/lib/libvmmapi/vmmapi.c	Tue Jun  3 13:33:43 2014	(r267007)
+++ user/attilio/rm_vmobj_cache/lib/libvmmapi/vmmapi.c	Tue Jun  3 13:47:00 2014	(r267008)
@@ -29,11 +29,12 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <sys/types.h>
+#include <sys/param.h>
 #include <sys/sysctl.h>
 #include <sys/ioctl.h>
 #include <sys/mman.h>
 #include <sys/_iovec.h>
+#include <sys/cpuset.h>
 
 #include <machine/specialreg.h>
 #include <machine/param.h>
@@ -1043,3 +1044,44 @@ vm_copyout(struct vmctx *ctx, int vcpu, 
 		len -= n;
 	}
 }
+
+static int
+vm_get_cpus(struct vmctx *ctx, int which, cpuset_t *cpus)
+{
+	struct vm_cpuset vm_cpuset;
+	int error;
+
+	bzero(&vm_cpuset, sizeof(struct vm_cpuset));
+	vm_cpuset.which = which;
+	vm_cpuset.cpusetsize = sizeof(cpuset_t);
+	vm_cpuset.cpus = cpus;
+
+	error = ioctl(ctx->fd, VM_GET_CPUS, &vm_cpuset);
+	return (error);
+}
+
+int
+vm_active_cpus(struct vmctx *ctx, cpuset_t *cpus)
+{
+
+	return (vm_get_cpus(ctx, VM_ACTIVE_CPUS, cpus));
+}
+
+int
+vm_suspended_cpus(struct vmctx *ctx, cpuset_t *cpus)
+{
+
+	return (vm_get_cpus(ctx, VM_SUSPENDED_CPUS, cpus));
+}
+
+int
+vm_activate_cpu(struct vmctx *ctx, int vcpu)
+{
+	struct vm_activate_cpu ac;
+	int error;
+
+	bzero(&ac, sizeof(struct vm_activate_cpu));
+	ac.vcpuid = vcpu;
+	error = ioctl(ctx->fd, VM_ACTIVATE_CPU, &ac);
+	return (error);
+}

Modified: user/attilio/rm_vmobj_cache/lib/libvmmapi/vmmapi.h
==============================================================================
--- user/attilio/rm_vmobj_cache/lib/libvmmapi/vmmapi.h	Tue Jun  3 13:33:43 2014	(r267007)
+++ user/attilio/rm_vmobj_cache/lib/libvmmapi/vmmapi.h	Tue Jun  3 13:47:00 2014	(r267008)
@@ -29,6 +29,9 @@
 #ifndef _VMMAPI_H_
 #define	_VMMAPI_H_
 
+#include <sys/param.h>
+#include <sys/cpuset.h>
+
 struct iovec;
 struct vmctx;
 enum x2apic_state;
@@ -125,6 +128,10 @@ void	vm_copyout(struct vmctx *ctx, int v
 /* Reset vcpu register state */
 int	vcpu_reset(struct vmctx *ctx, int vcpu);
 
+int	vm_active_cpus(struct vmctx *ctx, cpuset_t *cpus);
+int	vm_suspended_cpus(struct vmctx *ctx, cpuset_t *cpus);
+int	vm_activate_cpu(struct vmctx *ctx, int vcpu);
+
 /*
  * FreeBSD specific APIs
  */

Modified: user/attilio/rm_vmobj_cache/release/doc/en_US.ISO8859-1/relnotes/article.xml
==============================================================================
--- user/attilio/rm_vmobj_cache/release/doc/en_US.ISO8859-1/relnotes/article.xml	Tue Jun  3 13:33:43 2014	(r267007)
+++ user/attilio/rm_vmobj_cache/release/doc/en_US.ISO8859-1/relnotes/article.xml	Tue Jun  3 13:47:00 2014	(r267008)
@@ -312,7 +312,7 @@
       &man.ps.1; change in <literal>r265229</literal>.</para>
 
     <para revision="265995">The Blowfish &man.crypt.3; default format
-      has been changed tox
+      has been changed to
       <literal>$2b$</literal>.</para>
 
     <para revision="266209">The &man.pmcstat.8; utility has been

Modified: user/attilio/rm_vmobj_cache/release/picobsd/floppy.tree/etc/ttys
==============================================================================
--- user/attilio/rm_vmobj_cache/release/picobsd/floppy.tree/etc/ttys	Tue Jun  3 13:33:43 2014	(r267007)
+++ user/attilio/rm_vmobj_cache/release/picobsd/floppy.tree/etc/ttys	Tue Jun  3 13:47:00 2014	(r267008)
@@ -32,4 +32,4 @@ ttyp6	none			network secure
 ttyp7	none			network secure
 ttyp8	none			network secure
 ttyp9	none			network secure
-ttyu0   "/usr/libexec/getty std.9600"   dialup  on secure
+ttyu0   "/usr/libexec/getty 3wire"   dialup  on secure

Modified: user/attilio/rm_vmobj_cache/release/picobsd/mfs_tree/etc/gettytab
==============================================================================
--- user/attilio/rm_vmobj_cache/release/picobsd/mfs_tree/etc/gettytab	Tue Jun  3 13:33:43 2014	(r267007)
+++ user/attilio/rm_vmobj_cache/release/picobsd/mfs_tree/etc/gettytab	Tue Jun  3 13:47:00 2014	(r267008)
@@ -4,12 +4,15 @@
 default:\
 	:cb:ce:ck:lc:fd#1000:cl:im=\r\nPicoBSD (%h) (%t)\r\n\r\n:sp#1200:
 
-P|Pc|Pc console:\
+# 20140527 add nc (no carrier) to the pc console entry to fix
+# devices with no handshake after svn 264175 (this also affects bhyve)
+P|Pc|Pc console|3wire:\
+	:nc:\
 	:ht:np:sp#115200:
 
 # Fixed speed entries
 2|std.9600|9600-baud:\
-	:np:sp#9600:
+	:nc:np:sp#9600:
 g|std.19200|19200-baud:\
 	:np:sp#19200:
 std.38400|38400-baud:\

Modified: user/attilio/rm_vmobj_cache/sbin/geom/class/label/glabel.8
==============================================================================
--- user/attilio/rm_vmobj_cache/sbin/geom/class/label/glabel.8	Tue Jun  3 13:33:43 2014	(r267007)
+++ user/attilio/rm_vmobj_cache/sbin/geom/class/label/glabel.8	Tue Jun  3 13:47:00 2014	(r267008)
@@ -130,8 +130,26 @@ GPT UUIDs (directory
 .Pa /dev/gptid/ ) .
 .El
 .Pp
-Generic labels are created in the directory
-.Pa /dev/label/ .
+Generic disk ID strings are exported as labels in the format
+.Pa /dev/diskid/GEOM_CLASS-ident
+e.g.
+.Pa /dev/diskid/DISK-6QG3Z026  .
+.Pp
+Generic labels created and managed solely by
+.Xr glabel 8
+are created in the
+.Pa /dev/label/
+directory.
+.Pp
+Note that for all label types, nested GEOM classes will cause additional
+device nodes to be created, with context-specific data appended to their
+names. E.g. for every node like
+.Pa /dev/label/bigdisk
+there will be additional entries for any partitions which the device
+contains, like
+.Pa /dev/label/bigdiskp1
+and
+.Pa /dev/label/bigdiskp1a .
 .Pp
 The first argument to
 .Nm

Modified: user/attilio/rm_vmobj_cache/sbin/ifconfig/ifconfig.8
==============================================================================
--- user/attilio/rm_vmobj_cache/sbin/ifconfig/ifconfig.8	Tue Jun  3 13:33:43 2014	(r267007)
+++ user/attilio/rm_vmobj_cache/sbin/ifconfig/ifconfig.8	Tue Jun  3 13:47:00 2014	(r267008)
@@ -169,6 +169,18 @@ and
 .Dq lladdr
 are synonyms for
 .Dq link .
+When using the
+.Fl l
+flag, the
+.Dq ether
+address family has special meaning and is no longer synonymous with
+.Dq link
+or
+.Dq lladdr .
+Specifying
+.Fl l Dq ether
+will list only ethernet interfaces, excluding all other interface types,
+including the loopback interface.
 .It Ar dest_address
 Specify the address of the correspondent on the other end
 of a point to point link.
@@ -2554,6 +2566,11 @@ The
 .Fl l
 flag may be used to list all available interfaces on the system, with
 no other additional information.
+If an
+.Ar address_family
+is specified, only interfaces of that type will be listed.
+.Fl l Dq ether
+will list only ethernet adapters, excluding the loopback interface.
 Use of this flag is mutually exclusive
 with all other flags and commands, except for
 .Fl d

Modified: user/attilio/rm_vmobj_cache/sbin/ipfw/dummynet.c
==============================================================================
--- user/attilio/rm_vmobj_cache/sbin/ipfw/dummynet.c	Tue Jun  3 13:33:43 2014	(r267007)
+++ user/attilio/rm_vmobj_cache/sbin/ipfw/dummynet.c	Tue Jun  3 13:47:00 2014	(r267008)
@@ -56,6 +56,7 @@ static struct _s_x dummynet_params[] = {
 	{ "sched_mask",		TOK_SCHED_MASK },
 	{ "flow_mask",		TOK_FLOW_MASK },
 	{ "droptail",		TOK_DROPTAIL },
+	{ "ecn",		TOK_ECN },
 	{ "red",		TOK_RED },
 	{ "gred",		TOK_GRED },
 	{ "bw",			TOK_BW },
@@ -239,7 +240,7 @@ print_flowset_parms(struct dn_fs *fs, ch
 	else
 		plr[0] = '\0';
 
-	if (fs->flags & DN_IS_RED)	/* RED parameters */
+	if (fs->flags & DN_IS_RED) {	/* RED parameters */
 		sprintf(red,
 		    "\n\t %cRED w_q %f min_th %d max_th %d max_p %f",
 		    (fs->flags & DN_IS_GENTLE_RED) ? 'G' : ' ',
@@ -247,7 +248,9 @@ print_flowset_parms(struct dn_fs *fs, ch
 		    fs->min_th,
 		    fs->max_th,
 		    1.0 * fs->max_p / (double)(1 << SCALE_RED));
-	else
+		if (fs->flags & DN_IS_ECN)
+			strncat(red, " (ecn)", 6);
+	} else
 		sprintf(red, "droptail");
 
 	if (prefix[0]) {
@@ -1046,13 +1049,17 @@ end_mask:
 			}
 			if ((end = strsep(&av[0], "/"))) {
 			    double max_p = strtod(end, NULL);
-			    if (max_p > 1 || max_p <= 0)
-				errx(EX_DATAERR, "0 < max_p <= 1");
+			    if (max_p > 1 || max_p < 0)
+				errx(EX_DATAERR, "0 <= max_p <= 1");
 			    fs->max_p = (int)(max_p * (1 << SCALE_RED));
 			}
 			ac--; av++;
 			break;
 
+		case TOK_ECN:
+			fs->flags |= DN_IS_ECN;
+			break;
+
 		case TOK_DROPTAIL:
 			NEED(fs, "droptail is only for flowsets");
 			fs->flags &= ~(DN_IS_RED|DN_IS_GENTLE_RED);
@@ -1175,13 +1182,20 @@ end_mask:
 			errx(EX_DATAERR, "2 <= queue size <= %ld", limit);
 	    }
 
+	    if ((fs->flags & DN_IS_ECN) && !(fs->flags & DN_IS_RED))
+		errx(EX_USAGE, "enable red/gred for ECN");
+
 	    if (fs->flags & DN_IS_RED) {
 		size_t len;
 		int lookup_depth, avg_pkt_size;
 
-		if (fs->min_th >= fs->max_th)
+		if (!(fs->flags & DN_IS_ECN) && (fs->min_th >= fs->max_th))
 		    errx(EX_DATAERR, "min_th %d must be < than max_th %d",
 			fs->min_th, fs->max_th);
+		else if ((fs->flags & DN_IS_ECN) && (fs->min_th > fs->max_th))
+		    errx(EX_DATAERR, "min_th %d must be =< than max_th %d",
+			fs->min_th, fs->max_th);
+
 		if (fs->max_th == 0)
 		    errx(EX_DATAERR, "max_th must be > 0");
 

Modified: user/attilio/rm_vmobj_cache/sbin/ipfw/ipfw.8
==============================================================================
--- user/attilio/rm_vmobj_cache/sbin/ipfw/ipfw.8	Tue Jun  3 13:33:43 2014	(r267007)
+++ user/attilio/rm_vmobj_cache/sbin/ipfw/ipfw.8	Tue Jun  3 13:47:00 2014	(r267008)
@@ -1,7 +1,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd October 25, 2012
+.Dd May 31, 2014
 .Dt IPFW 8
 .Os
 .Sh NAME
@@ -2441,22 +2441,23 @@ and
 control the maximum lengths that can be specified.
 .Pp
 .It Cm red | gred Ar w_q Ns / Ns Ar min_th Ns / Ns Ar max_th Ns / Ns Ar max_p
+[ecn]
 Make use of the RED (Random Early Detection) queue management algorithm.
 .Ar w_q
 and
 .Ar max_p
 are floating
-point numbers between 0 and 1 (0 not included), while
+point numbers between 0 and 1 (inclusive), while
 .Ar min_th
 and
 .Ar max_th
 are integer numbers specifying thresholds for queue management
 (thresholds are computed in bytes if the queue has been defined
 in bytes, in slots otherwise).
-The
+The two parameters can also be of the same value if needed. The
 .Nm dummynet
-also supports the gentle RED variant (gred).
-Three
+also supports the gentle RED variant (gred) and ECN (Explicit Congestion
+Notification) as optional. Three
 .Xr sysctl 8
 variables can be used to control the RED behaviour:
 .Bl -tag -width indent

Modified: user/attilio/rm_vmobj_cache/sbin/ipfw/ipfw2.h
==============================================================================
--- user/attilio/rm_vmobj_cache/sbin/ipfw/ipfw2.h	Tue Jun  3 13:33:43 2014	(r267007)
+++ user/attilio/rm_vmobj_cache/sbin/ipfw/ipfw2.h	Tue Jun  3 13:47:00 2014	(r267008)
@@ -165,6 +165,7 @@ enum tokens {
 	TOK_BURST,
 	TOK_RED,
 	TOK_GRED,
+	TOK_ECN,
 	TOK_DROPTAIL,
 	TOK_PROTO,
 	/* dummynet tokens */

Modified: user/attilio/rm_vmobj_cache/share/man/man4/carp.4
==============================================================================
--- user/attilio/rm_vmobj_cache/share/man/man4/carp.4	Tue Jun  3 13:33:43 2014	(r267007)
+++ user/attilio/rm_vmobj_cache/share/man/man4/carp.4	Tue Jun  3 13:47:00 2014	(r267008)
@@ -210,17 +210,18 @@ Enable it on both hosts A and B:
 .Pp
 Assume that host A is the preferred master and we are running the
 192.168.1.0/24 prefix on em0 and 192.168.2.0/24 on em1.
-This is the setup for host A:
+This is the setup for host A (advskew is above 0 so it could be overwritten
+in the emergency situation from the other host):
 .Bd -literal -offset indent
-ifconfig em0 vhid 1 pass mekmitasdigoat 192.168.1.1/24
-ifconfig em1 vhid 2 pass mekmitasdigoat 192.168.2.1/24
+ifconfig em0 vhid 1 advskew 100 pass mekmitasdigoat 192.168.1.1/24
+ifconfig em1 vhid 2 advskew 100 pass mekmitasdigoat 192.168.2.1/24
 .Ed
 .Pp
 The setup for host B is identical, but it has a higher
 .Cm advskew :
 .Bd -literal -offset indent
-ifconfig em0 vhid 1 advskew 100 pass mekmitasdigoat 192.168.1.1/24
-ifconfig em1 vhid 2 advskew 100 pass mekmitasdigoat 192.168.2.1/24
+ifconfig em0 vhid 1 advskew 200 pass mekmitasdigoat 192.168.1.1/24
+ifconfig em1 vhid 2 advskew 200 pass mekmitasdigoat 192.168.2.1/24
 .Ed
 .Pp
 When one of the physical interfaces of host A fails,
@@ -246,9 +247,9 @@ preempt host A on both interfaces instea
 .\"out slightly less frequently.
 .\".Bd -literal -offset indent
 .\"ifconfig carp0 create
-.\"ifconfig carp0 vhid 1 pass mekmitasdigoat 192.168.1.10/24
+.\"ifconfig carp0 vhid 1 advskew 100 pass mekmitasdigoat 192.168.1.10/24
 .\"ifconfig carp1 create
-.\"ifconfig carp1 vhid 2 advskew 100 pass mekmitasdigoat 192.168.1.10/24
+.\"ifconfig carp1 vhid 2 advskew 200 pass mekmitasdigoat 192.168.1.10/24
 .\".Ed
 .\".Pp
 .\"The configuration for host B is identical, except the
@@ -256,9 +257,9 @@ preempt host A on both interfaces instea
 .\"is on virtual host 1 rather than virtual host 2.
 .\".Bd -literal -offset indent
 .\"ifconfig carp0 create
-.\"ifconfig carp0 vhid 1 advskew 100 pass mekmitasdigoat 192.168.1.10/24
+.\"ifconfig carp0 vhid 1 advskew 200 pass mekmitasdigoat 192.168.1.10/24
 .\"ifconfig carp1 create
-.\"ifconfig carp1 vhid 2 pass mekmitasdigoat 192.168.1.10/24
+.\"ifconfig carp1 vhid 2 advskew 100 pass mekmitasdigoat 192.168.1.10/24
 .\".Ed
 .\".Pp
 .\"Finally, the ARP balancing feature must be enabled on both hosts:

Modified: user/attilio/rm_vmobj_cache/share/man/man4/iwn.4
==============================================================================
--- user/attilio/rm_vmobj_cache/share/man/man4/iwn.4	Tue Jun  3 13:33:43 2014	(r267007)
+++ user/attilio/rm_vmobj_cache/share/man/man4/iwn.4	Tue Jun  3 13:47:00 2014	(r267008)
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd February 9, 2014
+.Dd May 28, 2014
 .Dt IWN 4
 .Os
 .Sh NAME
@@ -92,6 +92,7 @@ driver provides support for:
 .It Intel Centrino Advanced-N + WiMAX 6250
 .It Intel Centrino Ultimate-N 6300
 .It Intel Centrino Wireless-N 100
+.It Intel Centrino Wireless-N 105
 .It Intel Centrino Wireless-N 130
 .It Intel Centrino Wireless-N 1000
 .It Intel Centrino Wireless-N 1030

Modified: user/attilio/rm_vmobj_cache/share/man/man4/man4.arm/ti_adc.4
==============================================================================
--- user/attilio/rm_vmobj_cache/share/man/man4/man4.arm/ti_adc.4	Tue Jun  3 13:33:43 2014	(r267007)
+++ user/attilio/rm_vmobj_cache/share/man/man4/man4.arm/ti_adc.4	Tue Jun  3 13:47:00 2014	(r267008)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd March 21, 2014
+.Dd June 1, 2014
 .Dt TI_ADC 4
 .Os
 .Sh NAME
@@ -78,8 +78,17 @@ dev.ti_adc.0.ain.6.enable: 1

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

More information about the svn-src-user mailing list