From: David S. Miller Date: Thu, 28 Apr 2016 20:06:11 +0000 (-0400) Subject: Merge branch 'tcp-redundant-checks' X-Git-Tag: v4.7-rc1~154^2~178 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2a9e8438a29c00432ae14eaceb088b965f8ac290;p=thirdparty%2Fkernel%2Flinux.git Merge branch 'tcp-redundant-checks' Soheil Hassas Yeganeh says: ==================== tcp: simplify ack tx timestamps v2: - Fully remove SKBTX_ACK_TSTAMP, as suggested by Willem de Bruijn. This patch series aims at removing redundant checks and fields for ack timestamps for TCP. ==================== Signed-off-by: David S. Miller --- 2a9e8438a29c00432ae14eaceb088b965f8ac290