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

Conflicts were easy to resolve using immediate context mostly,
except the cls_u32.c one where I simply too the entire HEAD
chunk.

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/bluetooth/hci_qca.c
Simple merge

diff --cc drivers/net/ethernet/amazon/ena/ena_eth_com.c
index 6f8e15b,2b3ff0c..f6c2d38
--- 1/drivers/net/ethernet/amazon/ena/ena_eth_com.c
--- 2/drivers/net/ethernet/amazon/ena/ena_eth_com.c
+++ b/drivers/net/ethernet/amazon/ena/ena_eth_com.c
@@@ -349,14 -245,11 +349,14 @@@ static inline void ena_com_rx_set_flags
                (cdesc->status & ENA_ETH_IO_RX_CDESC_BASE_L4_PROTO_IDX_MASK) >>
                ENA_ETH_IO_RX_CDESC_BASE_L4_PROTO_IDX_SHIFT;
        ena_rx_ctx->l3_csum_err =
-               (cdesc->status & ENA_ETH_IO_RX_CDESC_BASE_L3_CSUM_ERR_MASK) >>
-               ENA_ETH_IO_RX_CDESC_BASE_L3_CSUM_ERR_SHIFT;
+               !!((cdesc->status & ENA_ETH_IO_RX_CDESC_BASE_L3_CSUM_ERR_MASK) >>
+               ENA_ETH_IO_RX_CDESC_BASE_L3_CSUM_ERR_SHIFT);
        ena_rx_ctx->l4_csum_err =
-               (cdesc->status & ENA_ETH_IO_RX_CDESC_BASE_L4_CSUM_ERR_MASK) >>
-               ENA_ETH_IO_RX_CDESC_BASE_L4_CSUM_ERR_SHIFT;
+               !!((cdesc->status & ENA_ETH_IO_RX_CDESC_BASE_L4_CSUM_ERR_MASK) >>
+               ENA_ETH_IO_RX_CDESC_BASE_L4_CSUM_ERR_SHIFT);
 +      ena_rx_ctx->l4_csum_checked =
 +              !!((cdesc->status & ENA_ETH_IO_RX_CDESC_BASE_L4_CSUM_CHECKED_MASK) >>
 +              ENA_ETH_IO_RX_CDESC_BASE_L4_CSUM_CHECKED_SHIFT);
        ena_rx_ctx->hash = cdesc->hash;
        ena_rx_ctx->frag =
                (cdesc->status & ENA_ETH_IO_RX_CDESC_BASE_IPV4_FRAG_MASK) >>

diff --cc drivers/net/ethernet/amazon/ena/ena_netdev.c
Simple merge

diff --cc drivers/net/ethernet/realtek/r8169.c
Simple merge

diff --cc drivers/net/wireless/mediatek/mt76/usb.c
index 6b643ea,79e59f2..6a25564
--- 1/drivers/net/wireless/mediatek/mt76/usb.c
--- 2/drivers/net/wireless/mediatek/mt76/usb.c
+++ b/drivers/net/wireless/mediatek/mt76/usb.c
@@@ -523,10 -463,9 +523,10 @@@ static int mt76u_alloc_rx(struct mt76_d
        struct mt76_queue *q = &dev->q_rx[MT_RXQ_MAIN];
        int i, err, nsgs;
  
 +      spin_lock_init(&q->rx_page_lock);
        spin_lock_init(&q->lock);
-       q->entry = devm_kzalloc(dev->dev,
-                               MT_NUM_RX_ENTRIES * sizeof(*q->entry),
+       q->entry = devm_kcalloc(dev->dev,
+                               MT_NUM_RX_ENTRIES, sizeof(*q->entry),
                                GFP_KERNEL);
        if (!q->entry)
                return -ENOMEM;
@@@ -753,10 -715,10 +753,10 @@@ static int mt76u_alloc_tx(struct mt76_d
                q = &dev->q_tx[i];
                spin_lock_init(&q->lock);
                INIT_LIST_HEAD(&q->swq);
 -              q->hw_idx = q2hwq(i);
 +              q->hw_idx = mt76_ac_to_hwq(i);
  
-               q->entry = devm_kzalloc(dev->dev,
-                                       MT_NUM_TX_ENTRIES * sizeof(*q->entry),
+               q->entry = devm_kcalloc(dev->dev,
+                                       MT_NUM_TX_ENTRIES, sizeof(*q->entry),
                                        GFP_KERNEL);
                if (!q->entry)
                        return -ENOMEM;

diff --cc fs/afs/internal.h
Simple merge

diff --cc include/linux/netdevice.h
Simple merge

diff --cc include/net/devlink.h
Simple merge

diff --cc include/net/ip_fib.h
Simple merge

diff --cc net/core/dev.c
Simple merge

diff --cc net/core/devlink.c
Simple merge

diff --cc net/core/skbuff.c
Simple merge

diff --cc net/ipv4/fib_frontend.c
Simple merge

diff --cc net/ipv4/fib_semantics.c
Simple merge

diff --cc net/ipv4/route.c
Simple merge

diff --cc net/ipv4/udp.c
Simple merge

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

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

diff --cc net/rxrpc/call_accept.c
Simple merge

diff --cc net/rxrpc/input.c
index 5b26269,570b49d..9128aa0
--- 1/net/rxrpc/input.c
--- 2/net/rxrpc/input.c
+++ b/net/rxrpc/input.c
@@@ -259,9 -262,11 +262,11 @@@ static bool rxrpc_rotate_tx_window(stru
        while (list) {
                skb = list;
                list = skb->next;
 -              skb->next = NULL;
 +              skb_mark_not_on_list(skb);
                rxrpc_free_skb(skb, rxrpc_skb_tx_freed);
        }
+ 
+       return rot_last;
  }
  
  /*

diff --cc net/rxrpc/peer_event.c
Simple merge

diff --cc net/sched/cls_u32.c
index ac79a40,b2c3406..4b28fd4
--- 1/net/sched/cls_u32.c
--- 2/net/sched/cls_u32.c
+++ b/net/sched/cls_u32.c
@@@ -390,7 -396,9 +390,8 @@@ static int u32_init(struct tcf_proto *t
        tp_c->refcnt++;
        RCU_INIT_POINTER(root_ht->next, tp_c->hlist);
        rcu_assign_pointer(tp_c->hlist, root_ht);
 -      root_ht->tp_c = tp_c;
  
+       root_ht->refcnt++;
        rcu_assign_pointer(tp->root, root_ht);
        tp->data = tp_c;
        return 0;

diff --cc net/sched/sch_cake.c
Simple merge

diff --cc net/tipc/socket.c
Simple merge