Netdev Archive on lore.kernel.org
help / color / mirror / Atom feed
From: David Ahern <dsahern@gmail.com>
To: Peilin Ye <yepeilin.cs@gmail.com>, netdev@vger.kernel.org
Cc: Stephen Hemminger <stephen@networkplumber.org>,
	Jamal Hadi Salim <jhs@mojatatu.com>,
	Cong Wang <xiyou.wangcong@gmail.com>,
	Jiri Pirko <jiri@resnulli.us>,
	Cong Wang <cong.wang@bytedance.com>,
	Peilin Ye <peilin.ye@bytedance.com>
Subject: Re: [PATCH iproute2-next v2] tc/skbmod: Introduce SKBMOD_F_ECN option
Date: Wed, 4 Aug 2021 09:25:17 -0600	[thread overview]
Message-ID: <fddc1d80-4d2f-2890-4b46-159f00599943@gmail.com> (raw)
In-Reply-To: <20210802175452.7734-1-yepeilin.cs@gmail.com>

On 8/2/21 11:54 AM, Peilin Ye wrote:
> There will be a conflict next time you merge iproute2 into iproute2-next
> because of this commit:
> 
> "tc/skbmod: Remove misinformation about the swap action"
> https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/commit/?id=c06d313d86c1acb8dd72589816301853ff5a4ac4
> 
> Please just ignore its code change since it is now superseded by this v2.

thanks for the heads up about the conflict, but let's not duplicate that
removal in this patch.

I just merged main into next. Please fix up this patch and re-send. In
the future, just ask for a merge in cases like this.

  reply	other threads:[~2021-08-04 15:25 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-21 23:20 [PATCH iproute2-next] " Peilin Ye
2021-08-02 16:28 ` David Ahern
2021-08-02 17:54 ` [PATCH iproute2-next v2] " Peilin Ye
2021-08-04 15:25   ` David Ahern [this message]
2021-08-02 20:51 ` [PATCH iproute2-next] tc/ingress: Introduce clsact egress mini-Qdisc option Peilin Ye
2021-08-04 18:15 ` [PATCH iproute2-next v3] tc/skbmod: Introduce SKBMOD_F_ECN option Peilin Ye
2021-08-08 17:59   ` David Ahern
2021-08-08 18:00   ` patchwork-bot+netdevbpf

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=fddc1d80-4d2f-2890-4b46-159f00599943@gmail.com \
    --to=dsahern@gmail.com \
    --cc=cong.wang@bytedance.com \
    --cc=jhs@mojatatu.com \
    --cc=jiri@resnulli.us \
    --cc=netdev@vger.kernel.org \
    --cc=peilin.ye@bytedance.com \
    --cc=stephen@networkplumber.org \
    --cc=xiyou.wangcong@gmail.com \
    --cc=yepeilin.cs@gmail.com \
    --subject='Re: [PATCH iproute2-next v2] tc/skbmod: Introduce SKBMOD_F_ECN option' \
    /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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).