| commit | 6bb8824732f69de0f233ae6b1a8158e149627b38 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Fri Dec 29 15:14:27 2017 -0500 |
| committer | David S. Miller <davem@davemloft.net> | Fri Dec 29 15:42:26 2017 -0500 |
| tree | 78642311a28f42df9042da41eb98652c39d51327 | |
| parent | d367341b25bd5aef3bf5524baa6f73e16ceced85 [diff] | |
| parent | 2758b3e3e630ba304fc4aca434d591e70e528298 [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net net/ipv6/ip6_gre.c is a case of parallel adds. include/trace/events/tcp.h is a little bit more tricky. The removal of in-trace-macro ifdefs in 'net' paralleled with moving show_tcp_state_name and friends over to include/trace/events/sock.h in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>