[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-Id: <167902681755.31268.12287293857205816634.git-patchwork-notify@kernel.org>
Date: Fri, 17 Mar 2023 04:20:17 +0000
From: patchwork-bot+netdevbpf@...nel.org
To: Matthieu Baerts <matthieu.baerts@...sares.net>
Cc: mptcp@...ts.linux.dev, davem@...emloft.net, edumazet@...gle.com,
kuba@...nel.org, pabeni@...hat.com, koverskeid@...il.com,
netdev@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH net] hsr: ratelimit only when errors are printed
Hello:
This patch was applied to netdev/net.git (main)
by Jakub Kicinski <kuba@...nel.org>:
On Wed, 15 Mar 2023 21:25:17 +0100 you 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.
>
> [...]
Here is the summary with links:
- [net] hsr: ratelimit only when errors are printed
https://git.kernel.org/netdev/net/c/1b0120e4db0b
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
Powered by blists - more mailing lists