-From 9cb5edffe475c25c4132aace431ffc6a97531583 Mon Sep 17 00:00:00 2001
+From 8c0a5dd331d746c5c114dda69f2eb5a4a0ac8eb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
Date: Wed, 12 Oct 2016 10:57:39 +0200
-Subject: [PATCH 1/3] remove DKMS and module build
+Subject: [PATCH] remove DKMS and module build
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
3 files changed, 1 insertion(+), 92 deletions(-)
diff --git a/debian/control.in b/debian/control.in
-index 52c1660..dc6ee96 100644
+index 6846796..786e689 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -8,40 +8,16 @@ Build-Depends: autogen,
dh-autoreconf,
- dkms (>> 2.2.0.2-1~),
libtool
- Standards-Version: 3.9.8
+ Standards-Version: 4.1.2
Homepage: http://www.zfsonlinux.org/
Vcs-Git: git://anonscm.debian.org/pkg-zfsonlinux/spl.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-zfsonlinux/spl.git
The Solaris Porting Layer (SPL) is a Linux kernel module which provides
many of the Solaris kernel APIs. This shim layer makes it possible to
diff --git a/debian/control b/debian/control
-index 52c1660..e055965 100644
+index 6846796..af4b7bb 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,6 @@ Build-Depends: autogen,
dh-autoreconf,
- dkms (>> 2.2.0.2-1~),
libtool
- Standards-Version: 3.9.8
+ Standards-Version: 4.1.2
Homepage: http://www.zfsonlinux.org/
diff --git a/debian/rules b/debian/rules
index b2fc86c..a474ca4 100755
-
- dh_builddeb -p${pmodules}
--
-2.14.1
+2.14.2
+++ /dev/null
-From b414fa1353cac23e1d58d3fbdd1c48a7925bdbdb Mon Sep 17 00:00:00 2001
-From: Fabian-Gruenbichler <f.gruenbichler@proxmox.com>
-Date: Fri, 11 Aug 2017 00:21:54 +0200
-Subject: [PATCH 2/3] splat.1 manpage: fix spelling of 'hexadecimal'
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Reviewed-by: George Melikov <mail@gmelikov.ru>
-Reviewed-by: Giuseppe Di Natale <dinatale2@llnl.gov>
-Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
-Closes #642
-(cherry picked from commit a02fa347b75266f40c8f571d7d63a21ec7f6f13d)
-Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
----
- man/man1/splat.1 | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/man/man1/splat.1 b/man/man1/splat.1
-index 37f8435..407680b 100644
---- a/man/man1/splat.1
-+++ b/man/man1/splat.1
-@@ -32,7 +32,7 @@ Print the usage message.
- .BI "\-l" "" ", \-\-list" ""
- .IP
- For each spl.ko subsystem, print all available test names and
--hexidecimal identifiers with a short description.
-+hexadecimal identifiers with a short description.
- .HP
- .BI "\-t" " subsystem" ":" "test" ", \-\-test" " subsystem" ":" "test"
- .HP
-@@ -42,9 +42,9 @@ Run the \fItest\fR diagnostic routine for the spl.ko \fIsubsystem\fR.
- Specify this option more than once to run multiple tests.
-
- The \fItest\fR and \fIsubsystem\fR parameters are the names or
--hexidecimal identifiers returned by the \fBsplat --list\fR command.
-+hexadecimal identifiers returned by the \fBsplat --list\fR command.
-
--If \fIsubsystem\fR is a name and not a hexidecimal identifier, then the
-+If \fIsubsystem\fR is a name and not a hexadecimal identifier, then the
- \fBall\fR keyword can be used to run all available \fIsubsystem\fR
- tests.
-
-@@ -73,7 +73,7 @@ Test the kernel compression and queue waiting facilities:
- # splat --test zlib:compress/uncompress --test taskq:wait
- .LP
- This is the same as the previous command, except that the subsystems
--and tests are referenced by hexidecimal identifier instead of by name:
-+and tests are referenced by hexadecimal identifier instead of by name:
- .IP
- # splat -t 0x0f00:0x0f01 -t 0x0200:0x0204
-
---
-2.14.1
-
+++ /dev/null
-From cb03b1234f9e3645fb731fdbeb5ba12f0013caa8 Mon Sep 17 00:00:00 2001
-From: Fabian-Gruenbichler <f.gruenbichler@proxmox.com>
-Date: Fri, 11 Aug 2017 00:22:31 +0200
-Subject: [PATCH 3/3] spl-module-parameters.5 manpage: fix macro
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-There is no '.sh' macro in troff/groff/man, only '.SH' for section
-headers. I assume .sp for a line break was intended here like
-in the rest of the man page.
-
-Reviewed-by: George Melikov <mail@gmelikov.ru>
-Reviewed-by: Giuseppe Di Natale <dinatale2@llnl.gov>
-Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
-Closes #643
-(cherry picked from commit 945b7f1c63e3a12d08349afb986b7dfaca370222)
-Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
----
- man/man5/spl-module-parameters.5 | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/man/man5/spl-module-parameters.5 b/man/man5/spl-module-parameters.5
-index 97241fd..e151144 100644
---- a/man/man5/spl-module-parameters.5
-+++ b/man/man5/spl-module-parameters.5
-@@ -153,7 +153,7 @@ function takes a single global lock over the entire virtual address range
- which serializes all allocations. Using slightly different allocation
- functions for small and large objects allows us to handle a wide range of
- object sizes.
--.sh
-+.sp
- The \fBspl_kmem_cache_kmem_limit\fR value is used to determine this cutoff
- size. One quarter the PAGE_SIZE is used as the default value because
- \fBspl_kmem_cache_obj_per_slab\fR defaults to 16. This means that at
---
-2.14.1
-
0001-remove-DKMS-and-module-build.patch
-0002-splat.1-manpage-fix-spelling-of-hexadecimal.patch
-0003-spl-module-parameters.5-manpage-fix-macro.patch