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

zfs/lib/libspl/Makefile.in

@@ -1,5 +1,6 @@
 subdir-m += include
-DISTFILES = list.c mkdirp.c strlcpy.c strlcat.c strnlen.c u8_textprep.c
+DISTFILES  = list.c mkdirp.c strlcpy.c strlcat.c strnlen.c
+DISTFILES += u8_textprep.c getexecname.c
 
 LIBRARY := libspl
 
@@ -21,3 +22,5 @@ ${LIBRARY}-objs += list.o
 ${LIBRARY}-objs += strlcat.o
 ${LIBRARY}-objs += strnlen.o
 ${LIBRARY}-objs += u8_textprep.o
+${LIBRARY}-objs += getexecname.o
+

zfs/lib/libspl/strlcat.c

@@ -27,7 +27,6 @@
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 #include <string.h>
-#include <sys/types.h>
 
 /*
  * Appends src to the dstsize buffer at dst. The append will never

zfs/lib/libspl/strlcpy.c

@@ -27,7 +27,6 @@
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 #include <string.h>
-#include <sys/types.h>
 
 /*
  * Copies src to the dstsize buffer at dst. The copy will never

zfs/lib/libspl/strnlen.c

@@ -27,7 +27,6 @@
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 #include <string.h>
-#include <sys/types.h>
 
 /*
  * Returns the number of non-NULL bytes in string argument,