Commit af2d6148 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files
Cross-merge networking fixes after downstream PR (net-6.16-rc7).

Conflicts:

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

drivers/net/phy/phy_device.c
  a44312d5 ("net: phy: Don't register LEDs for genphy")
  f0f2b992 ("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
  5fde0fcb ("wifi: iwlwifi: mask reserved bits in chan_state_active_bitmap")
  ea045a0d ("wifi: iwlwifi: add support for accepting raw DSM tables by firmware")

net/ipv6/mcast.c
  ae3264a2 ("ipv6: mcast: Delay put pmc->idev in mld_del_delrec()")
  a8594c95 ("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: default avatarJakub Kicinski <kuba@kernel.org>
parents a96cee9b 6832a931
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment