lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Wed, 4 Aug 2021 09:25:17 -0600 From: David Ahern <dsahern@...il.com> To: Peilin Ye <yepeilin.cs@...il.com>, netdev@...r.kernel.org Cc: Stephen Hemminger <stephen@...workplumber.org>, Jamal Hadi Salim <jhs@...atatu.com>, Cong Wang <xiyou.wangcong@...il.com>, Jiri Pirko <jiri@...nulli.us>, Cong Wang <cong.wang@...edance.com>, Peilin Ye <peilin.ye@...edance.com> Subject: Re: [PATCH iproute2-next v2] tc/skbmod: Introduce SKBMOD_F_ECN option 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.
Powered by blists - more mailing lists