projects / platform / kernel / linux-starfive.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d367341 2758b3e)
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)
commit6bb8824732f69de0f233ae6b1a8158e149627b38
tree78642311a28f42df9042da41eb98652c39d51327tree | snapshot
parentd367341b25bd5aef3bf5524baa6f73e16ceced85commit | diff
parent2758b3e3e630ba304fc4aca434d591e70e528298commit | diff
Merge git://git./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 diff1 | diff2 | blob | history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c diff1 | diff2 | blob | history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/freescale/fec_main.c diff1 | diff2 | blob | history
drivers/net/phy/micrel.c diff1 | diff2 | blob | history
drivers/net/phy/phylink.c diff1 | diff2 | blob | history
include/net/sock.h diff1 | diff2 | blob | history
include/net/xfrm.h diff1 | diff2 | blob | history
include/trace/events/tcp.h diff1 | diff2 | blob | history
net/core/skbuff.c diff1 | diff2 | blob | history
net/ipv6/ip6_gre.c diff1 | diff2 | blob | history
net/sched/cls_api.c diff1 | diff2 | blob | history
net/sched/sch_generic.c diff1 | diff2 | blob | history
net/sctp/socket.c diff1 | diff2 | blob | history
net/tipc/socket.c diff1 | diff2 | blob | history
net/xfrm/xfrm_input.c diff1 | diff2 | blob | history
net/xfrm/xfrm_policy.c diff1 | diff2 | blob | history
net/xfrm/xfrm_state.c diff1 | diff2 | blob | history
tools/bpf/bpftool/prog.c diff1 | diff2 | blob | history
tools/testing/selftests/bpf/Makefile diff1 | diff2 | blob | history
Domain: System / Kernel;