On Tue, Apr 12, 2016 at 12:17 AM, Or Gerlitz <gerlitz.or@xxxxxxxxx> wrote: > > feature --> features Correct, will fix. > >> * Add vport to steering commands for SRIOV ACL support >> * Add mlcr, pcmr and mcia registers for dump module EEPROM >> * Add support for FCS, baeacon led and disable_link bits to >> hca caps >> * Add CQE period mode bit in CQ context for CQE based CQ >> moderation support >> * Add umr SQ bit for fragmented memory registration >> * Add needed bits and caps for Striding RQ support > > AFAIK, all the above are features will go through net-next, what made > you anticipate conflicts with linux-rdma? FCS bit is needed also for rdma, so we took the liberty of updating all the needed HW structs, bits, caps, etc .. at once for all mlx5 features planned for 4.7 regardless of rdma/net conflicts. -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html