mirror of
https://github.com/torvalds/linux
synced 2026-06-13 13:52:22 +09:00
The mptcp conflict was overlapping additions. The SMC conflict was an additional and removal happening at the same time. Signed-off-by: David S. Miller <davem@davemloft.net>