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

net/wireless/nl80211.c
  b27f07c50a73 ("wifi: nl80211: fix puncturing bitmap policy")
  cbbaf2bb829b ("wifi: nl80211: add a command to enable/disable HW timestamping")
https://lore.kernel.org/all/20230314105421.3608efae@canb.auug.org.au

tools/testing/selftests/net/Makefile
  62199e3f1658 ("selftests: net: Add VXLAN MDB test")
  13715acf8ab5 ("selftest: Add test for bind() conflicts.")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --cc Documentation/netlink/genetlink-c.yaml
Simple merge

diff --cc Documentation/netlink/genetlink-legacy.yaml
Simple merge

diff --cc Documentation/netlink/genetlink.yaml
Simple merge

diff --cc drivers/net/dsa/microchip/ksz_common.c
Simple merge

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

diff --cc drivers/net/ethernet/cadence/macb_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/i40e/i40e_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/ice/ice.h
Simple merge

diff --cc drivers/net/ethernet/intel/ice/ice_main.c
Simple merge

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

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

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.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_tc.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/main.c
index 644c889f9a32b7086273781f39d254c82378d0ae,f1de152a61135844f291af44a69d04df60a96bb6..d39c3476b6d14cd0a74426bd44fe35ab53536894
--- 1/drivers/net/ethernet/mellanox/mlx5/core/main.c
--- 2/drivers/net/ethernet/mellanox/mlx5/core/main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/main.c
@@@ -1798,10 -1794,8 +1799,9 @@@ static void remove_one(struct pci_dev *
         * fw_reset before unregistering the devlink.
         */
        mlx5_drain_fw_reset(dev);
-       set_bit(MLX5_BREAK_FW_WAIT, &dev->intf_state);
        devlink_unregister(devlink);
        mlx5_sriov_disable(pdev);
 +      mlx5_thermal_uninit(dev);
        mlx5_crdump_disable(dev);
        mlx5_drain_health_wq(dev);
        mlx5_uninit_one(dev);

diff --cc drivers/net/ethernet/renesas/ravb_main.c
Simple merge

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

diff --cc drivers/net/virtio_net.c
Simple merge

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

diff --cc io_uring/rsrc.c
Simple merge

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

diff --cc net/mac80211/cfg.c
Simple merge

diff --cc net/mptcp/pm_netlink.c
Simple merge

diff --cc net/mptcp/protocol.c
Simple merge

diff --cc net/mptcp/subflow.c
Simple merge

diff --cc net/wireless/nl80211.c
index 0a31b1d2845d5d4f4e0a5f517a06d7fb10fde647,4f63059efd813ba6dd257a7c7ebebacb2f102cd1..bfa15defc04e9ae20139284c44fd034207f0db2e
--- 1/net/wireless/nl80211.c
--- 2/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@@ -805,10 -810,8 +810,11 @@@ static const struct nla_policy nl80211_
        [NL80211_ATTR_MLD_ADDR] = NLA_POLICY_EXACT_LEN(ETH_ALEN),
        [NL80211_ATTR_MLO_SUPPORT] = { .type = NLA_FLAG },
        [NL80211_ATTR_MAX_NUM_AKM_SUITES] = { .type = NLA_REJECT },
-       [NL80211_ATTR_PUNCT_BITMAP] = NLA_POLICY_RANGE(NLA_U8, 0, 0xffff),
+       [NL80211_ATTR_PUNCT_BITMAP] =
+               NLA_POLICY_FULL_RANGE(NLA_U32, &nl80211_punct_bitmap_range),
 +
 +      [NL80211_ATTR_MAX_HW_TIMESTAMP_PEERS] = { .type = NLA_U16 },
 +      [NL80211_ATTR_HW_TIMESTAMP_ENABLED] = { .type = NLA_FLAG },
  };
  
  /* policy for the key attributes */

diff --cc tools/testing/selftests/net/Makefile
index a179fbd6f9721987f7cea2e31c5d75c87277dbfc,80fbfe0330f6ec726b60b71761ca64df6e9d5b2f..e57750e44f71894513a1c30023d976d6ef61e9b8
--- 1/tools/testing/selftests/net/Makefile
--- 2/tools/testing/selftests/net/Makefile
+++ b/tools/testing/selftests/net/Makefile
@@@ -81,7 -80,7 +81,8 @@@ TEST_GEN_FILES += sctp_hell
  TEST_GEN_FILES += csum
  TEST_GEN_FILES += nat6to4.o
  TEST_GEN_FILES += ip_local_port_range
+ TEST_GEN_FILES += bind_wildcard
 +TEST_PROGS += test_vxlan_mdb.sh
  
  TEST_FILES := settings