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

diff --cc MAINTAINERS
Simple merge

diff --cc Makefile
Simple merge

diff --cc drivers/net/dsa/ocelot/felix.c
Simple merge

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

diff --cc drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
Simple merge

diff --cc drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
Simple merge

diff --cc drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c
Simple merge

diff --cc drivers/net/ethernet/ibm/ibmvnic.c
Simple merge

diff --cc drivers/net/ethernet/mscc/ocelot.c
Simple merge

diff --cc drivers/net/hyperv/netvsc.c
Simple merge

diff --cc drivers/net/hyperv/rndis_filter.c
Simple merge

diff --cc drivers/net/ipa/gsi.c
Simple merge

diff --cc drivers/net/usb/qmi_wwan.c
Simple merge

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

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

diff --cc include/soc/mscc/ocelot.h
index d0d48e9620fb7e7c3d892e4f21c620d8ef04c434,c34b9ccb64722df8612232eaea34756d52dbff51..bfce3df61bfd071cdd470330418d2203af48e935
--- 1/include/soc/mscc/ocelot.h
--- 2/include/soc/mscc/ocelot.h
+++ b/include/soc/mscc/ocelot.h
@@@ -758,11 -738,12 +759,12 @@@ int ocelot_get_sset_count(struct ocelo
  int ocelot_get_ts_info(struct ocelot *ocelot, int port,
                       struct ethtool_ts_info *info);
  void ocelot_set_ageing_time(struct ocelot *ocelot, unsigned int msecs);
+ int ocelot_port_flush(struct ocelot *ocelot, int port);
  void ocelot_adjust_link(struct ocelot *ocelot, int port,
                        struct phy_device *phydev);
 -int ocelot_port_vlan_filtering(struct ocelot *ocelot, int port, bool enabled,
 -                             struct switchdev_trans *trans);
 +int ocelot_port_vlan_filtering(struct ocelot *ocelot, int port, bool enabled);
  void ocelot_bridge_stp_state_set(struct ocelot *ocelot, int port, u8 state);
 +void ocelot_apply_bridge_fwd_mask(struct ocelot *ocelot);
  int ocelot_port_bridge_join(struct ocelot *ocelot, int port,
                            struct net_device *bridge);
  int ocelot_port_bridge_leave(struct ocelot *ocelot, int port,

diff --cc kernel/bpf/stackmap.c
Simple merge

diff --cc kernel/bpf/verifier.c
Simple merge

diff --cc net/bridge/br_mrp.c
Simple merge

diff --cc net/core/dev.c
index 7647278e46f0eb6b6c6270b3d36959232fccd469,449b45b843d40ece7dd1e2ed6a5996ee1db9f591..321d41a110e723e962cbf7e78141161c9b0d5532
--- 1/net/core/dev.c
--- 2/net/core/dev.c
+++ b/net/core/dev.c
@@@ -6109,9 -6068,13 +6110,9 @@@ static gro_result_t napi_skb_finish(str
  {
        switch (ret) {
        case GRO_NORMAL:
-               gro_normal_one(napi, skb);
+               gro_normal_one(napi, skb, 1);
                break;
  
 -      case GRO_DROP:
 -              kfree_skb(skb);
 -              break;
 -
        case GRO_MERGED_FREE:
                if (NAPI_GRO_CB(skb)->free == NAPI_GRO_FREE_STOLEN_HEAD)
                        napi_skb_free_stolen_head(skb);
@@@ -6193,9 -6156,13 +6194,9 @@@ static gro_result_t napi_frags_finish(s
                __skb_push(skb, ETH_HLEN);
                skb->protocol = eth_type_trans(skb, skb->dev);
                if (ret == GRO_NORMAL)
-                       gro_normal_one(napi, skb);
+                       gro_normal_one(napi, skb, 1);
                break;
  
 -      case GRO_DROP:
 -              napi_reuse_skb(napi, skb);
 -              break;
 -
        case GRO_MERGED_FREE:
                if (NAPI_GRO_CB(skb)->free == NAPI_GRO_FREE_STOLEN_HEAD)
                        napi_skb_free_stolen_head(skb);

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

diff --cc net/netfilter/nf_flow_table_core.c
Simple merge

diff --cc net/netfilter/nf_tables_api.c
Simple merge