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>

diff --cc drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en.h
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
Simple merge

diff --cc drivers/vhost/vhost.c
Simple merge

diff --cc net/dsa/slave.c
Simple merge

diff --cc net/ipv6/ip6_tunnel.c
Simple merge

diff --cc net/packet/af_packet.c
Simple merge

diff --cc net/rxrpc/ar-internal.h
Simple merge

diff --cc net/rxrpc/conn_event.c
index 84d40ba,3fde001..6df56ce
--- 1/net/rxrpc/conn_event.c
--- 2/net/rxrpc/conn_event.c
+++ b/net/rxrpc/conn_event.c
@@@ -138,13 -136,10 +138,13 @@@ static void rxrpc_conn_retransmit_call(
        }
  
        ret = kernel_sendmsg(conn->params.local->socket, &msg, iov, ioc, len);
-       conn->params.peer->last_tx_at = ktime_get_real();
+       conn->params.peer->last_tx_at = ktime_get_seconds();
        if (ret < 0)
 -              trace_rxrpc_tx_fail(conn->debug_id, serial, ret,
 -                                  rxrpc_tx_fail_call_final_resend);
 +              trace_rxrpc_tx_fail(chan->call_debug_id, serial, ret,
 +                                  rxrpc_tx_point_call_final_resend);
 +      else
 +              trace_rxrpc_tx_packet(chan->call_debug_id, &pkt.whdr,
 +                                    rxrpc_tx_point_call_final_resend);
  
        _leave("");
  }
@@@ -250,9 -245,7 +250,9 @@@ static int rxrpc_abort_connection(struc
                return -EAGAIN;
        }
  
-       conn->params.peer->last_tx_at = ktime_get_real();
 +      trace_rxrpc_tx_packet(conn->debug_id, &whdr, rxrpc_tx_point_conn_abort);
 +
+       conn->params.peer->last_tx_at = ktime_get_seconds();
  
        _leave(" = 0");
        return 0;

diff --cc net/rxrpc/output.c
index 801dbf3,4774c8f..ccf5de1
--- 1/net/rxrpc/output.c
--- 2/net/rxrpc/output.c
+++ b/net/rxrpc/output.c
@@@ -209,13 -209,10 +209,13 @@@ int rxrpc_send_ack_packet(struct rxrpc_
        now = ktime_get_real();
        if (ping)
                call->ping_time = now;
-       conn->params.peer->last_tx_at = ktime_get_real();
+       conn->params.peer->last_tx_at = ktime_get_seconds();
        if (ret < 0)
                trace_rxrpc_tx_fail(call->debug_id, serial, ret,
 -                                  rxrpc_tx_fail_call_ack);
 +                                  rxrpc_tx_point_call_ack);
 +      else
 +              trace_rxrpc_tx_packet(call->debug_id, &pkt->whdr,
 +                                    rxrpc_tx_point_call_ack);
  
        if (call->state < RXRPC_CALL_COMPLETE) {
                if (ret < 0) {
@@@ -299,13 -296,10 +299,13 @@@ int rxrpc_send_abort_packet(struct rxrp
  
        ret = kernel_sendmsg(conn->params.local->socket,
                             &msg, iov, 1, sizeof(pkt));
-       conn->params.peer->last_tx_at = ktime_get_real();
+       conn->params.peer->last_tx_at = ktime_get_seconds();
        if (ret < 0)
                trace_rxrpc_tx_fail(call->debug_id, serial, ret,
 -                                  rxrpc_tx_fail_call_abort);
 +                                  rxrpc_tx_point_call_abort);
 +      else
 +              trace_rxrpc_tx_packet(call->debug_id, &pkt.whdr,
 +                                    rxrpc_tx_point_call_abort);
  
  
        rxrpc_put_connection(conn);
@@@ -612,11 -597,8 +612,11 @@@ void rxrpc_send_keepalive(struct rxrpc_
        ret = kernel_sendmsg(peer->local->socket, &msg, iov, 2, len);
        if (ret < 0)
                trace_rxrpc_tx_fail(peer->debug_id, 0, ret,
 -                                  rxrpc_tx_fail_version_keepalive);
 +                                  rxrpc_tx_point_version_keepalive);
 +      else
 +              trace_rxrpc_tx_packet(peer->debug_id, &whdr,
 +                                    rxrpc_tx_point_version_keepalive);
  
-       peer->last_tx_at = ktime_get_real();
+       peer->last_tx_at = ktime_get_seconds();
        _leave("");
  }

diff --cc net/rxrpc/rxkad.c
index eaf8f4f,47cb019..cea1683
--- 1/net/rxrpc/rxkad.c
--- 2/net/rxrpc/rxkad.c
+++ b/net/rxrpc/rxkad.c
@@@ -670,9 -669,7 +670,9 @@@ static int rxkad_issue_challenge(struc
                return -EAGAIN;
        }
  
-       conn->params.peer->last_tx_at = ktime_get_real();
+       conn->params.peer->last_tx_at = ktime_get_seconds();
 +      trace_rxrpc_tx_packet(conn->debug_id, &whdr,
 +                            rxrpc_tx_point_rxkad_challenge);
        _leave(" = 0");
        return 0;
  }

diff --cc net/smc/af_smc.c
Simple merge