[illumos-gate merge]

commit ca783257c986cddcc674ae22916a6766b98a2d36
    5513 KM_NORMALPRI should be documented in kmem_alloc(9f) and kmem_cache_create(9f) man pages
    14465 Present KM_NOSLEEP_LAZY as documented interface
commit 36589d6bb0cdae89e166b57b0d64ae56d53247d9
    13500 Want support for overlay networks
commit 68df0c4f60a2e57680d6d1e6dba32ffa2d035538
    14513 nvmeadm list-firmware
commit 8466ab889653be2119e4a8966b6bc4e2d5ee2fb6
    14507 nvmeadm shouldn't allow writing firmware to a read-only slot 1
    14508 improve nvmeadm firmware reporting
    14509 nvmeadm commit-firmware error reporting isn't working as intended
commit 1fa2a66491e7d8ae0be84e7da4da8e812480c710
    14249 pseudo-terminal nomenclature should reflect POSIX

Conflicts:
    usr/src/cmd/cmd-inet/etc/services
    usr/src/cmd/dladm/Makefile
    usr/src/cmd/dladm/dladm.c
    usr/src/cmd/varpd/Makefile
    usr/src/cmd/varpd/varpd.c
    usr/src/cmd/zoneadmd/zcons.c
    usr/src/lib/Makefile
    usr/src/lib/libdladm/Makefile
    usr/src/lib/libdladm/common/libdladm.c
    usr/src/lib/libdladm/common/libdladm.h
    usr/src/lib/libdladm/common/libdladm_impl.h
    usr/src/lib/libdladm/common/libdloverlay.c
    usr/src/lib/libdladm/common/libdlvnic.c
    usr/src/lib/varpd/Makefile
    usr/src/lib/varpd/direct/Makefile.com
    usr/src/lib/varpd/direct/amd64/Makefile
    usr/src/lib/varpd/direct/common/libvarpd_direct.c
    usr/src/lib/varpd/direct/i386/Makefile
    usr/src/lib/varpd/files/Makefile
    usr/src/lib/varpd/files/Makefile.com
    usr/src/lib/varpd/files/amd64/Makefile
    usr/src/lib/varpd/files/common/libvarpd_files.c
    usr/src/lib/varpd/files/i386/Makefile
    usr/src/lib/varpd/libvarpd/Makefile
    usr/src/lib/varpd/libvarpd/Makefile.com
    usr/src/lib/varpd/libvarpd/amd64/Makefile
    usr/src/lib/varpd/libvarpd/common/libvarpd.c
    usr/src/lib/varpd/libvarpd/common/libvarpd_arp.c
    usr/src/lib/varpd/libvarpd/common/libvarpd_client.c
    usr/src/lib/varpd/libvarpd/common/libvarpd_impl.h
    usr/src/lib/varpd/libvarpd/common/libvarpd_overlay.c
    usr/src/lib/varpd/libvarpd/common/libvarpd_panic.c
    usr/src/lib/varpd/libvarpd/common/libvarpd_plugin.c
    usr/src/lib/varpd/libvarpd/common/libvarpd_provider.h
    usr/src/lib/varpd/libvarpd/common/libvarpd_util.c
    usr/src/lib/varpd/libvarpd/i386/Makefile
    usr/src/man/man1m/dladm.1m
    usr/src/man/man5/overlay.5
    usr/src/man/man7p/Makefile
    usr/src/man/man7p/vxlan.7p
    usr/src/uts/Makefile.uts
    usr/src/uts/common/Makefile.files
    usr/src/uts/common/io/overlay/overlay.c
    usr/src/uts/common/io/overlay/overlay_mux.c
    usr/src/uts/common/io/overlay/overlay_target.c
    usr/src/uts/common/sys/dls_mgmt.h
    usr/src/uts/common/sys/mac_provider.h
    usr/src/uts/common/sys/overlay_common.h
    usr/src/uts/common/sys/overlay_impl.h
    usr/src/uts/common/sys/overlay_plugin.h
    usr/src/uts/common/sys/overlay_target.h

1 files changed, 2 insertions, 2 deletions

diff --git a/usr/src/lib/varpd/files/common/libvarpd_files.c b/usr/src/lib/varpd/files/common/libvarpd_files.c
index 812919a07d..84cb27f9e8 100644
--- a/usr/src/lib/varpd/files/common/libvarpd_files.c
+++ b/usr/src/lib/varpd/files/common/libvarpd_files.c
@@ -17,7 +17,7 @@
  * Files based plug-in for varpd
  *
  * This is a dynamic varpd plug-in that has a static backing store. It's really
- * nothing more than a glorified version of /etc/ethers, though it facilitiates
+ * nothing more than a glorified version of /etc/ethers, though it facilitates
  * a bit more. The files module allows for the full set of mappings to be fixed
  * at creation time. In addition, it also provides support for proxying ARP,
  * NDP, and DHCP.
@@ -28,7 +28,7 @@
  * The plug-in only has a single property, which is the location of the JSON
  * file. The JSON file itself looks something like:
  *
- * 	{
+ *	{
  *		"aa:bb:cc:dd:ee:ff": {
  *			"arp": "10.23.69.1",
  *			"ndp": "2600:3c00::f03c:91ff:fe96:a264",