projects / platform / kernel / linux-starfive.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: cf7d97e 5211da9)
Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Tue, 18 Sep 2018 16:33:27 +0000 (09:33 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 18 Sep 2018 16:33:27 +0000 (09:33 -0700)
commite366fa435032db1ce1538a2c029714666985dd48
treed08bab02ba212339e4cfc0f2e3666435dd795b90tree | snapshot
parentcf7d97e1e54d71679a8b11716dad9d21deb0e1e2commit | diff
parent5211da9ca526a5adddee1ccd078e6e33a583ab36commit | diff
Merge ra./pub/scm/linux/kernel/git/davem/net

Two new tls tests added in parallel in both net and net-next.

Used Stephen Rothwell's linux-next resolution.

Signed-off-by: David S. Miller <davem@davemloft.net>
15 files changed:
MAINTAINERS diff1 | diff2 | blob | history
drivers/net/ethernet/cadence/macb_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/microchip/lan743x_main.c diff1 | diff2 | blob | history
drivers/net/veth.c diff1 | diff2 | blob | history
include/net/tls.h diff1 | diff2 | blob | history
kernel/bpf/verifier.c diff1 | diff2 | blob | history
net/core/filter.c diff1 | diff2 | blob | history
net/core/rtnetlink.c diff1 | diff2 | blob | history
net/ipv6/ip6_output.c diff1 | diff2 | blob | history
net/ipv6/route.c diff1 | diff2 | blob | history
net/sched/act_sample.c diff1 | diff2 | blob | history
net/tls/tls_sw.c diff1 | diff2 | blob | history
tools/include/uapi/linux/if_link.h diff1 | diff2 | blob | history
tools/testing/selftests/net/Makefile diff1 | diff2 | blob | history
tools/testing/selftests/net/tls.c diff1 | diff2 | blob | history
Domain: System / Kernel;