MFC r253404:
   o TxD ring requires 8 bytes alignment to work so change alignment
     constraint to 8. Previously it may have triggered watchdog
     timeouts.
   o Check whether interrupt is ours or not.
   o Enable interrupts before attemping to transmit queued packets.
     This will slightly improve TX performance.
   o No need to clear IFF_DRV_OACTIVE in a loop. AE_FLAG_TXAVAIL is
     used to know whether there are enough available TxD ring space.
   o Added missing bus_dmamap_sync(9) in ae_rx_intr() and rearranged
     code to avoid unncessary register access.
   o Make sure to clear TxD, TxS, RxD rings in driver initialization.
     Otherwise some data in these rings could be interpreted as
     'updated' which in turn will advance internally maintained
     pointers and can trigger watchdog timeouts.

  PR:	kern/180382
  Approved by:	re (hrs)
MFC r253532:

Fix an XHCI regression:

The Block Event Interrupts, BEI, feature does not
work like expected with the Renesas XHCI chipsets.
Revert feature.

While at it correct the TD SIZE computation in
case of Zero Length Packet, ZLP, in the end of a
multi frame USB transfer.

PR:             usb/180726
Approved by:    re, hrs
MFC 253262, 253318, 243184, 253444, 253505, 253520:

- Add a leaf node CTL_NET.PF_ROUTE.0.AF.NET_RT_DUMP.0.FIB.  This returns
  routing table with the specified FIB number, not td->td_proc->p_fibnum.

- Add check_namevarlist() to check if ${name}_var is reserved in
  rc.subr or not.

- Fix a bug in ipv6_prefix_IF.  It did not work with the 64-bit prefix
  notation like 2001:db8:1:1.

- Use eui64 flag in ifconfig(8) instead of network6_getladdr()[*] for
  interface indentifier part.

- Fix address range specification with ifconfig(8) options such as:

  * inet 192.0.2.1-10 netmask 255.255.255.0 (inet range spec + ifconfig options)
  * inet6 2001:db8:1::1-f prefixlen 60 (inet6 range spec + ifconfig options)

  If prefixlen or netmask option is specified with CIDR notation at
  the same time, the option is used.

-  Do not set ND6_IFF_ACCEPT_RTADV on if_bridge(4) interfaces when
   ipv6_enable=yes.

Approved by:	re (marius)
Fix Denial of Service vulnerability in named(8). [13:07]

Security:	CVE-2013-4854
Security:	FreeBSD-SA-13:07.bind
Approved by:	re (rodrigc)
Update stable/9 branch to -BETA2 status.

Approved by:	re (implicit)
Approved by:	kib (mentor, implicit)
Approved by: re (hrs, marius)

MFC 253346:

    PR: 168520 170096
    Submitted by: adrian, zec

    Fix multiple kernel panics when VIMAGE is enabled in the kernel.
    These fixes are based on patches submitted by Adrian Chadd and Marko Zec.

    (1)  Set curthread->td_vnet to vnet0 in device_probe_and_attach() just before calling
     device_attach().  This fixes multiple VIMAGE related kernel panics
     when trying to attach Bluetooth or USB Ethernet devices because
     curthread->td_vnet is NULL.

    (2)  Set curthread->td_vnet in if_detach().  This fixes kernel panics when detaching networking
         interfaces, especially USB Ethernet devices.

    (3)  Use VNET_DOMAIN_SET() in ng_btsocket.c

    (4)  In ng_unref_node() set curthread->td_vnet.  This fixes kernel panics
         when detaching Netgraph nodes.
MFC r253217,253699

r253217:
Attach to the 4x10G T540-CR card.

r253699:
Expand the list of devices claimed by cxgbe(4).

Approved by:	re (kib)
MFC r253407:
Specify a timeout for the PL block.

Approved by:	re (kib)
MFC: r253707

- Set the System Identifier in the Primary Volume Descriptor to FreeBSD
  rather than NetBSD.
- Correctly set the Expiration Time in the Primary Volume Descriptor;
  according to ISO 9660 8.4.26.1 unspecified date and time are denoted
  by the digit 0 in RBP 1 to 16 but the number 0 in RBP 17. [1]
- Merge iso9660_rrip.c rev. 1.11 from NetBSD: name_len should be read
  as unsigned byte. [2]
  Note: This is according to ISO 9660 9.1.10.
- Rock Ridge TF entries should use a length of 5, because after the 4
  bytes of generic SUSP header there is one byte of flags. See typedef
  of ISO_RRIP_TF in iso9660_rrip.h. [1]

Submitted by:	Thomas Schmitt [1]
Approved by:	re (kib)
Obtained from:	NetBSD [2]
MFC: r253675

Ensure that makefs.h is included when using ufs_bswap.h so the FFS_EI macro
is picked up when defined. Previously, ffs_subr.c was always built without
support for opposite endianess as it doesn't include makefs.h on its own.

Approved by:	re (kib)
MFC: 253676

- Once we have shifted arguments thrice, base-bits-dir is $1 rather than $4.
  Introduce $BASEBITSDIR for clarity and in order to avoid repeating this
  mistake in the future. Fixing this ensures that we pick up the newly built
  boot code and loader native to the target, which is especially relevant
  when cross-building release images.
- It is pointless to specify an endianess for ISO 9660 images so strip that.

Approved by:	re (kib)
MFC r253554:
  Fix a panic in the racct code when munlock(2) is called with incorrect values.

  The racct code in sys_munlock() assumed that the boundaries provided by
  the userland were correct as long as vm_map_unwire() returned
  successfully.  However the latter contains its own logic and sometimes
  manages to do something out of those boundaries, even if they are buggy.
  This change makes the racct code to use the accounting done by the vm
  layer, as it is done in other places such as vm_mlock().

  Despite fixing the panic, Alan Cox pointed that this code is still
  race-y though: two simultaneous callers will produce incorrect values.

  Reviewed by:  alc

MFC r253556:
  Fix previous commit when option RACCT is not used.

Approved by:	re (kib)
Merge branch 'stable/9' of github.com:freebsd/freebsd into pcbsd-9-stable

Conflicts:
	sys/conf/newvers.sh
Fix a messed up rc.d/sshd which was imported from FreeNAS by mistake