public inbox for netdev@vger.kernel.org 
 help / color / mirror / Atom feed

From: David Ahern <dsahern@gmail•com>
To: Michal Wilczynski <michal.wilczynski@intel•com>
Cc: Stephen Hemminger <stephen@networkplumber•org>,
	"netdev@vger•kernel.org" <netdev@vger•kernel.org>
Subject: iproute2 merge conflicts
Date: Fri, 16 Dec 2022 09:14:47 -0700	[thread overview]
Message-ID: <ffeb2330-9c1b-2ec6-e5a0-bfdd614b3fb1@gmail.com> (raw)

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

next             reply	other threads:[~2022-12-16 16:15 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-12-16 16:14 David Ahern [this message]
2022-12-19 17:00 ` iproute2 merge conflicts Wilczynski, Michal

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=ffeb2330-9c1b-2ec6-e5a0-bfdd614b3fb1@gmail.com \
    --to=dsahern@gmail$(echo .)com \
    --cc=michal.wilczynski@intel$(echo .)com \
    --cc=netdev@vger$(echo .)kernel.org \
    --cc=stephen@networkplumber$(echo .)org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox