From: "Wilczynski, Michal" <michal.wilczynski@intel.com>
To: David Ahern <dsahern@gmail.com>
Cc: Stephen Hemminger <stephen@networkplumber.org>,
"netdev@vger.kernel.org" <netdev@vger.kernel.org>
Subject: Re: iproute2 merge conflicts
Date: Mon, 19 Dec 2022 18:00:05 +0100 [thread overview]
Message-ID: <f72d0049-757f-af8d-5378-49cccb7f4e3e@intel.com> (raw)
In-Reply-To: <ffeb2330-9c1b-2ec6-e5a0-bfdd614b3fb1@gmail.com>
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ł
prev parent reply other threads:[~2022-12-19 17:00 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-16 16:14 iproute2 merge conflicts David Ahern
2022-12-19 17:00 ` Wilczynski, Michal [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=f72d0049-757f-af8d-5378-49cccb7f4e3e@intel.com \
--to=michal.wilczynski@intel.com \
--cc=dsahern@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=stephen@networkplumber.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox