svn commit: r240685 - in projects/fuse: bin/ps etc/mtree include sbin sbin/ipfw sbin/nvmecontrol share/man/man4 sys/amd64/conf sys/arm/conf sys/boot/fdt/dts sys/boot/i386/loader sys/boot/ofw/libofw...

Wed Sep 19 00:27:51 UTC 2012

Author: attilio
Date: Wed Sep 19 00:27:50 2012
New Revision: 240685
URL: http://svn.freebsd.org/changeset/base/240685

Log:
  MFC

Added:
  projects/fuse/sbin/nvmecontrol/
     - copied from r240684, head/sbin/nvmecontrol/
  projects/fuse/sys/arm/conf/AC100
     - copied unchanged from r240684, head/sys/arm/conf/AC100
  projects/fuse/sys/boot/fdt/dts/tegra20-paz00.dts
     - copied unchanged from r240684, head/sys/boot/fdt/dts/tegra20-paz00.dts
  projects/fuse/sys/boot/fdt/dts/tegra20.dtsi
     - copied unchanged from r240684, head/sys/boot/fdt/dts/tegra20.dtsi
  projects/fuse/sys/dev/nvd/
     - copied from r240684, head/sys/dev/nvd/
  projects/fuse/sys/dev/nvme/
     - copied from r240684, head/sys/dev/nvme/
  projects/fuse/sys/modules/nvd/
     - copied from r240684, head/sys/modules/nvd/
  projects/fuse/sys/modules/nvme/
     - copied from r240684, head/sys/modules/nvme/
  projects/fuse/usr.sbin/bsdconfig/networking/share/
     - copied from r240684, head/usr.sbin/bsdconfig/networking/share/
  projects/fuse/usr.sbin/bsdconfig/password/share/
     - copied from r240684, head/usr.sbin/bsdconfig/password/share/
  projects/fuse/usr.sbin/bsdconfig/share/
     - copied from r240684, head/usr.sbin/bsdconfig/share/
  projects/fuse/usr.sbin/bsdconfig/startup/share/
     - copied from r240684, head/usr.sbin/bsdconfig/startup/share/
  projects/fuse/usr.sbin/bsdconfig/timezone/share/
     - copied from r240684, head/usr.sbin/bsdconfig/timezone/share/
  projects/fuse/usr.sbin/bsdconfig/usermgmt/share/
     - copied from r240684, head/usr.sbin/bsdconfig/usermgmt/share/
Deleted:
  projects/fuse/usr.sbin/bsdconfig/include/common.subr
  projects/fuse/usr.sbin/bsdconfig/include/dialog.subr
  projects/fuse/usr.sbin/bsdconfig/include/mustberoot.subr
  projects/fuse/usr.sbin/bsdconfig/include/strings.subr
  projects/fuse/usr.sbin/bsdconfig/include/sysrc.subr
  projects/fuse/usr.sbin/bsdconfig/networking/include/common.subr
  projects/fuse/usr.sbin/bsdconfig/networking/include/device.subr
  projects/fuse/usr.sbin/bsdconfig/networking/include/hostname.subr
  projects/fuse/usr.sbin/bsdconfig/networking/include/ipaddr.subr
  projects/fuse/usr.sbin/bsdconfig/networking/include/media.subr
  projects/fuse/usr.sbin/bsdconfig/networking/include/netmask.subr
  projects/fuse/usr.sbin/bsdconfig/networking/include/resolv.subr
  projects/fuse/usr.sbin/bsdconfig/networking/include/routing.subr
  projects/fuse/usr.sbin/bsdconfig/password/include/password.subr
  projects/fuse/usr.sbin/bsdconfig/startup/include/rcconf.subr
  projects/fuse/usr.sbin/bsdconfig/startup/include/rcedit.subr
  projects/fuse/usr.sbin/bsdconfig/startup/include/rcvar.subr
  projects/fuse/usr.sbin/bsdconfig/timezone/include/continents.subr
  projects/fuse/usr.sbin/bsdconfig/timezone/include/countries.subr
  projects/fuse/usr.sbin/bsdconfig/timezone/include/iso3166.subr
  projects/fuse/usr.sbin/bsdconfig/timezone/include/menus.subr
  projects/fuse/usr.sbin/bsdconfig/timezone/include/zones.subr
  projects/fuse/usr.sbin/bsdconfig/usermgmt/include/group_input.subr
  projects/fuse/usr.sbin/bsdconfig/usermgmt/include/user_input.subr
Modified:
  projects/fuse/bin/ps/keyword.c
  projects/fuse/bin/ps/ps.1
  projects/fuse/etc/mtree/BSD.include.dist
  projects/fuse/include/Makefile
  projects/fuse/sbin/Makefile.amd64
  projects/fuse/sbin/Makefile.i386
  projects/fuse/sbin/ipfw/ipfw.8
  projects/fuse/share/man/man4/pf.4
  projects/fuse/share/man/man4/usb_quirk.4
  projects/fuse/sys/amd64/conf/NOTES
  projects/fuse/sys/boot/i386/loader/main.c
  projects/fuse/sys/boot/ofw/libofw/devicename.c
  projects/fuse/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sa.c
  projects/fuse/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h
  projects/fuse/sys/conf/NOTES
  projects/fuse/sys/conf/files.amd64
  projects/fuse/sys/conf/files.i386
  projects/fuse/sys/conf/options
  projects/fuse/sys/contrib/altq/altq/altq_hfsc.c
  projects/fuse/sys/contrib/altq/altq/altq_priq.c
  projects/fuse/sys/contrib/altq/altq/altq_rmclass.c
  projects/fuse/sys/dev/acpica/acpi_cpu.c
  projects/fuse/sys/dev/alc/if_alc.c
  projects/fuse/sys/dev/ata/ata-lowlevel.c
  projects/fuse/sys/dev/ath/ath_hal/ah.c
  projects/fuse/sys/dev/ath/ath_hal/ah.h
  projects/fuse/sys/dev/ath/ath_hal/ah_internal.h
  projects/fuse/sys/dev/ath/if_ath_sysctl.c
  projects/fuse/sys/dev/ath/if_ath_tx.c
  projects/fuse/sys/dev/ath/if_athioctl.h
  projects/fuse/sys/dev/bge/if_bge.c
  projects/fuse/sys/dev/cxgb/cxgb_main.c
  projects/fuse/sys/dev/cxgb/cxgb_osdep.h
  projects/fuse/sys/dev/cxgbe/osdep.h
  projects/fuse/sys/dev/cxgbe/t4_main.c
  projects/fuse/sys/dev/e1000/if_em.c
  projects/fuse/sys/dev/et/if_et.c
  projects/fuse/sys/dev/hwpmc/hwpmc_amd.c
  projects/fuse/sys/dev/jme/if_jme.c
  projects/fuse/sys/dev/mlx/mlx.c
  projects/fuse/sys/dev/mlx/mlx_disk.c
  projects/fuse/sys/dev/mlx/mlx_pci.c
  projects/fuse/sys/dev/mlx/mlxreg.h
  projects/fuse/sys/dev/mlx/mlxvar.h
  projects/fuse/sys/dev/mly/mly.c
  projects/fuse/sys/dev/pci/pci.c
  projects/fuse/sys/dev/pci/pcireg.h
  projects/fuse/sys/dev/re/if_re.c
  projects/fuse/sys/dev/sound/usb/uaudio.c
  projects/fuse/sys/dev/sound/usb/uaudioreg.h
  projects/fuse/sys/dev/usb/input/ums.c
  projects/fuse/sys/dev/usb/net/uhso.c
  projects/fuse/sys/dev/usb/quirk/usb_quirk.c
  projects/fuse/sys/dev/usb/quirk/usb_quirk.h
  projects/fuse/sys/dev/usb/usbdevs
  projects/fuse/sys/geom/geom_disk.c
  projects/fuse/sys/i386/conf/NOTES
  projects/fuse/sys/modules/Makefile
  projects/fuse/sys/net/pfvar.h
  projects/fuse/sys/netipsec/xform_ipip.c
  projects/fuse/sys/netpfil/pf/pf.c
  projects/fuse/sys/netpfil/pf/pf_ioctl.c
  projects/fuse/sys/netpfil/pf/pf_lb.c
  projects/fuse/sys/ofed/include/linux/pci.h
  projects/fuse/sys/powerpc/mpc85xx/pci_fdt.c
  projects/fuse/sys/sys/_rmlock.h
  projects/fuse/sys/sys/pcpu.h
  projects/fuse/sys/vm/uma_core.c
  projects/fuse/usr.bin/systat/cmds.c
  projects/fuse/usr.bin/systat/extern.h
  projects/fuse/usr.bin/systat/icmp.c
  projects/fuse/usr.bin/systat/icmp6.c
  projects/fuse/usr.bin/systat/ip.c
  projects/fuse/usr.bin/systat/ip6.c
  projects/fuse/usr.bin/systat/keyboard.c
  projects/fuse/usr.bin/systat/main.c
  projects/fuse/usr.bin/systat/systat.1
  projects/fuse/usr.bin/systat/tcp.c
  projects/fuse/usr.bin/yes/yes.1
  projects/fuse/usr.sbin/bsdconfig/Makefile
  projects/fuse/usr.sbin/bsdconfig/bsdconfig
  projects/fuse/usr.sbin/bsdconfig/console/console
  projects/fuse/usr.sbin/bsdconfig/console/font
  projects/fuse/usr.sbin/bsdconfig/console/keymap
  projects/fuse/usr.sbin/bsdconfig/console/repeat
  projects/fuse/usr.sbin/bsdconfig/console/saver
  projects/fuse/usr.sbin/bsdconfig/console/screenmap
  projects/fuse/usr.sbin/bsdconfig/console/ttys
  projects/fuse/usr.sbin/bsdconfig/diskmgmt/diskmgmt
  projects/fuse/usr.sbin/bsdconfig/docsinstall/docsinstall
  projects/fuse/usr.sbin/bsdconfig/dot/dot
  projects/fuse/usr.sbin/bsdconfig/include/Makefile
  projects/fuse/usr.sbin/bsdconfig/mouse/disable
  projects/fuse/usr.sbin/bsdconfig/mouse/enable
  projects/fuse/usr.sbin/bsdconfig/mouse/flags
  projects/fuse/usr.sbin/bsdconfig/mouse/mouse
  projects/fuse/usr.sbin/bsdconfig/mouse/port
  projects/fuse/usr.sbin/bsdconfig/mouse/type
  projects/fuse/usr.sbin/bsdconfig/networking/Makefile
  projects/fuse/usr.sbin/bsdconfig/networking/defaultrouter
  projects/fuse/usr.sbin/bsdconfig/networking/devices
  projects/fuse/usr.sbin/bsdconfig/networking/hostname
  projects/fuse/usr.sbin/bsdconfig/networking/include/Makefile
  projects/fuse/usr.sbin/bsdconfig/networking/nameservers
  projects/fuse/usr.sbin/bsdconfig/networking/networking
  projects/fuse/usr.sbin/bsdconfig/password/Makefile
  projects/fuse/usr.sbin/bsdconfig/password/include/Makefile
  projects/fuse/usr.sbin/bsdconfig/password/password
  projects/fuse/usr.sbin/bsdconfig/security/kern_securelevel
  projects/fuse/usr.sbin/bsdconfig/security/security
  projects/fuse/usr.sbin/bsdconfig/startup/Makefile
  projects/fuse/usr.sbin/bsdconfig/startup/include/Makefile
  projects/fuse/usr.sbin/bsdconfig/startup/misc
  projects/fuse/usr.sbin/bsdconfig/startup/rcadd
  projects/fuse/usr.sbin/bsdconfig/startup/rcconf
  projects/fuse/usr.sbin/bsdconfig/startup/rcdelete
  projects/fuse/usr.sbin/bsdconfig/startup/rcedit
  projects/fuse/usr.sbin/bsdconfig/startup/rcvar
  projects/fuse/usr.sbin/bsdconfig/startup/startup
  projects/fuse/usr.sbin/bsdconfig/timezone/Makefile
  projects/fuse/usr.sbin/bsdconfig/timezone/include/Makefile
  projects/fuse/usr.sbin/bsdconfig/timezone/timezone
  projects/fuse/usr.sbin/bsdconfig/ttys/ttys
  projects/fuse/usr.sbin/bsdconfig/usermgmt/Makefile
  projects/fuse/usr.sbin/bsdconfig/usermgmt/groupadd
  projects/fuse/usr.sbin/bsdconfig/usermgmt/groupdel
  projects/fuse/usr.sbin/bsdconfig/usermgmt/groupedit
  projects/fuse/usr.sbin/bsdconfig/usermgmt/groupinput
  projects/fuse/usr.sbin/bsdconfig/usermgmt/include/Makefile
  projects/fuse/usr.sbin/bsdconfig/usermgmt/useradd
  projects/fuse/usr.sbin/bsdconfig/usermgmt/userdel
  projects/fuse/usr.sbin/bsdconfig/usermgmt/useredit
  projects/fuse/usr.sbin/bsdconfig/usermgmt/userinput
  projects/fuse/usr.sbin/bsdconfig/usermgmt/usermgmt
  projects/fuse/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_diskstorage_tbl.c
  projects/fuse/usr.sbin/pciconf/cap.c
  projects/fuse/usr.sbin/pciconf/err.c
  projects/fuse/usr.sbin/pkg_install/add/main.c
  projects/fuse/usr.sbin/pkg_install/create/perform.c
  projects/fuse/usr.sbin/pkg_install/info/info.h
  projects/fuse/usr.sbin/pkg_install/info/perform.c
  projects/fuse/usr.sbin/pkg_install/info/show.c
  projects/fuse/usr.sbin/pkg_install/lib/lib.h
  projects/fuse/usr.sbin/pkg_install/lib/plist.c
  projects/fuse/usr.sbin/pkg_install/version/perform.c
Directory Properties:
  projects/fuse/   (props changed)
  projects/fuse/sbin/   (props changed)
  projects/fuse/sbin/ipfw/   (props changed)
  projects/fuse/share/man/man4/   (props changed)
  projects/fuse/sys/   (props changed)
  projects/fuse/sys/boot/   (props changed)
  projects/fuse/sys/cddl/contrib/opensolaris/   (props changed)
  projects/fuse/sys/conf/   (props changed)

Modified: projects/fuse/bin/ps/keyword.c
==============================================================================

--- projects/fuse/bin/ps/keyword.c	Tue Sep 18 22:28:42 2012	(r240684)
+++ projects/fuse/bin/ps/keyword.c	Wed Sep 19 00:27:50 2012	(r240685)
@@ -79,6 +79,7 @@ static VAR var[] = {
 	{"cow", "COW", NULL, 0, kvar, KOFF(ki_cow), UINT, "u", 0},
 	{"cpu", "CPU", NULL, 0, kvar, KOFF(ki_estcpu), UINT, "d", 0},
 	{"cputime", "", "time", 0, NULL, 0, CHAR, NULL, 0},
+	{"dsiz", "DSIZ", NULL, 0, kvar, KOFF(ki_dsize), PGTOK, "ld", 0},
 	{"egid", "", "gid", 0, NULL, 0, CHAR, NULL, 0},
 	{"egroup", "", "group", 0, NULL, 0, CHAR, NULL, 0},
 	{"emul", "EMUL", NULL, LJUST, emulname, 0, CHAR, NULL, 0},
@@ -141,6 +142,7 @@ static VAR var[] = {
 		UINT, "x", 0},
 	{"sigmask", "BLOCKED", NULL, 0, kvar, KOFF(ki_sigmask), UINT, "x", 0},
 	{"sl", "SL", NULL, INF127, kvar, KOFF(ki_slptime), UINT, "d", 0},
+	{"ssiz", "SSIZ", NULL, 0, kvar, KOFF(ki_ssize), PGTOK, "ld", 0},
 	{"start", "STARTED", NULL, LJUST|USER, started, 0, CHAR, NULL, 0},
 	{"stat", "", "state", 0, NULL, 0, CHAR, NULL, 0},
 	{"state", "STAT", NULL, LJUST, state, 0, CHAR, NULL, 0},

Modified: projects/fuse/bin/ps/ps.1
==============================================================================
--- projects/fuse/bin/ps/ps.1	Tue Sep 18 22:28:42 2012	(r240684)
+++ projects/fuse/bin/ps/ps.1	Wed Sep 19 00:27:50 2012	(r240685)
@@ -29,7 +29,7 @@
 .\"     @(#)ps.1	8.3 (Berkeley) 4/18/94
 .\" $FreeBSD$
 .\"
-.Dd May 20, 2012
+.Dd September 18, 2012
 .Dt PS 1
 .Os
 .Sh NAME
@@ -500,6 +500,8 @@ command and arguments
 number of copy-on-write faults
 .It Cm cpu
 short-term CPU usage factor (for scheduling)
+.It Cm dsiz
+data size (in Kbytes)
 .It Cm emul
 system-call emulation environment
 .It Cm etime
@@ -610,6 +612,8 @@ blocked signals (alias
 .Cm blocked )
 .It Cm sl
 sleep time (in seconds; 127 = infinity)
+.It Cm ssiz
+stack size (in Kbytes)
 .It Cm start
 time started
 .It Cm state

Modified: projects/fuse/etc/mtree/BSD.include.dist
==============================================================================
--- projects/fuse/etc/mtree/BSD.include.dist	Tue Sep 18 22:28:42 2012	(r240684)
+++ projects/fuse/etc/mtree/BSD.include.dist	Wed Sep 19 00:27:50 2012	(r240685)
@@ -126,6 +126,8 @@
         ..
         nand
         ..
+        nvme
+        ..
         ofw
         ..
         pbio

Modified: projects/fuse/include/Makefile
==============================================================================
--- projects/fuse/include/Makefile	Tue Sep 18 22:28:42 2012	(r240684)
+++ projects/fuse/include/Makefile	Wed Sep 19 00:27:50 2012	(r240685)
@@ -40,8 +40,8 @@ LDIRS=	bsm cam geom net net80211 netatal
 
 LSUBDIRS=	cam/ata cam/scsi \
 	dev/acpica dev/an dev/bktr dev/ciss dev/filemon dev/firewire dev/hwpmc \
-	dev/ic dev/iicbus ${_dev_ieee488} dev/io dev/lmc dev/mfi dev/ofw \
-	dev/pbio ${_dev_powermac_nvram} dev/ppbus dev/smbus \
+	dev/ic dev/iicbus ${_dev_ieee488} dev/io dev/lmc dev/mfi dev/nvme \
+	dev/ofw dev/pbio ${_dev_powermac_nvram} dev/ppbus dev/smbus \
 	dev/speaker dev/usb dev/utopia dev/vkbd dev/wi \
 	fs/devfs fs/fdescfs fs/msdosfs fs/nandfs fs/nfs fs/ntfs fs/nullfs \
 	${_fs_nwfs} fs/portalfs fs/procfs fs/smbfs fs/udf fs/unionfs \

Modified: projects/fuse/sbin/Makefile.amd64
==============================================================================
--- projects/fuse/sbin/Makefile.amd64	Tue Sep 18 22:28:42 2012	(r240684)
+++ projects/fuse/sbin/Makefile.amd64	Wed Sep 19 00:27:50 2012	(r240685)
@@ -2,3 +2,4 @@
 
 SUBDIR += bsdlabel
 SUBDIR += fdisk
+SUBDIR += nvmecontrol

Modified: projects/fuse/sbin/Makefile.i386
==============================================================================
--- projects/fuse/sbin/Makefile.i386	Tue Sep 18 22:28:42 2012	(r240684)
+++ projects/fuse/sbin/Makefile.i386	Wed Sep 19 00:27:50 2012	(r240685)
@@ -2,4 +2,5 @@
 
 SUBDIR += bsdlabel
 SUBDIR += fdisk
+SUBDIR += nvmecontrol
 SUBDIR += sconfig

Modified: projects/fuse/sbin/ipfw/ipfw.8
==============================================================================
--- projects/fuse/sbin/ipfw/ipfw.8	Tue Sep 18 22:28:42 2012	(r240684)
+++ projects/fuse/sbin/ipfw/ipfw.8	Wed Sep 19 00:27:50 2012	(r240685)
@@ -141,7 +141,7 @@ the firewall will have a
 .Em stateful
 behaviour, i.e., upon a match it will create
 .Em dynamic rules ,
-i.e. rules that match packets with the same 5-tuple
+i.e., rules that match packets with the same 5-tuple
 (protocol, source and destination addresses and ports)
 as the packet which caused their creation.
 Dynamic rules, which have a limited lifetime, are checked
@@ -223,14 +223,15 @@ When listing and
 is specified, also show expired dynamic rules.
 .It Fl f
 Do not ask for confirmation for commands that can cause problems
-if misused,
-.No i.e. Cm flush .
+if misused, i.e.,
+.Cm flush .
 If there is no tty associated with the process, this is implied.
 .It Fl i
 When listing a table (see the
 .Sx LOOKUP TABLES
 section below for more information on lookup tables), format values
-as IP addresses. By default, values are shown as integers.
+as IP addresses.
+By default, values are shown as integers.
 .It Fl n
 Only check syntax of the command strings, without actually passing
 them to the kernel.
@@ -421,7 +422,7 @@ Keywords are case-sensitive, whereas arg
 or may not be case-sensitive depending on their nature
 (e.g.\& uid's are, hostnames are not).
 .Pp
-Some arguments (e.g. port or address lists) are comma-separated
+Some arguments (e.g., port or address lists) are comma-separated
 lists of values.
 In this case, spaces after commas ',' are allowed to make
 the line more readable.
@@ -873,7 +874,8 @@ Takes rule number saved to internal stac
 action and returns ruleset processing to the first rule
 with number greater than number of corresponding
 .Cm call
-rule. See description of the
+rule.
+See description of the
 .Cm call
 action for more details.
 .Pp
@@ -955,28 +957,36 @@ actions.
 The packet is tagged so as to use the FIB (routing table)
 .Ar fibnum
 in any subsequent forwarding decisions.
-Initially this is limited to the values 0 through 15, see
-.Xr setfib 1 .
+In the current implementation, this is limited to the values 0 through 15, see
+.Xr setfib 2 .
 Processing continues at the next rule.
 It is possible to use the
 .Cm tablearg
-keyword with a setfib. If tablearg value is not within compiled FIB range packet fib is set to 0.
+keyword with setfib.
+If the tablearg value is not within the compiled range of fibs,
+the packet's fib is set to 0.
 .It Cm reass
-Queue and reassemble ip fragments.
-If the packet is not fragmented, counters are updated and processing continues with the next rule.
+Queue and reassemble IP fragments.
+If the packet is not fragmented, counters are updated and
+processing continues with the next rule.
 If the packet is the last logical fragment, the packet is reassembled and, if
 .Va net.inet.ip.fw.one_pass
-is set to 0, processing continues with the next rule, else packet is allowed to pass and search terminates.
-If the packet is a fragment in the middle, it is consumed and processing stops immediately.
+is set to 0, processing continues with the next rule.
+Otherwise, the packet is allowed to pass and the search terminates.
+If the packet is a fragment in the middle of a logical group of fragments,
+it is consumed and
+processing stops immediately.
 .Pp
-Fragments handling can be tuned via
+Fragment handling can be tuned via
 .Va net.inet.ip.maxfragpackets
 and
 .Va net.inet.ip.maxfragsperpacket
-which limit, respectively, the maximum number of processable fragments (default: 800) and
+which limit, respectively, the maximum number of processable
+fragments (default: 800) and
 the maximum number of fragments per packet (default: 16).
 .Pp
-NOTA BENE: since fragments do not contain port numbers, they should be avoided with the
+NOTA BENE: since fragments do not contain port numbers,
+they should be avoided with the
 .Nm reass
 rule.
 Alternatively, direction-based (like
@@ -1596,7 +1606,8 @@ This is the short form of
 .It Cm sockarg
 Matches packets that are associated to a local socket and
 for which the SO_USER_COOKIE socket option has been set
-to a non-zero value. As a side effect, the value of the
+to a non-zero value.
+As a side effect, the value of the
 option is made available as
 .Cm tablearg
 value, which in turn can be used as
@@ -1746,7 +1757,7 @@ connected networks instead of all source
 .El
 .Sh LOOKUP TABLES
 Lookup tables are useful to handle large sparse sets of
-addresses or other search keys (e.g. ports, jail IDs, interface names).
+addresses or other search keys (e.g., ports, jail IDs, interface names).
 In the rest of this section we will use the term ``address''.
 There may be up to 65535 different lookup tables, numbered 0 to 65534.
 .Pp
@@ -1784,7 +1795,8 @@ the routing table (see
 .Xr route 4 ) .
 .Pp
 Lookup tables currently support only ports, jail IDs, IPv4/IPv6  addresses
-and interface names. Wildcards is not supported for interface names.
+and interface names.
+Wildcards is not supported for interface names.
 .Pp
 The
 .Cm tablearg
@@ -1813,7 +1825,8 @@ Section for example usage of tables and 
 When used with the
 .Cm skipto
 action, the user should be aware that the code will walk the ruleset
-up to a rule equal to, or past, the given number, and should therefore try keep the
+up to a rule equal to, or past, the given number,
+and should therefore try keep the
 ruleset compact between the skipto and the target rules.
 .Sh SETS OF RULES
 Each rule belongs to one of 32 different
@@ -2021,10 +2034,12 @@ As an example, using ``src-ip 0xffffff00
 for each /24 destination subnet.
 .Pp
 The FLOW_MASK, together with the SCHED_MASK, is used to split
-packets into flows. As an example, using
+packets into flows.
+As an example, using
 ``src-ip 0x000000ff''
 together with the previous SCHED_MASK makes a flow for
-each individual source address. In turn, flows for each /24
+each individual source address.
+In turn, flows for each /24
 subnet will be sent to the same scheduler instance.
 .Pp
 The above diagram holds even for the
@@ -2143,12 +2158,13 @@ A file specifying the additional overhea
 of a packet on the link.
 .Pp
 Some link types introduce extra delays in the transmission
-of a packet, e.g. because of MAC level framing, contention on
+of a packet, e.g., because of MAC level framing, contention on
 the use of the channel, MAC level retransmissions and so on.
 From our point of view, the channel is effectively unavailable
 for this extra time, which is constant or variable depending
-on the link type. Additionally, packets may be dropped after this
-time (e.g. on a wireless link after too many retransmissions).
+on the link type.
+Additionally, packets may be dropped after this
+time (e.g., on a wireless link after too many retransmissions).
 We can model the additional delay with an empirical curve
 that represents its distribution.
 .Bd -literal -offset indent
@@ -2184,7 +2200,7 @@ If not specified here, it must be presen
 explicitly as a configuration parameter for the pipe;
 .It Cm loss-level Ar L
 the probability above which packets are lost.
-(0.0 <= L <= 1.0, default 1.0 i.e. no loss);
+(0.0 <= L <= 1.0, default 1.0 i.e., no loss);
 .It Cm samples Ar N
 the number of samples used in the internal
 representation of the curve (2..1024; default 100);
@@ -2249,7 +2265,8 @@ but gives no service guarantees.
 .It Cm wf2q+
 implements the WF2Q+ algorithm, which is a Weighted Fair Queueing
 algorithm which permits flows to share bandwidth according to
-their weights. Note that weights are not priorities; even a flow
+their weights.
+Note that weights are not priorities; even a flow
 with a minuscule weight will never starve.
 WF2Q+ has O(log N) per-packet processing cost, where N is the number
 of flows, and is the default algorithm used by previous versions
@@ -2535,7 +2552,8 @@ in
 .Xr natd 8
 for more information.
 .It Cm tablearg
-Uses argument supplied in lookup table. See
+Uses argument supplied in lookup table.
+See
 .Sx LOOKUP TABLES
 section below for more information on lookup tables.
 .El
@@ -2597,11 +2615,13 @@ or
 before ipfw module gets loaded.
 .Bl -tag -width indent
 .It Va net.inet.ip.fw.default_to_accept: No 0
-Defines ipfw last rule behavior. This value overrides
+Defines ipfw last rule behavior.
+This value overrides
 .Cd "options IPFW_DEFAULT_TO_(ACCEPT|DENY)"
 from kernel configuration file.
 .It Va net.inet.ip.fw.tables_max: No 128
-Defines number of tables available in ipfw. Number cannot exceed 65534.
+Defines number of tables available in ipfw.
+Number cannot exceed 65534.
 .El
 .Sh SYSCTL VARIABLES
 A set of
@@ -2631,12 +2651,14 @@ Option 1 should never be selected as thi
 An attacker can
 establish multiple fake associations by sending AddIP messages.
 .It Va net.inet.ip.alias.sctp.chunk_proc_limit: No 5
-Defines the maximum number of chunks in an SCTP packet that will be parsed for a
+Defines the maximum number of chunks in an SCTP packet that will be
+parsed for a
 packet that matches an existing association.
 This value is enforced to be greater or equal than
 .Cm net.inet.ip.alias.sctp.initialising_chunk_proc_limit .
 A high value is
-a DoS risk yet setting too low a value may result in important control chunks in
+a DoS risk yet setting too low a value may result in
+important control chunks in
 the packet not being located and parsed.
 .It Va net.inet.ip.alias.sctp.error_on_ootb: No 1
 Defines when the
@@ -2658,7 +2680,8 @@ This value is only useful if the
 .Nm nat
 is tracking global IP addresses.
 .It Cm 3
-ErrorM is sent in response to all OOTB packets on both the local and global side
+ErrorM is sent in response to all OOTB packets on both
+the local and global side
 (DoS risk).
 .El
 .Pp
@@ -2709,12 +2732,14 @@ will only be an INIT or ASCONF-AddIP pac
 A higher value may become a DoS
 risk as malformed packets can consume processing resources.
 .It Va net.inet.ip.alias.sctp.param_proc_limit: No 25
-Defines the maximum number of parameters within a chunk that will be parsed in a
+Defines the maximum number of parameters within a chunk that will be
+parsed in a
 packet.
 As for other similar sysctl variables, larger values pose a DoS risk.
 .It Va net.inet.ip.alias.sctp.log_level: No 0
 Level of detail in the system log messages (0 \- minimal, 1 \- event,
-2 \- info, 3 \- detail, 4 \- debug, 5 \- max debug). May be a good
+2 \- info, 3 \- detail, 4 \- debug, 5 \- max debug).
+May be a good
 option in high loss environments.
 .It Va net.inet.ip.alias.sctp.shutdown_time: No 15
 Timeout value while waiting for SHUTDOWN-COMPLETE.
@@ -2733,7 +2758,8 @@ association is limited to this value
 .El
 .Pp
 This variable is fully dynamic, the new value will be adopted for all newly
-arriving associations, existing associations are treated as they were previously.
+arriving associations, existing associations are treated
+as they were previously.
 Global tracking will decrease the number of collisions within the
 .Nm nat
 at a cost
@@ -3280,7 +3306,8 @@ Some early work (1999-2000) on the
 traffic shaper supported by Akamba Corp.
 .Pp
 The ipfw core (ipfw2) has been completely redesigned and
-reimplemented by Luigi Rizzo in summer 2002. Further
+reimplemented by Luigi Rizzo in summer 2002.
+Further
 actions and
 options have been added by various developer over the years.
 .Pp

Modified: projects/fuse/share/man/man4/pf.4
==============================================================================
--- projects/fuse/share/man/man4/pf.4	Tue Sep 18 22:28:42 2012	(r240684)
+++ projects/fuse/share/man/man4/pf.4	Wed Sep 19 00:27:50 2012	(r240685)
@@ -28,7 +28,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd June 29 2012
+.Dd September 18 2012
 .Dt PF 4
 .Os
 .Sh NAME
@@ -36,6 +36,7 @@
 .Nd packet filter
 .Sh SYNOPSIS
 .Cd "device pf"
+.Cd "options PF_DEFAULT_TO_DROP"
 .Sh DESCRIPTION
 Packet filtering takes place in the kernel.
 A pseudo-device,
@@ -94,6 +95,15 @@ Read only
 .Xr sysctl 8
 variables with matching names are provided to obtain current values
 at runtime.
+.Sh KERNEL OPTIONS
+The following options in the kernel configuration file are related to
+.Nm
+operation:
+.Pp
+.Bl -tag -width ".Dv PF_DEFAULT_TO_DROP" -compact
+.It Dv PF_DEFAULT_TO_DROP
+Change default policy to drop by default
+.El
 .Sh IOCTL INTERFACE
 .Nm
 supports the following

Modified: projects/fuse/share/man/man4/usb_quirk.4
==============================================================================
--- projects/fuse/share/man/man4/usb_quirk.4	Tue Sep 18 22:28:42 2012	(r240684)
+++ projects/fuse/share/man/man4/usb_quirk.4	Wed Sep 19 00:27:50 2012	(r240685)
@@ -66,6 +66,8 @@ device should be ignored by hid class
 device should be ignored by kbd class
 .It UQ_KBD_BOOTPROTO
 device should set the boot protocol
+.It UQ_UMS_IGNORE
+device should be ignored by ums class
 .It UQ_MS_BAD_CLASS
 doesn't identify properly
 .It UQ_MS_LEADING_BYTE

Modified: projects/fuse/sys/amd64/conf/NOTES
==============================================================================
--- projects/fuse/sys/amd64/conf/NOTES	Tue Sep 18 22:28:42 2012	(r240684)
+++ projects/fuse/sys/amd64/conf/NOTES	Wed Sep 19 00:27:50 2012	(r240685)
@@ -428,6 +428,11 @@ device		isci
 options		ISCI_LOGGING	# enable debugging in isci HAL
 
 #
+# NVM Express (NVMe) support
+device         nvme    # base NVMe driver
+device         nvd     # expose NVMe namespaces as disks, depends on nvme
+
+#
 # SafeNet crypto driver: can be moved to the MI NOTES as soon as
 # it's tested on a big-endian machine
 #

Copied: projects/fuse/sys/arm/conf/AC100 (from r240684, head/sys/arm/conf/AC100)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/fuse/sys/arm/conf/AC100	Wed Sep 19 00:27:50 2012	(r240685, copy of r240684, head/sys/arm/conf/AC100)
@@ -0,0 +1,96 @@
+#
+# Custom kernel for Toshiba AC100
+#
+# $FreeBSD$
+#
+
+ident		AC100
+include		"../tegra/std.tegra2"
+
+makeoptions	MODULES_OVERRIDE=""
+
+makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
+makeoptions	WERROR="-Werror"
+
+#options 	SCHED_ULE		#ULE scheduler
+options 	SCHED_4BSD		#4BSD scheduler
+options 	INET			#InterNETworking
+#options 	INET6			#IPv6 communications protocols
+options 	FFS			#Berkeley Fast Filesystem
+#options 	NFSCL			#Network Filesystem Client
+#options 	NFSLOCKD		#Network Lock Manager
+#options 	NFS_ROOT		#NFS usable as /, requires NFSCLIENT
+#options 	BOOTP
+#options 	BOOTP_NFSROOT
+#options 	BOOTP_NFSV3
+#options 	BOOTP_WIRED_TO=mge0
+
+options 	GEOM_PART_GPT
+options 	ROOTDEVNAME=\"ufs:/dev/da0p1\"
+
+options 	SYSVSHM			#SYSV-style shared memory
+options 	SYSVMSG			#SYSV-style message queues
+options 	SYSVSEM			#SYSV-style semaphores
+options 	_KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions
+options 	MUTEX_NOINLINE
+options 	RWLOCK_NOINLINE
+options 	NO_FFS_SNAPSHOT
+options 	NO_SWAPPING
+
+#options 	SMP
+
+# Debugging
+options 	VERBOSE_SYSINIT
+#options 	ALT_BREAK_TO_DEBUGGER
+options 	DDB
+options 	GDB
+options 	DIAGNOSTIC
+options 	INVARIANTS		#Enable calls of extra sanity checking
+options 	INVARIANT_SUPPORT	#Extra sanity checks of internal structures, required by INVARIANTS
+options 	KDB
+options 	KDB_TRACE
+#options 	KTR
+#options 	KTR_VERBOSE=0
+#options 	KTR_ENTRIES=16384
+#options 	KTR_MASK=(KTR_SPARE2)
+#options 	KTR_COMPILE=KTR_ALL
+options 	WITNESS			#Enable checks to detect deadlocks and cycles
+options 	WITNESS_SKIPSPIN	#Don't run witness on spinlocks for speed
+#options 	WITNESS_KDB
+options 	MUTEX_DEBUG
+
+# Pseudo devices
+device		random
+device		pty
+device		loop
+device		md
+
+# USB
+#options 	USB_DEBUG		# enable debug msgs
+#device		usb
+#device		ehci
+#device		umass
+#device		scbus
+#device		pass
+#device		da
+
+# SATA
+#device		ata
+#device		atadisk
+#device		mvs
+
+# Serial ports
+device		uart
+
+# I2C (TWSI)
+#device		iic
+#device		iicbus
+
+#Network
+device		ether
+
+#FDT
+options 	FDT
+options 	FDT_DTB_STATIC
+makeoptions	FDT_DTS_FILE=tegra20-paz00.dts
+

Copied: projects/fuse/sys/boot/fdt/dts/tegra20-paz00.dts (from r240684, head/sys/boot/fdt/dts/tegra20-paz00.dts)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/fuse/sys/boot/fdt/dts/tegra20-paz00.dts	Wed Sep 19 00:27:50 2012	(r240685, copy of r240684, head/sys/boot/fdt/dts/tegra20-paz00.dts)
@@ -0,0 +1,58 @@
+/*-
+ * Copyright (c) 2011 The FreeBSD Foundation
+ * Copyright (c) 2012 Andrew Turner
+ * All rights reserved.
+ *
+ * Developed by Damjan Marion <damjan.marion at gmail.com>
+ *
+ * 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$
+ */
+/dts-v1/;
+
+/include/ "tegra20.dtsi"
+
+/ {
+	model = "Toshiba AC100 / Dynabook AZ";
+
+	aliases {
+		serial0 = &serial0;
+		soc = &SOC;
+	};
+
+	memory {
+		device_type = "memory";
+		reg = < 0x00000000 0x20000000 >;	/* 512MB RAM at 0x0 */
+	};
+
+	chosen {
+		stdin = "serial0";
+		stdout = "serial0";
+	};
+
+	SOC: tegra20 at 0 {
+		serial0: serial at 70006000 {
+		};
+	};
+};
+

Copied: projects/fuse/sys/boot/fdt/dts/tegra20.dtsi (from r240684, head/sys/boot/fdt/dts/tegra20.dtsi)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/fuse/sys/boot/fdt/dts/tegra20.dtsi	Wed Sep 19 00:27:50 2012	(r240685, copy of r240684, head/sys/boot/fdt/dts/tegra20.dtsi)
@@ -0,0 +1,74 @@
+/*-
+ * Copyright (c) 2011 The FreeBSD Foundation
+ * Copyright (c) 2012 Andrew Turner
+ * All rights reserved.
+ *
+ * Developed by Damjan Marion <damjan.marion at gmail.com>
+ *
+ * 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$
+ */
+
+/ {
+	compatible = "compal,paz00", "nvidia,tegra20";
+	#address-cells = <1>;
+	#size-cells = <1>;
+	interrupt-parent = <&GIC>;
+
+	SOC: tegra20 at 0 {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		compatible = "simple-bus";
+		ranges;
+		bus-frequency = <0>;
+
+		GIC: interrupt-controller at 50041000 {
+			compatible = "arm,gic";
+			reg =	< 0x50041000 0x1000 >,	/* Distributor Registers */
+				< 0x50040100 0x0100 >;	/* CPU Interface Registers */
+			interrupt-controller;
+			#interrupt-cells = <1>;
+		};
+
+		mp_tmr at 50040200 {
+			compatible = "arm,mpcore-timers";
+			clock-frequency = < 50040200 >;
+			#address-cells = <1>;
+			#size-cells = <0>;
+			reg =   < 0x50040200 0x100 >, /* Global Timer Registers */
+				< 0x50040600 0x100 >; /* Private Timer Registers */
+			interrupts = < 27 29 >;
+			interrupt-parent = <&GIC>;
+		};
+
+		serial at 70006000 {
+			compatible = "ns16550";
+			reg = <0x70006000 0x40>;
+			reg-shift = <2>;
+			interrupts = < 68 >;
+			interrupt-parent = <&GIC>;
+			clock-frequency = < 215654400 >;
+		};
+	};
+};
+

Modified: projects/fuse/sys/boot/i386/loader/main.c
==============================================================================
--- projects/fuse/sys/boot/i386/loader/main.c	Tue Sep 18 22:28:42 2012	(r240684)
+++ projects/fuse/sys/boot/i386/loader/main.c	Wed Sep 19 00:27:50 2012	(r240685)
@@ -36,6 +36,7 @@ __FBSDID("$FreeBSD$");
 #include <stddef.h>
 #include <string.h>
 #include <machine/bootinfo.h>
+#include <machine/cpufunc.h>
 #include <machine/psl.h>
 #include <sys/reboot.h>
 
@@ -321,34 +322,19 @@ command_heap(int argc, char *argv[])
     return(CMD_OK);
 }
 
-/* ISA bus access functions for PnP, derived from <machine/cpufunc.h> */
+/* ISA bus access functions for PnP. */
 static int
 isa_inb(int port)
 {
-    u_char	data;
 
-    if (__builtin_constant_p(port) &&
-	(((port) & 0xffff) < 0x100) &&
-	((port) < 0x10000)) {
-	__asm __volatile("inb %1,%0" : "=a" (data) : "id" ((u_short)(port)));
-    } else {
-	__asm __volatile("inb %%dx,%0" : "=a" (data) : "d" (port));
-    }
-    return(data);
+    return (inb(port));
 }
 
 static void
 isa_outb(int port, int value)
 {
-    u_char	al = value;
 
-    if (__builtin_constant_p(port) &&
-	(((port) & 0xffff) < 0x100) &&
-	((port) < 0x10000)) {
-	__asm __volatile("outb %0,%1" : : "a" (al), "id" ((u_short)(port)));
-    } else {
-        __asm __volatile("outb %0,%%dx" : : "a" (al), "d" (port));
-    }
+    outb(port, value);
 }
 
 #ifdef LOADER_ZFS_SUPPORT

Modified: projects/fuse/sys/boot/ofw/libofw/devicename.c
==============================================================================
--- projects/fuse/sys/boot/ofw/libofw/devicename.c	Tue Sep 18 22:28:42 2012	(r240684)
+++ projects/fuse/sys/boot/ofw/libofw/devicename.c	Wed Sep 19 00:27:50 2012	(r240685)
@@ -105,7 +105,7 @@ ofw_parsedev(struct ofw_devdesc **dev, c
     return(ENOENT);
 
 found:
-    if (path != NULL && *s != '\0')
+    if (path != NULL)
 	*path = s;
     idev = malloc(sizeof(struct ofw_devdesc));
     if (idev == NULL) {

Modified: projects/fuse/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sa.c
==============================================================================
--- projects/fuse/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sa.c	Tue Sep 18 22:28:42 2012	(r240684)
+++ projects/fuse/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sa.c	Wed Sep 19 00:27:50 2012	(r240685)
@@ -578,7 +578,7 @@ sa_find_sizes(sa_os_t *sa, sa_bulk_attr_
 	for (i = 0; i != attr_count; i++) {
 		boolean_t is_var_sz;
 
-		*total += attr_desc[i].sa_length;
+		*total += P2ROUNDUP(attr_desc[i].sa_length, 8);
 		if (done)
 			goto next;
 
@@ -713,6 +713,8 @@ sa_build_layouts(sa_handle_t *hdl, sa_bu
 		length = SA_REGISTERED_LEN(sa, attrs[i]);
 		if (length == 0)
 			length = attr_desc[i].sa_length;
+		else
+			VERIFY(length == attr_desc[i].sa_length);
 
 		if (buf_space < length) {  /* switch to spill buffer */
 			VERIFY(bonustype == DMU_OT_SA);
@@ -742,6 +744,7 @@ sa_build_layouts(sa_handle_t *hdl, sa_bu
 		if (sa->sa_attr_table[attrs[i]].sa_length == 0) {
 			sahdr->sa_lengths[len_idx++] = length;
 		}
+		VERIFY((uintptr_t)data_start % 8 == 0);
 		data_start = (void *)P2ROUNDUP(((uintptr_t)data_start +
 		    length), 8);
 		buf_space -= P2ROUNDUP(length, 8);

Modified: projects/fuse/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h
==============================================================================
--- projects/fuse/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h	Tue Sep 18 22:28:42 2012	(r240684)
+++ projects/fuse/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h	Wed Sep 19 00:27:50 2012	(r240685)
@@ -43,8 +43,10 @@ extern "C" {
  */
 
 #if defined(DEBUG) || !defined(_KERNEL)
+#if !defined(ZFS_DEBUG)
 #define	ZFS_DEBUG
 #endif
+#endif
 
 extern int zfs_flags;
 

Modified: projects/fuse/sys/conf/NOTES
==============================================================================
--- projects/fuse/sys/conf/NOTES	Tue Sep 18 22:28:42 2012	(r240684)
+++ projects/fuse/sys/conf/NOTES	Wed Sep 19 00:27:50 2012	(r240685)
@@ -918,6 +918,8 @@ device		lagg
 # packets without touching the TTL).  This can be useful to hide firewalls
 # from traceroute and similar tools.
 #
+# PF_DEFAULT_TO_DROP causes the default pf(4) rule to deny everything.
+#
 # TCPDEBUG enables code which keeps traces of the TCP state machine
 # for sockets with the SO_DEBUG option set, which can then be examined
 # using the trpt(8) utility.
@@ -937,6 +939,7 @@ options 	IPFILTER_LOG		#ipfilter logging
 options 	IPFILTER_LOOKUP		#ipfilter pools
 options 	IPFILTER_DEFAULT_BLOCK	#block all packets by default
 options 	IPSTEALTH		#support for stealth forwarding
+options 	PF_DEFAULT_TO_DROP	#drop everything by default
 options 	TCPDEBUG
 options 	RADIX_MPATH
 

Modified: projects/fuse/sys/conf/files.amd64
==============================================================================
--- projects/fuse/sys/conf/files.amd64	Tue Sep 18 22:28:42 2012	(r240684)
+++ projects/fuse/sys/conf/files.amd64	Wed Sep 19 00:27:50 2012	(r240685)
@@ -212,7 +212,17 @@ dev/kbd/kbd.c			optional	atkbd | sc | uk
 dev/lindev/full.c		optional	lindev
 dev/lindev/lindev.c		optional	lindev
 dev/nfe/if_nfe.c		optional	nfe pci
+dev/nvd/nvd.c			optional	nvd nvme
 dev/nve/if_nve.c		optional	nve pci
+dev/nvme/nvme.c			optional	nvme
+dev/nvme/nvme_ctrlr.c		optional	nvme
+dev/nvme/nvme_ctrlr_cmd.c	optional	nvme
+dev/nvme/nvme_ns.c		optional	nvme
+dev/nvme/nvme_ns_cmd.c		optional	nvme
+dev/nvme/nvme_qpair.c		optional	nvme
+dev/nvme/nvme_sysctl.c		optional	nvme
+dev/nvme/nvme_test.c		optional	nvme
+dev/nvme/nvme_uio.c		optional	nvme
 dev/nvram/nvram.c		optional	nvram isa
 dev/random/ivy.c		optional	random rdrand_rng
 dev/random/nehemiah.c		optional	random padlock_rng

Modified: projects/fuse/sys/conf/files.i386
==============================================================================
--- projects/fuse/sys/conf/files.i386	Tue Sep 18 22:28:42 2012	(r240684)
+++ projects/fuse/sys/conf/files.i386	Wed Sep 19 00:27:50 2012	(r240685)
@@ -224,7 +224,17 @@ dev/lindev/lindev.c		optional lindev
 dev/mse/mse.c			optional mse
 dev/mse/mse_isa.c		optional mse isa
 dev/nfe/if_nfe.c		optional nfe pci
+dev/nvd/nvd.c			optional nvd nvme
 dev/nve/if_nve.c		optional nve pci
+dev/nvme/nvme.c			optional nvme
+dev/nvme/nvme_ctrlr.c		optional nvme
+dev/nvme/nvme_ctrlr_cmd.c	optional nvme
+dev/nvme/nvme_ns.c		optional nvme
+dev/nvme/nvme_ns_cmd.c		optional nvme
+dev/nvme/nvme_qpair.c		optional nvme
+dev/nvme/nvme_sysctl.c		optional nvme
+dev/nvme/nvme_test.c		optional nvme
+dev/nvme/nvme_uio.c		optional nvme
 dev/nvram/nvram.c		optional nvram isa
 dev/pcf/pcf_isa.c		optional pcf
 dev/random/ivy.c		optional random rdrand_rng

Modified: projects/fuse/sys/conf/options
==============================================================================
--- projects/fuse/sys/conf/options	Tue Sep 18 22:28:42 2012	(r240684)
+++ projects/fuse/sys/conf/options	Wed Sep 19 00:27:50 2012	(r240685)
@@ -431,6 +431,7 @@ NCP
 NETATALK		opt_atalk.h
 NFSLOCKD
 PCBGROUP		opt_pcbgroup.h
+PF_DEFAULT_TO_DROP	opt_pf.h
 RADIX_MPATH		opt_mpath.h
 ROUTETABLES		opt_route.h
 SLIP_IFF_OPTS		opt_slip.h

Modified: projects/fuse/sys/contrib/altq/altq/altq_hfsc.c
==============================================================================
--- projects/fuse/sys/contrib/altq/altq/altq_hfsc.c	Tue Sep 18 22:28:42 2012	(r240684)
+++ projects/fuse/sys/contrib/altq/altq/altq_hfsc.c	Wed Sep 19 00:27:50 2012	(r240685)
@@ -400,15 +400,13 @@ hfsc_class_create(struct hfsc_if *hif, s
 	}
 #endif
 
-	cl = malloc(sizeof(struct hfsc_class), M_DEVBUF, M_WAITOK);
+	cl = malloc(sizeof(struct hfsc_class), M_DEVBUF, M_NOWAIT | M_ZERO);
 	if (cl == NULL)
 		return (NULL);
-	bzero(cl, sizeof(struct hfsc_class));
 
-	cl->cl_q = malloc(sizeof(class_queue_t), M_DEVBUF, M_WAITOK);
+	cl->cl_q = malloc(sizeof(class_queue_t), M_DEVBUF, M_NOWAIT | M_ZERO);
 	if (cl->cl_q == NULL)
 		goto err_ret;
-	bzero(cl->cl_q, sizeof(class_queue_t));
 
 	cl->cl_actc = actlist_alloc();
 	if (cl->cl_actc == NULL)
@@ -466,7 +464,7 @@ hfsc_class_create(struct hfsc_if *hif, s
 
 	if (rsc != NULL && (rsc->m1 != 0 || rsc->m2 != 0)) {
 		cl->cl_rsc = malloc(sizeof(struct internal_sc),
-		    M_DEVBUF, M_WAITOK);
+		    M_DEVBUF, M_NOWAIT);
 		if (cl->cl_rsc == NULL)
 			goto err_ret;
 		sc2isc(rsc, cl->cl_rsc);
@@ -475,7 +473,7 @@ hfsc_class_create(struct hfsc_if *hif, s
 	}
 	if (fsc != NULL && (fsc->m1 != 0 || fsc->m2 != 0)) {
 		cl->cl_fsc = malloc(sizeof(struct internal_sc),
-		    M_DEVBUF, M_WAITOK);
+		    M_DEVBUF, M_NOWAIT);
 		if (cl->cl_fsc == NULL)
 			goto err_ret;
 		sc2isc(fsc, cl->cl_fsc);
@@ -483,7 +481,7 @@ hfsc_class_create(struct hfsc_if *hif, s
 	}
 	if (usc != NULL && (usc->m1 != 0 || usc->m2 != 0)) {
 		cl->cl_usc = malloc(sizeof(struct internal_sc),
-		    M_DEVBUF, M_WAITOK);
+		    M_DEVBUF, M_NOWAIT);
 		if (cl->cl_usc == NULL)
 			goto err_ret;
 		sc2isc(usc, cl->cl_usc);

Modified: projects/fuse/sys/contrib/altq/altq/altq_priq.c
==============================================================================
--- projects/fuse/sys/contrib/altq/altq/altq_priq.c	Tue Sep 18 22:28:42 2012	(r240684)
+++ projects/fuse/sys/contrib/altq/altq/altq_priq.c	Wed Sep 19 00:27:50 2012	(r240685)
@@ -316,17 +316,15 @@ priq_class_create(struct priq_if *pif, i
 			red_destroy(cl->cl_red);
 #endif
 	} else {
-		cl = malloc(sizeof(struct priq_class),
-		       M_DEVBUF, M_WAITOK);
+		cl = malloc(sizeof(struct priq_class), M_DEVBUF,
+		    M_NOWAIT | M_ZERO);
 		if (cl == NULL)
 			return (NULL);
-		bzero(cl, sizeof(struct priq_class));
 
-		cl->cl_q = malloc(sizeof(class_queue_t),
-		       M_DEVBUF, M_WAITOK);
+		cl->cl_q = malloc(sizeof(class_queue_t), M_DEVBUF,
+		    M_NOWAIT | M_ZERO);
 		if (cl->cl_q == NULL)
 			goto err_ret;
-		bzero(cl->cl_q, sizeof(class_queue_t));
 	}
 
 	pif->pif_classes[pri] = cl;

Modified: projects/fuse/sys/contrib/altq/altq/altq_rmclass.c
==============================================================================
--- projects/fuse/sys/contrib/altq/altq/altq_rmclass.c	Tue Sep 18 22:28:42 2012	(r240684)
+++ projects/fuse/sys/contrib/altq/altq/altq_rmclass.c	Wed Sep 19 00:27:50 2012	(r240685)
@@ -218,19 +218,15 @@ rmc_newclass(int pri, struct rm_ifdat *i
 	}
 #endif
 
-	cl = malloc(sizeof(struct rm_class),
-	       M_DEVBUF, M_WAITOK);
+	cl = malloc(sizeof(struct rm_class), M_DEVBUF, M_NOWAIT | M_ZERO);
 	if (cl == NULL)
 		return (NULL);
-	bzero(cl, sizeof(struct rm_class));
 	CALLOUT_INIT(&cl->callout_);
-	cl->q_ = malloc(sizeof(class_queue_t),
-	       M_DEVBUF, M_WAITOK);
+	cl->q_ = malloc(sizeof(class_queue_t), M_DEVBUF, M_NOWAIT | M_ZERO);
 	if (cl->q_ == NULL) {
 		free(cl, M_DEVBUF);
 		return (NULL);
 	}
-	bzero(cl->q_, sizeof(class_queue_t));
 
 	/*
 	 * Class initialization.

Modified: projects/fuse/sys/dev/acpica/acpi_cpu.c
==============================================================================
--- projects/fuse/sys/dev/acpica/acpi_cpu.c	Tue Sep 18 22:28:42 2012	(r240684)
+++ projects/fuse/sys/dev/acpica/acpi_cpu.c	Wed Sep 19 00:27:50 2012	(r240685)
@@ -1063,6 +1063,8 @@ acpi_cpu_notify(ACPI_HANDLE h, UINT32 no
     ACPI_SERIAL_BEGIN(cpu);
     acpi_cpu_set_cx_lowest(sc);
     ACPI_SERIAL_END(cpu);
+
+    acpi_UserNotify("PROCESSOR", sc->cpu_handle, notify);
 }
 
 static int

Modified: projects/fuse/sys/dev/alc/if_alc.c
==============================================================================
--- projects/fuse/sys/dev/alc/if_alc.c	Tue Sep 18 22:28:42 2012	(r240684)
+++ projects/fuse/sys/dev/alc/if_alc.c	Wed Sep 19 00:27:50 2012	(r240685)
@@ -683,7 +683,7 @@ alc_aspm(struct alc_softc *sc, int media
 	if ((sc->alc_flags & (ALC_FLAG_APS | ALC_FLAG_PCIE)) ==
 	    (ALC_FLAG_APS | ALC_FLAG_PCIE))
 		linkcfg = CSR_READ_2(sc, sc->alc_expcap +
-		    PCIR_EXPRESS_LINK_CTL);
+		    PCIER_LINK_CTL);
 	else
 		linkcfg = 0;
 	pmcfg &= ~PM_CFG_SERDES_PD_EX_L1;
@@ -698,7 +698,7 @@ alc_aspm(struct alc_softc *sc, int media
 		if (sc->alc_ident->deviceid == DEVICEID_ATHEROS_AR8152_B &&
 		    sc->alc_rev == ATHEROS_AR8152_B_V10)
 			linkcfg |= 0x80;
-		CSR_WRITE_2(sc, sc->alc_expcap + PCIR_EXPRESS_LINK_CTL,
+		CSR_WRITE_2(sc, sc->alc_expcap + PCIER_LINK_CTL,
 		    linkcfg);
 		pmcfg &= ~(PM_CFG_EN_BUFS_RX_L0S | PM_CFG_SA_DLY_ENB |
 		    PM_CFG_HOTRST);
@@ -798,10 +798,10 @@ alc_attach(device_t dev)
 	if (pci_find_cap(dev, PCIY_EXPRESS, &base) == 0) {
 		sc->alc_flags |= ALC_FLAG_PCIE;
 		sc->alc_expcap = base;
-		burst = CSR_READ_2(sc, base + PCIR_EXPRESS_DEVICE_CTL);
+		burst = CSR_READ_2(sc, base + PCIER_DEVICE_CTL);
 		sc->alc_dma_rd_burst =
-		    (burst & PCIM_EXP_CTL_MAX_READ_REQUEST) >> 12;
-		sc->alc_dma_wr_burst = (burst & PCIM_EXP_CTL_MAX_PAYLOAD) >> 5;
+		    (burst & PCIEM_CTL_MAX_READ_REQUEST) >> 12;
+		sc->alc_dma_wr_burst = (burst & PCIEM_CTL_MAX_PAYLOAD) >> 5;
 		if (bootverbose) {
 			device_printf(dev, "Read request size : %u bytes.\n",
 			    alc_dma_burst[sc->alc_dma_rd_burst]);
@@ -831,9 +831,9 @@ alc_attach(device_t dev)
 			CSR_WRITE_4(sc, ALC_PCIE_PHYMISC2, val);
 		}
 		/* Disable ASPM L0S and L1. */
-		cap = CSR_READ_2(sc, base + PCIR_EXPRESS_LINK_CAP);
-		if ((cap & PCIM_LINK_CAP_ASPM) != 0) {
-			ctl = CSR_READ_2(sc, base + PCIR_EXPRESS_LINK_CTL);
+		cap = CSR_READ_2(sc, base + PCIER_LINK_CAP);
+		if ((cap & PCIEM_LINK_CAP_ASPM) != 0) {
+			ctl = CSR_READ_2(sc, base + PCIER_LINK_CTL);
 			if ((ctl & 0x08) != 0)
 				sc->alc_rcb = DMA_CFG_RCB_128;
 			if (bootverbose)

Modified: projects/fuse/sys/dev/ata/ata-lowlevel.c
==============================================================================
--- projects/fuse/sys/dev/ata/ata-lowlevel.c	Tue Sep 18 22:28:42 2012	(r240684)
+++ projects/fuse/sys/dev/ata/ata-lowlevel.c	Wed Sep 19 00:27:50 2012	(r240685)
@@ -370,7 +370,6 @@ ata_end_transaction(struct ata_request *
 			      "%s trying to write on read buffer\n",
 			   ata_cmd2str(request));
 		goto end_finished;
-		break;
 	    }
 	    ata_pio_write(request, length);
 	    request->donecount += length;

Modified: projects/fuse/sys/dev/ath/ath_hal/ah.c
==============================================================================
--- projects/fuse/sys/dev/ath/ath_hal/ah.c	Tue Sep 18 22:28:42 2012	(r240684)
+++ projects/fuse/sys/dev/ath/ath_hal/ah.c	Wed Sep 19 00:27:50 2012	(r240685)
@@ -1053,7 +1053,7 @@ ath_hal_getChanNoise(struct ath_hal *ah,
  * populated with values from NOISE_FLOOR[] + ath_hal_getNfAdjust().
  *
  * The caller must supply ctl/ext NF arrays which are at least
- * AH_MIMO_MAX_CHAINS entries long.
+ * AH_MAX_CHAINS entries long.
  */

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