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

zfs/lib/libspl/include/sys/zfs_context.h

@@ -71,6 +71,7 @@ extern "C" {
 #include <sys/sdt.h>
 #include <sys/kstat.h>
 #include <sys/u8_textprep.h>
+#include <sys/va_list.h>
 #include <sys/sysevent/eventdefs.h>
 
 /*

zfs/lib/libspl/kernel.c

@@ -55,7 +55,7 @@ struct utsname utsname = {
  */
 /*ARGSUSED*/
 kthread_t *
-zk_thread_create(void (*func)(), void *arg)
+zk_thread_create(void (*func)(void), void *arg)
 {
 	pthread_t tid;