mirror of
https://gitee.com/bianbu-linux/linux-6.6
synced 2025-06-29 23:43:21 -04:00
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. As mentioned by Jakub Kicinski [5], the new condition makes more sense before the net_ratelimit(), not to update net_ratelimit's state which is unnecessary if we're not going to print either way. Here, this modification applies the v2 but in -net. Link: |
||
---|---|---|
.. | ||
hsr_debugfs.c | ||
hsr_device.c | ||
hsr_device.h | ||
hsr_forward.c | ||
hsr_forward.h | ||
hsr_framereg.c | ||
hsr_framereg.h | ||
hsr_main.c | ||
hsr_main.h | ||
hsr_netlink.c | ||
hsr_netlink.h | ||
hsr_slave.c | ||
hsr_slave.h | ||
Kconfig | ||
Makefile |