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

Cross-merge networking fixes after downstream PR (net-6.18-rc5).

Conflicts:

drivers/net/wireless/ath/ath12k/mac.c
  9222582ec524 ("Revert "wifi: ath12k: Fix missing station power save configuration"")
  6917e268c433 ("wifi: ath12k: Defer vdev bring-up until CSA finalize to avoid stale beacon")
https://lore.kernel.org/11cece9f7e36c12efd732baa5718239b1bf8c950.camel@sipsolutions.net

Adjacent changes:

drivers/net/ethernet/intel/Kconfig
  b1d16f7c0063 ("libie: depend on DEBUG_FS when building LIBIE_FWLOG")
  93f53db9f9dc ("ice: switch to Page Pool")

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/dsa/b53/b53_common.c
Simple merge

diff --cc drivers/net/dsa/b53/b53_regs.h
Simple merge

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

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

diff --cc drivers/net/ethernet/intel/Kconfig
index 7c6ee1e604aa694f835b420772e5a8480d06270d,122ee23497e6a503723e002f85de06fdd7d60dcc..288fa8ce53af0a421315d87455d4c324eef364c1
--- 1/drivers/net/ethernet/intel/Kconfig
--- 2/drivers/net/ethernet/intel/Kconfig
+++ b/drivers/net/ethernet/intel/Kconfig
@@@ -296,10 -296,9 +296,10 @@@ config IC
        depends on GNSS || GNSS = n
        select AUXILIARY_BUS
        select DIMLIB
 +      select LIBETH_XDP
        select LIBIE
        select LIBIE_ADMINQ
-       select LIBIE_FWLOG
+       select LIBIE_FWLOG if DEBUG_FS
        select NET_DEVLINK
        select PACKING
        select PLDMFW

diff --cc drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.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_rx.c
Simple merge

diff --cc drivers/net/ethernet/ti/netcp_core.c
Simple merge

diff --cc drivers/net/ethernet/wangxun/libwx/wx_hw.c
Simple merge

diff --cc drivers/net/ethernet/wangxun/libwx/wx_type.h
Simple merge

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

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

diff --cc drivers/net/wireless/ath/ath12k/mac.c
index 0348601ecc50c727134874bdf6d1317b429e6a28,db351c92201817b1ff88a27cbd653b4ede35f7ea..9333225ceef3497ee4dd378e57ee5cf502b16517
--- 1/drivers/net/wireless/ath/ath12k/mac.c
--- 2/drivers/net/wireless/ath/ath12k/mac.c
+++ b/drivers/net/wireless/ath/ath12k/mac.c
@@@ -4423,7 -4209,7 +4404,8 @@@ static void ath12k_mac_bss_info_changed
  {
        struct ath12k_vif *ahvif = arvif->ahvif;
        struct ieee80211_vif *vif = ath12k_ahvif_to_vif(ahvif);
+       struct ieee80211_vif_cfg *vif_cfg = &vif->cfg;
 +      struct ath12k_link_vif *tx_arvif;
        struct cfg80211_chan_def def;
        u32 param_id, param_value;
        enum nl80211_band band;

diff --cc drivers/net/wireless/virtual/mac80211_hwsim.c
Simple merge

diff --cc fs/smb/client/connect.c
Simple merge

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

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

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

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

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

diff --cc tools/testing/selftests/drivers/net/netdevsim/Makefile
Simple merge