On Wed, Apr 13, 2016 at 07:11:03PM +0300, Saeed Mahameed wrote: > Fixes: b0844444590e ("net/mlx5_core: Introduce access function to read > internal timer ") > Fixes: b4ff3a36d3e4 ("net/mlx5: Use offset based reserved field names in the > IFC header file")
Are you sure those are right? b0844444590e doesn't have the reserved_at names. > u8 ets[0x1]; > u8 nic_flow_table[0x1]; > u8 eswitch_flow_table[0x1]; > - u8 early_vf_enable; > - u8 reserved_at_1a8[0x2]; > + u8 early_vf_enable[0x1]; > + u8 reserved_at_1a9[0x2]; You know, the reserved_XXX just need to have unique unchanging numbers, it doesn't matter what the numbers are - but you have to stop changing them :( That is the key to avoiding conflicts when backporting/merging/etc. I guess the big rename has already landed, but simply stopping the practice of renumbing the reserved fields would have been enough. Jason