All conflicts seemed rather trivial, with some guidance from
Saeed Mameed on the tc_ct.c one.
Signed-off-by: NDavid S. Miller <davem@davemloft.net>