From: Dietmar Maurer Date: Fri, 18 Dec 2015 12:12:44 +0000 (+0100) Subject: update to kernel-3.10.0-327.3.1.el7.src.rpm X-Git-Url: https://git.proxmox.com/?p=pve-kernel-3.10.0.git;a=commitdiff_plain;h=dedb7fd58606c506f9289004fe7c97d9aefa2949 update to kernel-3.10.0-327.3.1.el7.src.rpm --- diff --git a/Makefile b/Makefile index c04f8df..28dd754 100644 --- a/Makefile +++ b/Makefile @@ -1,12 +1,12 @@ RELEASE=3.4 KERNEL_VER=3.10.0 -PKGREL=39 +PKGREL=40 # also include firmware of previous versrion into # the fw package: fwlist-2.6.32-PREV-pve -KREL=14 +KREL=15 -RHKVER=229.20.1.el7 +RHKVER=327.3.1.el7 KERNELSRCRPM=kernel-${KERNEL_VER}-${RHKVER}.src.rpm @@ -185,8 +185,11 @@ ${KERNEL_SRC}/README: ${KERNEL_SRC}.org/README #cd ${KERNEL_SRC}; patch -p1 <../fix-nfs-block-count.patch #cd ${KERNEL_SRC}; patch -p1 <../fix-idr-header-for-drbd-compilation.patch cd ${KERNEL_SRC}; patch -p1 <../add-empty-ndo_poll_controller-to-veth.patch - cd ${KERNEL_SRC}; patch -p1 <../override_for_missing_acs_capabilities.patch + # cd ${KERNEL_SRC}; patch -p1 <../override_for_missing_acs_capabilities.patch cd ${KERNEL_SRC}; patch -p1 <../vhost-net-extend-device-allocation-to-vmalloc.patch + cp ${KERNEL_SRC}/drivers/vhost/scsi.c ${KERNEL_SRC}/drivers/vhost/scsi.c.backup + # vhost-scsi compile fixes + cd ${KERNEL_SRC}; patch -p1 <../vhost-scsi-fixes.patch sed -i ${KERNEL_SRC}/Makefile -e 's/^EXTRAVERSION.*$$/EXTRAVERSION=${EXTRAVERSION}/' touch $@ diff --git a/add-empty-ndo_poll_controller-to-veth.patch b/add-empty-ndo_poll_controller-to-veth.patch index f42f037..c082a44 100644 --- a/add-empty-ndo_poll_controller-to-veth.patch +++ b/add-empty-ndo_poll_controller-to-veth.patch @@ -30,9 +30,9 @@ index 177f911..5de0771 100644 { struct veth_priv *priv = netdev_priv(dev); @@ -251,6 +257,9 @@ static const struct net_device_ops veth_netdev_ops = { - .ndo_change_mtu = veth_change_mtu, .ndo_get_stats64 = veth_get_stats64, .ndo_set_mac_address = eth_mac_addr, + .ndo_get_iflink = veth_get_iflink, +#ifdef CONFIG_NET_POLL_CONTROLLER + .ndo_poll_controller = veth_poll_controller, +#endif diff --git a/changelog.Debian b/changelog.Debian index f629673..72ebb74 100644 --- a/changelog.Debian +++ b/changelog.Debian @@ -1,3 +1,15 @@ +pve-kernel-3.10.0 (3.10.0-40) unstable; urgency=low + + * update to kernel-3.10.0-327.3.1.el7.src.rpm + + * add patch vhost-scsi-fixes.patch + + * remmove override_for_missing_acs_capabilities.patch + + * bump api version to 15-pve + + -- Proxmox Support Team Fri, 18 Dec 2015 09:25:51 +0100 + pve-kernel-3.10.0 (3.10.0-39) unstable; urgency=low * update to kernel-3.10.0-229.20.1.el7.src.rpm diff --git a/config-3.10.0.diff b/config-3.10.0.diff index efb695b..210631f 100644 --- a/config-3.10.0.diff +++ b/config-3.10.0.diff @@ -112,9 +112,9 @@ CONFIG_BLK_DEV_DM_BUILTIN=y -CONFIG_BLK_DEV_DM=m +CONFIG_BLK_DEV_DM=y + # CONFIG_DM_MQ_DEFAULT is not set CONFIG_DM_DEBUG=y CONFIG_DM_BUFIO=m - CONFIG_DM_BIO_PRISON=m @@ -1863,7 +1857,7 @@ # CAIF transport drivers # diff --git a/kernel-3.10.0-229.20.1.el7.src.rpm b/kernel-3.10.0-229.20.1.el7.src.rpm deleted file mode 100644 index 6063463..0000000 Binary files a/kernel-3.10.0-229.20.1.el7.src.rpm and /dev/null differ diff --git a/kernel-3.10.0-327.3.1.el7.src.rpm b/kernel-3.10.0-327.3.1.el7.src.rpm new file mode 100644 index 0000000..4fbe66b Binary files /dev/null and b/kernel-3.10.0-327.3.1.el7.src.rpm differ diff --git a/vhost-scsi-fixes.patch b/vhost-scsi-fixes.patch new file mode 100644 index 0000000..d42a290 --- /dev/null +++ b/vhost-scsi-fixes.patch @@ -0,0 +1,62 @@ +several vhosts-scsi fixes to allow compile + +seems RH backported, some patches, but cghanges for disabled VHOST_SCSI +module are missing. + +--- linux-2.6-3.10.0/drivers/vhost/scsi.c.backup 2015-12-18 12:27:17.000000000 +0100 ++++ linux-2.6-3.10.0/drivers/vhost/scsi.c 2015-12-18 13:07:38.000000000 +0100 +@@ -54,6 +54,7 @@ + #define TCM_VHOST_VERSION "v0.1" + #define TCM_VHOST_NAMELEN 256 + #define TCM_VHOST_MAX_CDB_SIZE 32 ++#define TCM_VHOST_DEFAULT_TAGS 256 + + struct vhost_scsi_inflight { + /* Wait for the flush operation to finish */ +@@ -847,7 +848,7 @@ + tv_cmd->tvc_lun, tv_cmd->tvc_exp_data_len, + tv_cmd->tvc_task_attr, tv_cmd->tvc_data_direction, + 0, sg_ptr, tv_cmd->tvc_sgl_count, +- sg_bidi_ptr, sg_no_bidi); ++ sg_bidi_ptr, sg_no_bidi, NULL, 0); + if (rc < 0) { + transport_send_check_condition_and_sense(se_cmd, + TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE, 0); +@@ -1656,7 +1657,11 @@ + /* + * Initialize the struct se_session pointer + */ +- tv_nexus->tvn_se_sess = transport_init_session(); ++ tv_nexus->tvn_se_sess = transport_init_session_tags( ++ TCM_VHOST_DEFAULT_TAGS, ++ sizeof(struct tcm_vhost_cmd), ++ TARGET_PROT_NORMAL); ++ + if (IS_ERR(tv_nexus->tvn_se_sess)) { + mutex_unlock(&tv_tpg->tv_tpg_mutex); + kfree(tv_nexus); +@@ -2056,15 +2061,15 @@ + /* + * Setup default attribute lists for various fabric->tf_cit_tmpl + */ +- TF_CIT_TMPL(fabric)->tfc_wwn_cit.ct_attrs = tcm_vhost_wwn_attrs; +- TF_CIT_TMPL(fabric)->tfc_tpg_base_cit.ct_attrs = tcm_vhost_tpg_attrs; +- TF_CIT_TMPL(fabric)->tfc_tpg_attrib_cit.ct_attrs = NULL; +- TF_CIT_TMPL(fabric)->tfc_tpg_param_cit.ct_attrs = NULL; +- TF_CIT_TMPL(fabric)->tfc_tpg_np_base_cit.ct_attrs = NULL; +- TF_CIT_TMPL(fabric)->tfc_tpg_nacl_base_cit.ct_attrs = NULL; +- TF_CIT_TMPL(fabric)->tfc_tpg_nacl_attrib_cit.ct_attrs = NULL; +- TF_CIT_TMPL(fabric)->tfc_tpg_nacl_auth_cit.ct_attrs = NULL; +- TF_CIT_TMPL(fabric)->tfc_tpg_nacl_param_cit.ct_attrs = NULL; ++ fabric->tf_cit_tmpl.tfc_wwn_cit.ct_attrs = tcm_vhost_wwn_attrs; ++ fabric->tf_cit_tmpl.tfc_tpg_base_cit.ct_attrs = tcm_vhost_tpg_attrs; ++ fabric->tf_cit_tmpl.tfc_tpg_attrib_cit.ct_attrs = NULL; ++ fabric->tf_cit_tmpl.tfc_tpg_param_cit.ct_attrs = NULL; ++ fabric->tf_cit_tmpl.tfc_tpg_np_base_cit.ct_attrs = NULL; ++ fabric->tf_cit_tmpl.tfc_tpg_nacl_base_cit.ct_attrs = NULL; ++ fabric->tf_cit_tmpl.tfc_tpg_nacl_attrib_cit.ct_attrs = NULL; ++ fabric->tf_cit_tmpl.tfc_tpg_nacl_auth_cit.ct_attrs = NULL; ++ fabric->tf_cit_tmpl.tfc_tpg_nacl_param_cit.ct_attrs = NULL; + /* + * Register the fabric for use within TCM + */