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

Overlapping header include additions in macsec.c

A bug fix in 'net' overlapping with the removal of 'version'
string in ena_netdev.c

Overlapping test additions in selftests Makefile

Overlapping PCI ID table adjustments in iwlwifi driver.

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/Kconfig
Simple merge

diff --cc drivers/net/can/slcan.c
Simple merge

diff --cc drivers/net/dsa/mt7530.c
Simple merge

diff --cc drivers/net/ethernet/amazon/ena/ena_netdev.c
index 555c727,cada6e7..5703282
--- 1/drivers/net/ethernet/amazon/ena/ena_netdev.c
--- 2/drivers/net/ethernet/amazon/ena/ena_netdev.c
+++ b/drivers/net/ethernet/amazon/ena/ena_netdev.c
@@@ -3473,7 -3486,10 +3483,8 @@@ static int ena_restore_device(struct en
                netif_carrier_on(adapter->netdev);
  
        mod_timer(&adapter->timer_service, round_jiffies(jiffies + HZ));
 -      dev_err(&pdev->dev,
 -              "Device reset completed successfully, Driver info: %s\n",
 -              version);
 +      dev_err(&pdev->dev, "Device reset completed successfully\n");
+       adapter->last_keep_alive_jiffies = jiffies;
  
        return rc;
  err_disable_msix:

diff --cc drivers/net/ethernet/broadcom/bnxt/bnxt.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnxt/bnxt.h
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/genet/bcmgenet.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/genet/bcmmii.c
Simple merge

diff --cc drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c
Simple merge

diff --cc drivers/net/ethernet/chelsio/cxgb4/sge.c
Simple merge

diff --cc drivers/net/ethernet/freescale/fman/fman_memac.c
Simple merge

diff --cc drivers/net/ethernet/marvell/mvneta.c
Simple merge

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

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

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

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

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

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

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

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

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

diff --cc drivers/net/ethernet/mellanox/mlxsw/pci.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlxsw/reg.h
Simple merge

diff --cc drivers/net/ethernet/netronome/nfp/nfpcore/nfp6000_pcie.c
Simple merge

diff --cc drivers/net/ethernet/pensando/ionic/ionic_if.h
Simple merge

diff --cc drivers/net/ethernet/pensando/ionic/ionic_lif.c
Simple merge

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

diff --cc drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
index ac80373,13fafd9..bcda49d
--- 1/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
--- 2/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
@@@ -668,11 -672,16 +670,15 @@@ int stmmac_get_platform_resources(struc
                stmmac_res->wol_irq = stmmac_res->irq;
        }
  
-       stmmac_res->lpi_irq = platform_get_irq_byname(pdev, "eth_lpi");
-       if (stmmac_res->lpi_irq == -EPROBE_DEFER)
-               return -EPROBE_DEFER;
+       stmmac_res->lpi_irq =
+               platform_get_irq_byname_optional(pdev, "eth_lpi");
+       if (stmmac_res->lpi_irq < 0) {
+               if (stmmac_res->lpi_irq == -EPROBE_DEFER)
+                       return -EPROBE_DEFER;
+               dev_info(&pdev->dev, "IRQ eth_lpi not found\n");
+       }
  
 -      res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 -      stmmac_res->addr = devm_ioremap_resource(&pdev->dev, res);
 +      stmmac_res->addr = devm_platform_ioremap_resource(pdev, 0);
  
        return PTR_ERR_OR_ZERO(stmmac_res->addr);
  }

diff --cc drivers/net/macsec.c
index 49b138e,92bc2b2..35abebe
--- 1/drivers/net/macsec.c
--- 2/drivers/net/macsec.c
+++ b/drivers/net/macsec.c
@@@ -19,7 -19,7 +19,8 @@@
  #include <net/gro_cells.h>
  #include <net/macsec.h>
  #include <linux/phy.h>
 +#include <linux/byteorder/generic.h>
+ #include <linux/if_arp.h>
  
  #include <uapi/linux/if_macsec.h>
  

diff --cc drivers/net/phy/dp83867.c
Simple merge

diff --cc drivers/net/phy/mdio-mux-bcm-iproc.c
Simple merge

diff --cc drivers/net/wireless/intel/iwlwifi/cfg/22000.c
Simple merge

diff --cc drivers/net/wireless/intel/iwlwifi/pcie/drv.c
index 5413e80,f441b20..a32b616
--- 1/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
--- 2/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
@@@ -819,127 -977,25 +819,126 @@@ MODULE_DEVICE_TABLE(pci, iwl_hw_card_id
  
  static const struct iwl_dev_info iwl_dev_info_table[] = {
  #if IS_ENABLED(CONFIG_IWLMVM)
 -      IWL_DEV_INFO(0x2526, 0x0010, iwl9260_2ac_160_cfg, iwl9260_160_name),
 -      IWL_DEV_INFO(0x2526, 0x0014, iwl9260_2ac_160_cfg, iwl9260_160_name),
 -      IWL_DEV_INFO(0x2526, 0x0018, iwl9260_2ac_160_cfg, iwl9260_160_name),
 -      IWL_DEV_INFO(0x2526, 0x001C, iwl9260_2ac_160_cfg, iwl9260_160_name),
 -      IWL_DEV_INFO(0x2526, 0x4010, iwl9260_2ac_160_cfg, iwl9260_160_name),
 -      IWL_DEV_INFO(0x2526, 0x4018, iwl9260_2ac_160_cfg, iwl9260_160_name),
 -      IWL_DEV_INFO(0x2526, 0x401C, iwl9260_2ac_160_cfg, iwl9260_160_name),
 -      IWL_DEV_INFO(0x2526, 0x6010, iwl9260_2ac_160_cfg, iwl9260_160_name),
 -      IWL_DEV_INFO(0x2526, 0x6014, iwl9260_2ac_160_cfg, iwl9260_160_name),
 -      IWL_DEV_INFO(0x2526, 0x8014, iwl9260_2ac_160_cfg, iwl9260_160_name),
 -      IWL_DEV_INFO(0x2526, 0x8010, iwl9260_2ac_160_cfg, iwl9260_160_name),
 -      IWL_DEV_INFO(0x2526, 0xA014, iwl9260_2ac_160_cfg, iwl9260_160_name),
 -      IWL_DEV_INFO(0x2526, 0xE010, iwl9260_2ac_160_cfg, iwl9260_160_name),
 -      IWL_DEV_INFO(0x2526, 0xE014, iwl9260_2ac_160_cfg, iwl9260_160_name),
 -
 -      IWL_DEV_INFO(0x2526, 0x0030, iwl9560_2ac_160_cfg, iwl9560_160_name),
 -      IWL_DEV_INFO(0x2526, 0x0038, iwl9560_2ac_160_cfg, iwl9560_160_name),
 -      IWL_DEV_INFO(0x2526, 0x003C, iwl9560_2ac_160_cfg, iwl9560_160_name),
 -      IWL_DEV_INFO(0x2526, 0x4030, iwl9560_2ac_160_cfg, iwl9560_160_name),
 +/* 9000 */
 +      IWL_DEV_INFO(0x2526, 0x1550, iwl9260_2ac_cfg, iwl9260_killer_1550_name),
 +      IWL_DEV_INFO(0x2526, 0x1551, iwl9560_2ac_cfg_soc, iwl9560_killer_1550s_name),
 +      IWL_DEV_INFO(0x2526, 0x1552, iwl9560_2ac_cfg_soc, iwl9560_killer_1550i_name),
 +      IWL_DEV_INFO(0x30DC, 0x1551, iwl9560_2ac_cfg_soc, iwl9560_killer_1550s_name),
 +      IWL_DEV_INFO(0x30DC, 0x1552, iwl9560_2ac_cfg_soc, iwl9560_killer_1550i_name),
 +      IWL_DEV_INFO(0x31DC, 0x1551, iwl9560_2ac_cfg_shared_clk, iwl9560_killer_1550s_name),
 +      IWL_DEV_INFO(0x31DC, 0x1552, iwl9560_2ac_cfg_shared_clk, iwl9560_killer_1550i_name),
 +
 +      IWL_DEV_INFO(0x271C, 0x0214, iwl9260_2ac_cfg, iwl9260_1_name),
 +
 +      _IWL_DEV_INFO(0x31DC, IWL_CFG_ANY,
 +                    IWL_CFG_MAC_TYPE_PU, IWL_CFG_RF_TYPE_JF1, IWL_CFG_RF_ID_JF1,
 +                    IWL_CFG_160, IWL_CFG_CORES_BT,
 +                    iwl9560_2ac_cfg_shared_clk, iwl9461_160_name),
 +      _IWL_DEV_INFO(0x31DC, IWL_CFG_ANY,
 +                    IWL_CFG_MAC_TYPE_PU, IWL_CFG_RF_TYPE_JF1, IWL_CFG_RF_ID_JF1,
 +                    IWL_CFG_NO_160, IWL_CFG_CORES_BT,
 +                    iwl9560_2ac_cfg_shared_clk, iwl9461_name),
 +      _IWL_DEV_INFO(0x31DC, IWL_CFG_ANY,
 +                    IWL_CFG_MAC_TYPE_PU, IWL_CFG_RF_TYPE_JF1, IWL_CFG_RF_ID_JF1_DIV,
 +                    IWL_CFG_160, IWL_CFG_CORES_BT,
 +                    iwl9560_2ac_cfg_shared_clk, iwl9462_160_name),
 +      _IWL_DEV_INFO(0x31DC, IWL_CFG_ANY,
 +                    IWL_CFG_MAC_TYPE_PU, IWL_CFG_RF_TYPE_JF1, IWL_CFG_RF_ID_JF1_DIV,
 +                    IWL_CFG_NO_160, IWL_CFG_CORES_BT,
 +                    iwl9560_2ac_cfg_shared_clk, iwl9462_name),
 +
 +      _IWL_DEV_INFO(0x31DC, IWL_CFG_ANY,
 +                    IWL_CFG_MAC_TYPE_PU, IWL_CFG_RF_TYPE_JF2, IWL_CFG_RF_ID_JF,
 +                    IWL_CFG_160, IWL_CFG_CORES_BT,
 +                    iwl9560_2ac_cfg_shared_clk, iwl9560_160_name),
 +      _IWL_DEV_INFO(0x31DC, IWL_CFG_ANY,
 +                    IWL_CFG_MAC_TYPE_PU, IWL_CFG_RF_TYPE_JF2, IWL_CFG_RF_ID_JF,
 +                    IWL_CFG_NO_160, IWL_CFG_CORES_BT,
 +                    iwl9560_2ac_cfg_shared_clk, iwl9560_name),
 +
 +      _IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,
 +                    IWL_CFG_MAC_TYPE_PU, IWL_CFG_RF_TYPE_JF1, IWL_CFG_RF_ID_JF1,
 +                    IWL_CFG_160, IWL_CFG_CORES_BT,
 +                    iwl9560_2ac_cfg_soc, iwl9461_160_name),
 +      _IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,
 +                    IWL_CFG_MAC_TYPE_PU, IWL_CFG_RF_TYPE_JF1, IWL_CFG_RF_ID_JF1,
 +                    IWL_CFG_NO_160, IWL_CFG_CORES_BT,
 +                    iwl9560_2ac_cfg_soc, iwl9461_name),
 +      _IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,
 +                    IWL_CFG_MAC_TYPE_PU, IWL_CFG_RF_TYPE_JF1, IWL_CFG_RF_ID_JF1_DIV,
 +                    IWL_CFG_160, IWL_CFG_CORES_BT,
 +                    iwl9560_2ac_cfg_soc, iwl9462_160_name),
 +      _IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,
 +                    IWL_CFG_MAC_TYPE_PU, IWL_CFG_RF_TYPE_JF1, IWL_CFG_RF_ID_JF1_DIV,
 +                    IWL_CFG_NO_160, IWL_CFG_CORES_BT,
 +                    iwl9560_2ac_cfg_soc, iwl9462_name),
 +
 +      _IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,
 +                    IWL_CFG_MAC_TYPE_PU, IWL_CFG_RF_TYPE_JF2, IWL_CFG_RF_ID_JF,
 +                    IWL_CFG_160, IWL_CFG_CORES_BT,
 +                    iwl9560_2ac_cfg_soc, iwl9560_160_name),
 +      _IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,
 +                    IWL_CFG_MAC_TYPE_PU, IWL_CFG_RF_TYPE_JF2, IWL_CFG_RF_ID_JF,
 +                    IWL_CFG_NO_160, IWL_CFG_CORES_BT,
 +                    iwl9560_2ac_cfg_soc, iwl9560_name),
 +
 +      _IWL_DEV_INFO(0x2526, IWL_CFG_ANY,
 +                    IWL_CFG_MAC_TYPE_PNJ, IWL_CFG_RF_TYPE_JF1, IWL_CFG_RF_ID_JF1,
 +                    IWL_CFG_160, IWL_CFG_CORES_BT,
 +                    iwl9560_2ac_cfg, iwl9461_160_name),
 +      _IWL_DEV_INFO(0x2526, IWL_CFG_ANY,
 +                    IWL_CFG_MAC_TYPE_PNJ, IWL_CFG_RF_TYPE_JF1, IWL_CFG_RF_ID_JF1,
 +                    IWL_CFG_NO_160, IWL_CFG_CORES_BT,
 +                    iwl9560_2ac_cfg, iwl9461_name),
 +      _IWL_DEV_INFO(0x2526, IWL_CFG_ANY,
 +                    IWL_CFG_MAC_TYPE_PNJ, IWL_CFG_RF_TYPE_JF1, IWL_CFG_RF_ID_JF1_DIV,
 +                    IWL_CFG_160, IWL_CFG_CORES_BT,
 +                    iwl9560_2ac_cfg, iwl9462_160_name),
 +      _IWL_DEV_INFO(0x2526, IWL_CFG_ANY,
 +                    IWL_CFG_MAC_TYPE_PNJ, IWL_CFG_RF_TYPE_JF1, IWL_CFG_RF_ID_JF1_DIV,
 +                    IWL_CFG_NO_160, IWL_CFG_CORES_BT,
 +                    iwl9560_2ac_cfg, iwl9462_name),
 +
 +      _IWL_DEV_INFO(0x2526, IWL_CFG_ANY,
 +                    IWL_CFG_MAC_TYPE_PNJ, IWL_CFG_RF_TYPE_JF2, IWL_CFG_RF_ID_JF,
 +                    IWL_CFG_160, IWL_CFG_CORES_BT,
 +                    iwl9560_2ac_cfg, iwl9560_160_name),
 +      _IWL_DEV_INFO(0x2526, IWL_CFG_ANY,
 +                    IWL_CFG_MAC_TYPE_PNJ, IWL_CFG_RF_TYPE_JF2, IWL_CFG_RF_ID_JF,
 +                    IWL_CFG_NO_160, IWL_CFG_CORES_BT,
 +                    iwl9560_2ac_cfg, iwl9560_name),
 +
 +      _IWL_DEV_INFO(0x2526, IWL_CFG_ANY,
 +                    IWL_CFG_MAC_TYPE_TH, IWL_CFG_RF_TYPE_TH, IWL_CFG_ANY,
 +                    IWL_CFG_160, IWL_CFG_CORES_BT_GNSS,
 +                    iwl9260_2ac_cfg, iwl9270_160_name),
 +      _IWL_DEV_INFO(0x2526, IWL_CFG_ANY,
 +                    IWL_CFG_MAC_TYPE_TH, IWL_CFG_RF_TYPE_TH, IWL_CFG_ANY,
 +                    IWL_CFG_NO_160, IWL_CFG_CORES_BT_GNSS,
 +                    iwl9260_2ac_cfg, iwl9270_name),
 +
 +      _IWL_DEV_INFO(0x271B, IWL_CFG_ANY,
 +                    IWL_CFG_MAC_TYPE_TH, IWL_CFG_RF_TYPE_TH1, IWL_CFG_ANY,
 +                    IWL_CFG_160, IWL_CFG_CORES_BT,
 +                    iwl9260_2ac_cfg, iwl9162_160_name),
 +      _IWL_DEV_INFO(0x271B, IWL_CFG_ANY,
 +                    IWL_CFG_MAC_TYPE_TH, IWL_CFG_RF_TYPE_TH1, IWL_CFG_ANY,
 +                    IWL_CFG_NO_160, IWL_CFG_CORES_BT,
 +                    iwl9260_2ac_cfg, iwl9162_name),
 +
 +      _IWL_DEV_INFO(0x2526, IWL_CFG_ANY,
 +                    IWL_CFG_MAC_TYPE_TH, IWL_CFG_RF_TYPE_TH, IWL_CFG_ANY,
 +                    IWL_CFG_160, IWL_CFG_CORES_BT,
 +                    iwl9260_2ac_cfg, iwl9260_160_name),
 +      _IWL_DEV_INFO(0x2526, IWL_CFG_ANY,
 +                    IWL_CFG_MAC_TYPE_TH, IWL_CFG_RF_TYPE_TH, IWL_CFG_ANY,
 +                    IWL_CFG_NO_160, IWL_CFG_CORES_BT,
 +                    iwl9260_2ac_cfg, iwl9260_name),
 +
 +/* AX200 */
 +      IWL_DEV_INFO(0x2723, 0x1653, iwl_ax200_cfg_cc, iwl_ax200_killer_1650w_name),
 +      IWL_DEV_INFO(0x2723, 0x1654, iwl_ax200_cfg_cc, iwl_ax200_killer_1650x_name),
 +      IWL_DEV_INFO(0x2723, IWL_CFG_ANY, iwl_ax200_cfg_cc, iwl_ax200_name),
- 
  #endif /* CONFIG_IWLMVM */
  };
  

diff --cc drivers/nfc/fdp/fdp.c
Simple merge

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

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

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

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

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

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

diff --cc kernel/trace/bpf_trace.c
Simple merge

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

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

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

diff --cc net/dsa/tag_brcm.c
index 0d3f796,9169b63..cc8512b
--- 1/net/dsa/tag_brcm.c
--- 2/net/dsa/tag_brcm.c
+++ b/net/dsa/tag_brcm.c
@@@ -140,29 -140,10 +140,31 @@@ static struct sk_buff *brcm_tag_rcv_ll(
        /* Remove Broadcom tag and update checksum */
        skb_pull_rcsum(skb, BRCM_TAG_LEN);
  
+       skb->offload_fwd_mark = 1;
+ 
        return skb;
  }
 +
 +static int brcm_tag_flow_dissect(const struct sk_buff *skb, __be16 *proto,
 +                               int *offset)
 +{
 +      /* We have been called on the DSA master network device after
 +       * eth_type_trans() which pulled the Ethernet header already.
 +       * Frames have one of these two layouts:
 +       * -----------------------------------
 +       * | MAC DA | MAC SA | 4b tag | Type | DSA_TAG_PROTO_BRCM
 +       * -----------------------------------
 +       * -----------------------------------
 +       * | 4b tag | MAC DA | MAC SA | Type | DSA_TAG_PROTO_BRCM_PREPEND
 +       * -----------------------------------
 +       * skb->data points 2 bytes before the actual Ethernet type field and
 +       * we have an offset of 4bytes between where skb->data and where the
 +       * payload starts.
 +       */
 +      *offset = BRCM_TAG_LEN;
 +      *proto = ((__be16 *)skb->data)[1];
 +      return 0;
 +}
  #endif
  
  #if IS_ENABLED(CONFIG_NET_DSA_TAG_BRCM)

diff --cc net/ethtool/debug.c
Simple merge

diff --cc net/ethtool/linkinfo.c
Simple merge

diff --cc net/ethtool/linkmodes.c
Simple merge

diff --cc net/ethtool/netlink.c
Simple merge

diff --cc net/ethtool/wol.c
Simple merge

diff --cc net/hsr/hsr_framereg.c
Simple merge

diff --cc net/hsr/hsr_netlink.c
Simple merge

diff --cc net/hsr/hsr_slave.c
index d3547e8,a9104d4..f4b9f7a
--- 1/net/hsr/hsr_slave.c
--- 2/net/hsr/hsr_slave.c
+++ b/net/hsr/hsr_slave.c
@@@ -151,8 -145,12 +151,12 @@@ int hsr_add_port(struct hsr_priv *hsr, 
        if (!port)
                return -ENOMEM;
  
+       port->hsr = hsr;
+       port->dev = dev;
+       port->type = type;
+ 
        if (type != HSR_PT_MASTER) {
 -              res = hsr_portdev_setup(dev, port);
 +              res = hsr_portdev_setup(hsr, dev, port, extack);
                if (res)
                        goto fail_dev_setup;
        }

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

diff --cc net/netfilter/nf_flow_table_core.c
index 9a477bd,70ebeba..d523c2a
--- 1/net/netfilter/nf_flow_table_core.c
--- 2/net/netfilter/nf_flow_table_core.c
+++ b/net/netfilter/nf_flow_table_core.c
@@@ -613,8 -554,10 +613,11 @@@ void nf_flow_table_free(struct nf_flowt
        nf_flow_table_iterate(flow_table, nf_flow_table_do_cleanup, NULL);
        nf_flow_table_iterate(flow_table, nf_flow_offload_gc_step, flow_table);
        nf_flow_table_offload_flush(flow_table);
+       if (nf_flowtable_hw_offload(flow_table))
+               nf_flow_table_iterate(flow_table, nf_flow_offload_gc_step,
+                                     flow_table);
        rhashtable_destroy(&flow_table->rhashtable);
 +      mutex_destroy(&flow_table->flow_block_lock);
  }
  EXPORT_SYMBOL_GPL(nf_flow_table_free);
  

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

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

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

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

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

diff --cc net/netlink/af_netlink.c
Simple merge

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

diff --cc tools/scripts/Makefile.include
Simple merge

diff --cc tools/testing/selftests/net/Makefile
index 48063fd,4c1bd03..24d8424
--- 1/tools/testing/selftests/net/Makefile
--- 2/tools/testing/selftests/net/Makefile
+++ b/tools/testing/selftests/net/Makefile
@@@ -11,8 -11,9 +11,10 @@@ TEST_PROGS += udpgso_bench.sh fib_rule_
  TEST_PROGS += udpgro_bench.sh udpgro.sh test_vxlan_under_vrf.sh reuseport_addr_any.sh
  TEST_PROGS += test_vxlan_fdb_changelink.sh so_txtime.sh ipv6_flowlabel.sh
  TEST_PROGS += tcp_fastopen_backup_key.sh fcnal-test.sh l2tp.sh traceroute.sh
- TEST_PROGS += fin_ack_lat.sh
+ TEST_PROGS += fin_ack_lat.sh fib_nexthop_multiprefix.sh fib_nexthops.sh
+ TEST_PROGS += altnames.sh icmp_redirect.sh ip6_gre_headroom.sh
+ TEST_PROGS += route_localnet.sh
 +TEST_PROGS += reuseaddr_ports_exhausted.sh
  TEST_PROGS_EXTENDED := in_netns.sh
  TEST_GEN_FILES =  socket nettest
  TEST_GEN_FILES += psock_fanout psock_tpacket msg_zerocopy reuseport_addr_any