]> git.baikalelectronics.ru Git - kernel.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Fri, 29 Dec 2017 20:14:27 +0000 (15:14 -0500)
committerDavid S. Miller <davem@davemloft.net>
Fri, 29 Dec 2017 20:42:26 +0000 (15:42 -0500)
commit7c9a9ea65aaa8b88e8d7e731ef7ec79ca6c20868
tree78642311a28f42df9042da41eb98652c39d51327
parent8492a2e5be3b375396a6808685703276aeaeb2dd
parentf13dd8b468d4b16965300393c037397ec83220bf
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>
20 files changed:
arch/x86/Kconfig
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
drivers/net/ethernet/freescale/fec_main.c
drivers/net/phy/micrel.c
drivers/net/phy/phylink.c
include/net/sock.h
include/net/xfrm.h
include/trace/events/tcp.h
net/core/skbuff.c
net/ipv6/ip6_gre.c
net/sched/cls_api.c
net/sched/sch_generic.c
net/sctp/socket.c
net/tipc/socket.c
net/xfrm/xfrm_input.c
net/xfrm/xfrm_policy.c
net/xfrm/xfrm_state.c
tools/bpf/bpftool/prog.c
tools/testing/selftests/bpf/Makefile