Subject: iproute2 merge conflicts

From: David Ahern <[email-masked]>
Date: Fri, 16 Dec 2022 09:14:47 -0700

Hi Michal:

I merged main into next and hit a conflict with your recent patch set.
Can you take a look at devlink/devlink.c, cmd_port_fn_rate_add and
verify the conflict is correctly resolved?

Thanks,
David