]> www.infradead.org Git - users/jedix/linux-maple.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Thu, 17 Jul 2025 17:56:56 +0000 (10:56 -0700)
committerJakub Kicinski <kuba@kernel.org>
Thu, 17 Jul 2025 18:00:33 +0000 (11:00 -0700)
commitaf2d6148d2a159e1a0862bce5a2c88c1618a2b27
treeb43a3c2f7070de649a78d5fb59c23724b0cb4c56
parenta96cee9b369ee47b5309311d0d71cb6663b123fc
parent6832a9317eee280117cd695fa885b2b7a7a38daf
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Cross-merge networking fixes after downstream PR (net-6.16-rc7).

Conflicts:

Documentation/netlink/specs/ovpn.yaml
  880d43ca9aa4 ("netlink: specs: clean up spaces in brackets")
  af52020fc599 ("ovpn: reject unexpected netlink attributes")

drivers/net/phy/phy_device.c
  a44312d58e78 ("net: phy: Don't register LEDs for genphy")
  f0f2b992d818 ("net: phy: Don't register LEDs for genphy")
https://lore.kernel.org/20250710114926.7ec3a64f@kernel.org

drivers/net/wireless/intel/iwlwifi/fw/regulatory.c
drivers/net/wireless/intel/iwlwifi/mld/regulatory.c
  5fde0fcbd760 ("wifi: iwlwifi: mask reserved bits in chan_state_active_bitmap")
  ea045a0de3b9 ("wifi: iwlwifi: add support for accepting raw DSM tables by firmware")

net/ipv6/mcast.c
  ae3264a25a46 ("ipv6: mcast: Delay put pmc->idev in mld_del_delrec()")
  a8594c956cc9 ("ipv6: mcast: Avoid a duplicate pointer check in mld_del_delrec()")
https://lore.kernel.org/8cc52891-3653-4b03-a45e-05464fe495cf@kernel.org

No adjacent changes.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
28 files changed:
Documentation/netlink/specs/ovpn.yaml
MAINTAINERS
drivers/net/ethernet/airoha/airoha_npu.c
drivers/net/ethernet/intel/i40e/i40e.h
drivers/net/ethernet/intel/ixgbe/ixgbe.h
drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
drivers/net/ethernet/mellanox/mlx5/core/main.c
drivers/net/ethernet/wangxun/libwx/wx_hw.c
drivers/net/ethernet/wangxun/libwx/wx_lib.c
drivers/net/ethernet/wangxun/libwx/wx_type.h
drivers/net/hyperv/netvsc_drv.c
drivers/net/ovpn/udp.c
drivers/net/virtio_net.c
drivers/net/wireless/ath/ath12k/dp_rx.c
drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/trans-gen2.c
drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/tx.c
include/net/cfg80211.h
include/net/netfilter/nf_conntrack.h
net/bluetooth/l2cap_sock.c
net/ipv4/udp_offload.c
net/ipv6/mcast.c
net/ipv6/rpl_iptunnel.c
net/mptcp/protocol.c
net/netfilter/nf_conntrack_core.c
net/netfilter/nf_tables_api.c
net/packet/af_packet.c
net/smc/af_smc.c
tools/testing/selftests/tc-testing/tc-tests/infra/qdiscs.json