Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch

lib/libspl/include/sys/types.h

@@ -32,6 +32,7 @@
 #include_next <sys/types.h>
 #include <sys/param.h> /* for NBBY */
 #include <sys/types32.h>
+#include <sys/va_list.h>
 
 #ifndef HAVE_INTTYPES
 #include <inttypes.h>

lib/libzfs/include/libzfs.h

@@ -535,15 +535,6 @@ extern int zfs_iscsi_perm_check(libzfs_handle_t *, char *, ucred_t *);
 extern int zfs_deleg_share_nfs(libzfs_handle_t *, char *, char *,
     void *, void *, int, zfs_share_op_t);
 
-/*
- * When dealing with nvlists, verify() is extremely useful
- */
-#ifdef NDEBUG
-#define	verify(EX)	((void)(EX))
-#else
-#define	verify(EX)	assert(EX)
-#endif
-
 /*
  * Utility function to convert a number to a human-readable form.
  */