[illumos-gate merge]

commit b325f34d6fd056178a119182f410f157d35a9ea6
    12781 /etc/ppt_aliases needs to be in the boot archive
commit 282a8ecb1f4aca0718d89ef1299b5928e5405bca
    12736 Add DISCARD/TRIM support to bhyve
commit aee33e58f237f0d3cfeab24295f491937f0f7c79
    12766 clean up bhyve lints
commit 00509c829a7bda32eeabfd272e5e6307ed93079e
    12784 Fix errors in plockstat man page
commit c376fe93141769de29a07813de2dfb2c8c4b8481
    12745 man page typos
commit 84659b24a533984de271059abf9a1092835d15a9
    12735 bhyve upstream sync 2019 Sept
commit cf3ec608f736765ec9852eed5e611848a25de9a4
    12768 12392 regressed ftello64 behavior
commit 165c5c6fe7d6c7a95878c8a3aae7da65d1da1d90
    12774 Resilver restarts unnecessarily when it encounters errors
commit 9c3024a3457d2d1269be18124a1ac69e33000da7
    12682 want mdb-bhyve module
commit 88d6421c15f1c4daea9c8128e715662091258054
    12779 mdb str_flags is missing STRXPG4TTY
commit 3579e3c35b601b3f66174315be3026281487541a
    12776 libbe: missing typedef in libbe.h
commit eb9a1df2aeb866bf1de4494433b6d7e5fa07b3ae
    12680 want PCI pass-thru in bhyve

	Conflicts:
	exception_lists/packaging
	usr/src/cmd/bhyve/bhyverun.c
	usr/src/cmd/mdb/i86pc/modules/unix/unix.c
	usr/src/cmd/pptadm/Makefile
	usr/src/lib/libppt/Makefile
	usr/src/lib/libppt/Makefile.com
	usr/src/lib/libvmm/Makefile
	usr/src/lib/libvmm/Makefile.com
	usr/src/uts/i86pc/Makefile.i86pc
	usr/src/uts/i86pc/io/vmm/vm/vm_page.h
	usr/src/uts/i86pc/ppt/Makefile
	usr/src/uts/i86pc/vmm/Makefile
	usr/src/uts/intel/ia32/ml/modstubs.s

8 files changed, 6 insertions, 25 deletions

diff --git a/usr/src/lib/libbe/common/libbe.h b/usr/src/lib/libbe/common/libbe.h
index 83dffd2dcd..b670d86ce5 100644
--- a/usr/src/lib/libbe/common/libbe.h
+++ b/usr/src/lib/libbe/common/libbe.h
@@ -81,7 +81,7 @@ extern "C" {
  *       in sync please make sure to add any new error messages at the end
  *       of this enumeration.
  */
-enum {
+typedef enum {
 	BE_SUCCESS = 0,
 	BE_ERR_ACCESS = 4000,	/* permission denied */
 	BE_ERR_ACTIVATE_CURR,	/* Activation of current BE failed */
diff --git a/usr/src/lib/libc/port/stdio/ftell.c b/usr/src/lib/libc/port/stdio/ftell.c
index dae2abea03..31aabec082 100644
--- a/usr/src/lib/libc/port/stdio/ftell.c
+++ b/usr/src/lib/libc/port/stdio/ftell.c
@@ -91,7 +91,7 @@ ftell_common(FILE *iop)
 		tres += adjust;
 
 	FUNLOCKFILE(lk);
-	return ((long)tres);
+	return (tres);
 }
 
 long
diff --git a/usr/src/lib/libppt/Makefile.com b/usr/src/lib/libppt/Makefile.com
index 7b2ff4885f..3d5e96f436 100644
--- a/usr/src/lib/libppt/Makefile.com
+++ b/usr/src/lib/libppt/Makefile.com
@@ -22,25 +22,16 @@ include $(SRC)/lib/Makefile.lib
 
 SRCDIR = ../common
 
-LIBS = $(DYNLIB) $(LINTLIB)
+LIBS = $(DYNLIB)
 SRCS =	$(SRCDIR)/libppt.c
 
 CSTD=	$(CSTD_GNU99)
 C99LMODE=	-Xc99=%all
 
-#
-# lint doesn't like %4s in sscanf().
-#
-LINTFLAGS += -erroff=E_BAD_FORMAT_ARG_TYPE2
-LINTFLAGS64 += -erroff=E_BAD_FORMAT_ARG_TYPE2
-
-$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC)
 LDLIBS += -lpcidb -ldevinfo -lcmdutils -lnvpair -lc
 
 .KEEP_STATE:
 
 all: $(LIBS)
 
-lint: lintcheck
-
 include $(SRC)/lib/Makefile.targ
diff --git a/usr/src/lib/libvmm/Makefile b/usr/src/lib/libvmm/Makefile
index 66bd60eb46..0aae533bb0 100644
--- a/usr/src/lib/libvmm/Makefile
+++ b/usr/src/lib/libvmm/Makefile
@@ -26,11 +26,10 @@ all:=		TARGET= all
 install:=	TARGET= install
 clean:=		TARGET= clean
 clobber:=	TARGET= clobber
-lint:=		TARGET= lint
 
 .KEEP_STATE:
 
-all install clean clobber lint: $(SUBDIRS)
+all install clean clobber: $(SUBDIRS)
 
 install_h:	$(ROOTHDRS)
 check:		$(CHECKHDRS)
diff --git a/usr/src/lib/libvmm/Makefile.com b/usr/src/lib/libvmm/Makefile.com
index d85abae8ce..bef555aed3 100644
--- a/usr/src/lib/libvmm/Makefile.com
+++ b/usr/src/lib/libvmm/Makefile.com
@@ -37,8 +37,6 @@ LDLIBS +=	-lc -lvmmapi
 
 all: $(LIBS)
 
-lint: lintcheck
-
 pics/%.o: $(SRC)/common/list/%.c
 	$(COMPILE.c) -o $@ $<
 	$(POST_PROCESS_O)
diff --git a/usr/src/lib/libvmmapi/Makefile b/usr/src/lib/libvmmapi/Makefile
index 233fcd5edb..d002a65297 100644
--- a/usr/src/lib/libvmmapi/Makefile
+++ b/usr/src/lib/libvmmapi/Makefile
@@ -27,12 +27,11 @@ all:=		TARGET= all
 install:=	TARGET= install
 clean:=	TARGET= clean
 clobber:=	TARGET= clobber
-lint:=		TARGET= lint
 _msg:=		TARGET= _msg
 
 .KEEP_STATE:
 
-all install clean clobber lint: $(SUBDIRS)
+all install clean clobber: $(SUBDIRS)
 
 # install rule for install_h target
 
diff --git a/usr/src/lib/libvmmapi/Makefile.com b/usr/src/lib/libvmmapi/Makefile.com
index 34240f4331..1653e8619c 100644
--- a/usr/src/lib/libvmmapi/Makefile.com
+++ b/usr/src/lib/libvmmapi/Makefile.com
@@ -27,7 +27,7 @@ include ../../Makefile.rootfs
 
 SRCDIR		= ../common
 
-LIBS		= $(DYNLIB) $(LINTLIB)
+LIBS		= $(DYNLIB)
 
 CPPFLAGS	= -I$(COMPAT)/freebsd -I$(CONTRIB)/freebsd \
 	$(CPPFLAGS.master) -I$(SRC)/uts/i86pc
@@ -35,16 +35,12 @@ CPPFLAGS	= -I$(COMPAT)/freebsd -I$(CONTRIB)/freebsd \
 # not linted
 SMATCH=off
 
-$(LINTLIB) :=	SRCS = $(SRCDIR)/$(LINTSRC)
-
 LDLIBS		+= -lc
 
 .KEEP_STATE:
 
 all: $(LIBS)
 
-lint: lintcheck
-
 pics/%.o: $(CONTRIB)/freebsd/lib/libutil/%.c
 	$(COMPILE.c) -o $@ $<
 	$(POST_PROCESS_O)
diff --git a/usr/src/lib/libvmmapi/common/llib-lvmmapi b/usr/src/lib/libvmmapi/common/llib-lvmmapi
deleted file mode 100644
index 221ed3a23e..0000000000
--- a/usr/src/lib/libvmmapi/common/llib-lvmmapi
+++ /dev/null
@@ -1,2 +0,0 @@
-/* LINTLIBRARY */
-/* PROTOLIB1 */