Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk

configure.ac

@@ -106,7 +106,6 @@ AC_CONFIG_FILES([ Makefile
                   doc/Makefile
                   scripts/Makefile
                   lib/Makefile
-                  lib/libspl/Makefile
                   lib/libavl/Makefile
                   lib/libnvpair/Makefile
                   lib/libuutil/Makefile

lib/Makefile.am

@@ -1 +1 @@
-SUBDIRS = libspl libavl libnvpair libuutil libzcommon libzpool libzfs
+SUBDIRS = libavl libnvpair libuutil libzcommon libzpool libzfs

lib/libspl/Makefile.am

@@ -1,14 +0,0 @@
-include $(top_srcdir)/config/Rules.am
-
-DEFAULT_INCLUDES  = -I${libdir}/libspl/include
-
-lib_LTLIBRARIES = libspl.la
-
-libspl_la_SOURCES = list.c \
-                    mkdirp.c \
-                    strlcat.c \
-                    strlcpy.c \
-                    strnlen.c \
-                    u8_textprep.c \
-                    include/sys/list.h \
-                    include/sys/list_impl.h