Merge branch 'rtnetlink_vf_ports'