[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20230316211206.1c01b585@kernel.org>
Date: Thu, 16 Mar 2023 21:12:06 -0700
From: Jakub Kicinski <kuba@...nel.org>
To: Matthieu Baerts <matthieu.baerts@...sares.net>
Cc: mptcp@...ts.linux.dev, "David S. Miller" <davem@...emloft.net>,
Eric Dumazet <edumazet@...gle.com>,
Paolo Abeni <pabeni@...hat.com>,
Kristian Overskeid <koverskeid@...il.com>,
netdev@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH net] hsr: ratelimit only when errors are printed
On Wed, 15 Mar 2023 21:25:17 +0100 Matthieu Baerts wrote:
> Recently, when automatically merging -net and net-next in MPTCP devel
> tree, our CI reported [1] a conflict in hsr, the same as the one
> reported by Stephen in netdev [2].
>
> When looking at the conflict, I noticed it is in fact the v1 [3] that
> has been applied in -net and the v2 [4] in net-next. Maybe the v1 was
> applied by accident.
Ah, thank you! I didn't even notice that the version which went into
net was v1 :S
Powered by blists - more mailing lists