The mptcp conflict was overlapping additions.

The SMC conflict was an additional and removal happening at the same
time.
Signed-off-by: NDavid S. Miller <davem@davemloft.net>