[Pkg-zfsonlinux-devel] [SCM] zfs branch, master, updated. debian/0.6.5.6-2-7-g2d1f32d

[Aron Xu]

The following commit has been merged in the master branch:
commit c8dd56304fc4bc78f2a80e19cf5c51bb8d7590bc
Author: Aron Xu <aron at debian.org>
Date:   Tue May 31 14:13:22 2016 +0800

    Remove aarch64 patch, not needed anymore

diff --git a/debian/patches/1001-Fix-aarch64-compilation.patch b/debian/patches/1001-Fix-aarch64-compilation.patch
deleted file mode 100644
index 88bd1fa..0000000
--- a/debian/patches/1001-Fix-aarch64-compilation.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-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 fe66a3b..458e346 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 0001-Prevent-manual-builds-in-the-DKMS-source.patch
 1000-ppc64el-endian-support.patch
-1001-Fix-aarch64-compilation.patch
 1002-fix-mips-build.patch

-- 
OpenZFS on Linux