* iproute2 merge conflicts
@ 2022-12-16 16:14 David Ahern
2022-12-19 17:00 ` Wilczynski, Michal
0 siblings, 1 reply; 2+ messages in thread
From: David Ahern @ 2022-12-16 16:14 UTC (permalink / raw)
To: Michal Wilczynski; +Cc: Stephen Hemminger, netdev@vger•kernel.org
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
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: iproute2 merge conflicts
2022-12-16 16:14 iproute2 merge conflicts David Ahern
@ 2022-12-19 17:00 ` Wilczynski, Michal
0 siblings, 0 replies; 2+ messages in thread
From: Wilczynski, Michal @ 2022-12-19 17:00 UTC (permalink / raw)
To: David Ahern; +Cc: Stephen Hemminger, netdev@vger•kernel.org
On 12/16/2022 5:14 PM, David Ahern wrote:
> 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
Hi,
I've checked the file and everything looks good. The problem was that for
net-next tree I added two additional flags in a function call. And also submitted
a bugfix to net that added one more flag in the same function call.
BR,
Michał
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-12-19 17:00 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-12-16 16:14 iproute2 merge conflicts David Ahern
2022-12-19 17:00 ` Wilczynski, Michal
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox