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

Makefile.am

@@ -11,7 +11,7 @@ SUBDIRS = $(USER_DIR) $(KERNEL_DIR)
 AUTOMAKE_OPTIONS = foreign dist-zip
 EXTRA_DIST  = autogen.sh config/config.awk
 EXTRA_DIST += zfs.spec.in zfs-modules.spec.in
-EXTRA_DIST += META DISCLAIMER COPYRIGHT GIT
+EXTRA_DIST += META DISCLAIMER COPYRIGHT GIT README.markdown
 EXTRA_DIST += OPENSOLARIS.LICENSE ZFS.RELEASE
 noinst_HEADERS = zfs_config.h
 

cmd/ztest/ztest.c

@@ -5519,7 +5519,8 @@ main(int argc, char **argv)
 	process_options(argc, argv);
 
 	/* Override location of zpool.cache */
-	(void) asprintf((char **)&spa_config_path, "%s/zpool.cache", zopt_dir);
+	VERIFY(asprintf((char **)&spa_config_path, "%s/zpool.cache",
+	    zopt_dir) != -1);
 
 	/*
 	 * Blow away any existing copy of zpool.cache

lib/libspl/include/Makefile.am

@@ -4,4 +4,6 @@ nobase_pkginclude_HEADERS += rpc/*.h
 nobase_pkginclude_HEADERS += sys/*.h
 nobase_pkginclude_HEADERS += sys/dktp/*.h
 nobase_pkginclude_HEADERS += sys/sysevent/*.h
+nobase_pkginclude_HEADERS += sys/tsol/*.h
 nobase_pkginclude_HEADERS += tsol/*.h
+nobase_pkginclude_HEADERS += util/*.h

zfs.spec.in

@@ -60,7 +60,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-, root, root)
 %doc AUTHORS ChangeLog COPYING COPYRIGHT DISCLAIMER
-%doc GIT OPENSOLARIS.LICENSE README ZFS.RELEASE
+%doc GIT OPENSOLARIS.LICENSE README.markdown ZFS.RELEASE
 %{_sbindir}/*
 %{_bindir}/*
 %{_libdir}/*