drop unneeded/non-upstream pull requests

- #1099: iSCSI support for ZoL
- #1476: Change sharesmb to use REGISTRY shares for better
  control by user/admin
- #2790: Rewrite of nfs.c to keep options per host separated.
- #3238: Allow "zfs unshare <proto> -a" much like "zfs share
  <proto> -a" (WIP)

diff --git a/zfs-patches/series b/zfs-patches/series
index debb41da16b6b0d994f299f116210ee447762933..ca5027052811b056a40ec715a1cbcf11928b37c2 100644 (file)
--- a/zfs-patches/series
+++ b/zfs-patches/series
@@ -1 +1,2 @@
 fix-control.patch
+skip-unneeded-pull-requests.patch

diff --git a/zfs-patches/skip-unneeded-pull-requests.patch b/zfs-patches/skip-unneeded-pull-requests.patch
new file mode 100644 (file)
index 0000000..62f5640
--- /dev/null
+++ b/zfs-patches/skip-unneeded-pull-requests.patch
@@ -0,0 +1,21 @@
+diff --git a/debian/patches/series b/debian/patches/series
+index ffafe6c..9823273 100644
+--- a/debian/patches/series
++++ b/debian/patches/series
+@@ -1,12 +1,12 @@
+ 0002-Prevent-manual-builds-in-the-DKMS-source.patch
+ 0005-Remove-userland-dist-rules.patch
+ libzfs-dependencies
+-PR1099.patch
+-PR1476.patch
++#PR1099.patch
++#PR1476.patch
+ PR1867.patch
+ PR2668.patch
+-PR2790.patch
+-PR3238.patch
++#PR2790.patch
++#PR3238.patch
+ PR3465.patch
+ PR3559.patch
+ PR3560.patch