We talked here, and the three MLNX mlx5 maintainers prefer things to be such they submit a patch to both trees (rdma and net-next) that contains the changes they plan to the FW IFC file for that -next release. They agreed that only fields that will be actually in use by the driver will be exposed in the IFC. So... let it be and good luck to us, maybe with even zero -next conflicts on mlx5 between to two subsystems, happy upstreaming.
Or.
