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

lib/libspl/include/tsol/label.h

@@ -0,0 +1,30 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License").  You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+/*
+ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#ifndef _SOL_TSOL_LABEL_H
+#define _SOL_TSOL_LABEL_H
+
+#endif

lib/libzfs/Makefile.am

@@ -5,6 +5,7 @@ DEFAULT_INCLUDES = \
 	-I${top_srcdir}/lib/libspl/include \
         -I${top_srcdir}/lib/libnvpair/include \
 	-I${top_srcdir}/lib/libuutil/include \
+	-I${top_srcdir}/module/zfs/include \
         -I${top_srcdir}/module/zcommon/include \
         -I${top_srcdir}/module/nvpair/include \
         -I${top_srcdir}/module/avl/include