tcp: fix merge issues
Also removed kernel.log that's not supposed to be there.

Signed-off-by: Jean Francis Dominique S. Mabalot <jfdsmabalot@redhat.com>