]> git.baikalelectronics.ru Git - kernel.git/commit
Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Thu, 9 Aug 2018 18:52:36 +0000 (11:52 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 9 Aug 2018 18:52:36 +0000 (11:52 -0700)
commit9c743afd55ab1a084d28edb4ba703b2d772705ae
tree620e6d20cfce3806399fbefa8d911cc848463f9b
parentbfc2eb128032ce58b05665002b72d2c45cd0b120
parentd3eafd20e6facbf6057efbbb497838ca7f7c9c4d
Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net

Overlapping changes in RXRPC, changing to ktime_get_seconds() whilst
adding some tracepoints.

Signed-off-by: David S. Miller <davem@davemloft.net>
12 files changed:
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c
drivers/net/ethernet/mellanox/mlx5/core/en.h
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
drivers/vhost/vhost.c
net/dsa/slave.c
net/ipv6/ip6_tunnel.c
net/packet/af_packet.c
net/rxrpc/ar-internal.h
net/rxrpc/conn_event.c
net/rxrpc/output.c
net/rxrpc/rxkad.c
net/smc/af_smc.c