revert buggy NVME setup commit

[pve-kernel-jessie.git] / Makefile

diff --git a/Makefile b/Makefile
index 0f41f5af4a5b448385e0cd5a3c220aa1416282cc..bbf92e3e78b0614c10ead5c36834048aaf989a2e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,11 @@
-RELEASE=4.3
+RELEASE=4.4
 
 # also update proxmox-ve/changelog if you change KERNEL_VER or KREL
-KERNEL_VER=4.4.21
-PKGREL=69
+KERNEL_VER=4.4.35
+PKGREL=78
 # also include firmware of previous version into
 # the fw package:  fwlist-2.6.32-PREV-pve
-KREL=1
+KREL=2
 
 KERNEL_SRC=ubuntu-xenial
 KERNELSRCTAR=${KERNEL_SRC}.tgz
@@ -72,7 +72,7 @@ ZFS_MODULES=zfs.ko zavl.ko znvpair.ko zunicode.ko zcommon.ko zpios.ko
 SPL_MODULES=spl.ko splat.ko
 
 # DRBD9
-DRBDVER=9.0.4-1
+DRBDVER=9.0.5-1
 DRBDDIR=drbd-${DRBDVER}
 DRBDSRC=${DRBDDIR}.tar.gz
 DRBD_MODULES=drbd.ko drbd_transport_tcp.ko
@@ -127,7 +127,7 @@ ${VIRTUAL_HDR_DEB} pve-headers: proxmox-ve/pve-headers.control
 download:
        rm -rf ${KERNEL_SRC} ${KERNELSRCTAR}
        #git clone git://kernel.ubuntu.com/ubuntu/ubuntu-vivid.git
-       git clone --single-branch -b Ubuntu-4.4.0-43.63 git://kernel.ubuntu.com/ubuntu/ubuntu-xenial.git ${KERNEL_SRC}
+       git clone --single-branch -b Ubuntu-4.4.0-58.79 git://kernel.ubuntu.com/ubuntu/ubuntu-xenial.git ${KERNEL_SRC}
        tar czf ${KERNELSRCTAR} --exclude .git ${KERNEL_SRC} 
 
 check_gcc: 
@@ -209,9 +209,8 @@ data: .compile_mark igb.ko ixgbe.ko e1000e.ko ${SPL_MODULES} ${ZFS_MODULES} ${DR
 PVE_CONFIG_OPTS= \
 -m INTEL_MEI_WDT \
 -d CONFIG_SND_PCM_OSS \
--d CONFIG_TRANSPARENT_HUGEPAGE_MADVISE \
+-e CONFIG_TRANSPARENT_HUGEPAGE_MADVISE \
 -d CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS \
--e CONFIG_TRANSPARENT_HUGEPAGE_NEVER \
 -m CONFIG_CEPH_FS \
 -m CONFIG_BLK_DEV_NBD \
 -m CONFIG_BLK_DEV_RBD \
@@ -251,7 +250,6 @@ ${KERNEL_SRC}/README ${KERNEL_CFG_ORG}: ${KERNELSRCTAR}
        rm -rf ${KERNEL_SRC}
        tar xf ${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 <../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
@@ -265,10 +263,12 @@ ${KERNEL_SRC}/README ${KERNEL_CFG_ORG}: ${KERNELSRCTAR}
        cd ${KERNEL_SRC}; patch -p1 < ../watchdog_implement-mei-iamt-driver.patch
        cd ${KERNEL_SRC}; patch -p1 < ../mei_drop-watchdog-code.patch
        cd ${KERNEL_SRC}; patch -p1 < ../mei_bus-whitelist-watchdog-client.patch
-       #sd: Fix rw_max for devices that report an optimal xfer size
-       cd ${KERNEL_SRC}; patch -p1 < ../sd-fix-rw_max.patch
        # IPoIB performance regression fix
        cd ${KERNEL_SRC}; patch -p1 < ../IB-ipoib-move-back-the-IB-LL-address-into-the-hard-header.patch
+       cd ${KERNEL_SRC}; patch -p1 < ../cgroup-cpuset-add-cpuset.remap_cpus.patch
+       cd ${KERNEL_SRC}; patch -p1 < ../0001-Revert-mm-throttle-on-IO-only-when-there-are-too-man.patch
+       cd ${KERNEL_SRC}; patch -p1 < ../0002-Revert-mm-oom-rework-oom-detection.patch
+       cd ${KERNEL_SRC}; patch -p1 < ../nvme-revert-NVMe-only-setup-MSIX-once.patch 
        sed -i ${KERNEL_SRC}/Makefile -e 's/^EXTRAVERSION.*$$/EXTRAVERSION=${EXTRAVERSION}/'
        touch $@
 
@@ -351,6 +351,7 @@ ${SPL_MODULES}: .compile_mark ${SPLSRC}
 ${ZFS_MODULES}: .compile_mark ${ZFSSRC}
        rm -rf ${ZFSDIR}
        tar xf ${ZFSSRC}
+       cd ${ZFSDIR}; patch -p1 < ../zfs-fix-zpool-import-bug-with-nested-pools.patch
        cd ${ZFSDIR}; ./autogen.sh
        cd ${ZFSDIR}; ./configure --with-spl=${TOP}/${SPLDIR} --with-spl-obj=${TOP}/${SPLDIR} --with-config=kernel --with-linux=${TOP}/${KERNEL_SRC} --with-linux-obj=${TOP}/${KERNEL_SRC}
        cd ${ZFSDIR}; make