[Pkg-zfsonlinux-devel] [SCM] zfs branch, master, updated. upstream/0.6.5.5-690-gd483760

[Petter Reinholdtsen]

The following commit has been merged in the master branch:
commit d4837601dc8e17a38e55e0c0436e07c1259f2abc
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Thu May 12 11:43:52 2016 +0200

    Added 1001-Fix-aarch64-compilation.patch to fix build problem on arm64.

diff --git a/debian/patches/1001-Fix-aarch64-compilation.patch b/debian/patches/1001-Fix-aarch64-compilation.patch
new file mode 100644
index 0000000..88bd1fa
--- /dev/null
+++ b/debian/patches/1001-Fix-aarch64-compilation.patch
@@ -0,0 +1,46 @@
+Description: Fix build problem on arm64.
+  Reorder include statements to fix build problem on arm64.
+Author: Gordan Bobic <gordan at redsleeve.org>
+Origin: ubuntu
+Forwarded: no
+Reviewed-By: Petter Reinholdtsen <pere at hungry.com>
+Last-Update: 2016-05-12
+
+From d76d9c696a79b07a4d874f20855d8828d84f03f6 Mon Sep 17 00:00:00 2001
+From: Gordan Bobic <gordan at redsleeve.org>
+Date: Tue, 15 Mar 2016 17:17:51 +0000
+Subject: [PATCH] Fix aarch64 compilation
+
+sys/param.h depends on types defined in sys/types.h
+(hrtime_t & timestruc_t).
+
+Signed-off-by: Gordan Bobic <gordan at redsleeve.org>
+Signed-off-by: Christopher J. Morrone <morrone2 at llnl.gov>
+Signed-off-by: Brian Behlendorf <behlendorf1 at llnl.gov>
+Closes #4420
+---
+ lib/libspl/include/sys/types.h | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/lib/libspl/include/sys/types.h b/lib/libspl/include/sys/types.h
+index 9816345..25d56be 100644
+--- a/lib/libspl/include/sys/types.h
++++ b/lib/libspl/include/sys/types.h
+@@ -30,7 +30,6 @@
+ #include <sys/isa_defs.h>
+ #include <sys/feature_tests.h>
+ #include_next <sys/types.h>
+-#include <sys/param.h> /* for NBBY */
+ #include <sys/types32.h>
+ #include <sys/va_list.h>
+ 
+@@ -95,4 +94,6 @@ typedef union {
+ } lloff_t;
+ #endif
+ 
++#include <sys/param.h> /* for NBBY */
++
+ #endif
+-- 
+2.7.3
+
diff --git a/debian/patches/series b/debian/patches/series
index 3a335ab..7759e22 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 1000-ppc64el-endian-support.patch
+1001-Fix-aarch64-compilation.patch

-- 
OpenZFS on Linux