use correct kernel version 4.2.1

[pve-kernel-jessie.git] / Makefile

diff --git a/Makefile b/Makefile
index d4e2f89a77b5a7f935694126ee8da3b41ec422a9..9983c244ebe620a6d064cf076e010a82b04a7f6f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 RELEASE=4.0
 
-KERNEL_VER=4.2.0
-PKGREL=12
+KERNEL_VER=4.2.1
+PKGREL=14
 # also include firmware of previous version into
 # the fw package:  fwlist-2.6.32-PREV-pve
 KREL=1
@@ -205,9 +205,6 @@ ${KERNEL_SRC}/README ${KERNEL_CFG_ORG}: ${KERNELSRCTAR}
        cat ${KERNEL_SRC}/debian.master/config/config.common.ubuntu ${KERNEL_SRC}/debian.master/config/amd64/config.common.amd64 ${KERNEL_SRC}/debian.master/config/amd64/config.flavour.generic > ${KERNEL_CFG_ORG}
        cd ${KERNEL_SRC}; patch -p1 <../add-thp-never-option.patch
        cd ${KERNEL_SRC}; patch -p1 <../fix-rtnl_bridge_getlink.patch
-       # see https://github.com/zfsonlinux/zfs/issues/3511
-       # should be fixed with zfs 0.6.5
-       cd ${KERNEL_SRC}; patch -p1 <../0001-Revert-block-loop-switch-to-VFS-ITER_BVEC.patch
        cd ${KERNEL_SRC}; patch -p1 <../bridge-patch.diff
        #cd ${KERNEL_SRC}; patch -p1 <../bridge-forward-ipv6-neighbor-solicitation.patch
        #cd ${KERNEL_SRC}; patch -p1 <../add-empty-ndo_poll_controller-to-veth.patch