Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

diff --cc MAINTAINERS
Simple merge

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

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

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

diff --cc net/8021q/vlan.c
Simple merge

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

diff --cc net/ipv4/tcp_input.c
index 94d729be42a94d6101107df1151aeba773fd61bb,b6bb3cdfad09ec9508fd5219ecbf0e13e1a480fa..c3447c5512fd8c5df70298a7b15339d00769f28b
--- 1/net/ipv4/tcp_input.c
--- 2/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@@ -2554,9 -2615,10 +2554,8 @@@ void tcp_simple_retransmit(struct sock 
        struct tcp_sock *tp = tcp_sk(sk);
        struct sk_buff *skb;
        unsigned int mss = tcp_current_mss(sk);
-       u32 prior_lost = tp->lost_out;
  
 -      tcp_for_write_queue(skb, sk) {
 -              if (skb == tcp_send_head(sk))
 -                      break;
 +      skb_rbtree_walk(skb, &sk->tcp_rtx_queue) {
                if (tcp_skb_seglen(skb) > mss &&
                    !(TCP_SKB_CB(skb)->sacked & TCPCB_SACKED_ACKED)) {
                        if (TCP_SKB_CB(skb)->sacked & TCPCB_SACKED_RETRANS) {