2
0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-04 20:19:47 +08:00
linux/drivers/net/ethernet/intel/i40e
Jakub Kicinski af2d6148d2 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
  880d43ca9a ("netlink: specs: clean up spaces in brackets")
  af52020fc5 ("ovpn: reject unexpected netlink attributes")

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

net/ipv6/mcast.c
  ae3264a25a ("ipv6: mcast: Delay put pmc->idev in mld_del_delrec()")
  a8594c956c ("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>
2025-07-17 11:00:33 -07:00
..
i40e_adminq_cmd.h i40e: Include types.h to some headers 2024-01-18 09:52:52 -08:00
i40e_adminq.c i40e: Remove unused i40e_asq_send_command_v2 2025-01-06 13:31:48 -08:00
i40e_adminq.h i40e: fix: remove needless retries of NVM update 2024-07-11 17:31:52 -07:00
i40e_alloc.h
i40e_client.c i40e: Add helper to access main VSI 2024-04-30 09:33:05 -07:00
i40e_common.c i40e: fix MMIO write access to an invalid page in i40e_clear_hw 2025-04-11 11:58:57 -07:00
i40e_dcb_nl.c i40e: Introduce and use macros for iterating VSIs and VEBs 2024-02-16 09:28:14 -08:00
i40e_dcb.c i40e: Remove unused i40e_dcb_hw_get_num_tc 2025-01-06 13:31:49 -08:00
i40e_dcb.h i40e: Remove unused i40e_dcb_hw_get_num_tc 2025-01-06 13:31:49 -08:00
i40e_ddp.c i40e: Add helper to access main VSI 2024-04-30 09:33:05 -07:00
i40e_debug.h i40e: Initialize hardware capabilities at single place 2023-11-14 20:05:44 -08:00
i40e_debugfs.c i40e: add ability to reset VF for Tx and Rx MDD events 2025-01-07 18:16:02 -08:00
i40e_devids.h
i40e_devlink.c i40e: Do not call devlink_port_type_clear() 2023-11-06 16:16:13 -08:00
i40e_devlink.h i40e: Add initial devlink support 2023-10-15 14:33:41 +01:00
i40e_diag.c
i40e_diag.h i40e: Include types.h to some headers 2024-01-18 09:52:52 -08:00
i40e_ethtool.c eth: i40e: migrate to new RXFH callbacks 2025-06-16 18:14:52 -07:00
i40e_hmc.c i40e: Remove circular header dependencies and fix headers 2023-10-05 09:18:09 -07:00
i40e_hmc.h i40e: Remove circular header dependencies and fix headers 2023-10-05 09:18:09 -07:00
i40e_io.h i40e: Split i40e_osdep.h 2023-10-05 09:13:43 -07:00
i40e_lan_hmc.c i40e: Remove circular header dependencies and fix headers 2023-10-05 09:18:09 -07:00
i40e_lan_hmc.h i40e: Remove circular header dependencies and fix headers 2023-10-05 09:18:09 -07:00
i40e_main.c i40e: convert to ndo_hwtstamp_get() and ndo_hwtstamp_set() 2025-07-03 09:39:00 -07:00
i40e_nvm.c i40e: avoid forward declarations in i40e_nvm.c 2024-03-29 08:58:44 -07:00
i40e_prototype.h i40e: Remove unused i40e_asq_send_command_v2 2025-01-06 13:31:48 -08:00
i40e_ptp.c i40e: convert to ndo_hwtstamp_get() and ndo_hwtstamp_set() 2025-07-03 09:39:00 -07:00
i40e_register.h i40e: Enforce software interrupt during busy-poll exit 2024-03-26 08:34:40 -07:00
i40e_trace.h tracing/treewide: Remove second parameter of __assign_str() 2024-05-22 20:14:47 -04:00
i40e_txrx_common.h i40e: Remove circular header dependencies and fix headers 2023-10-05 09:18:09 -07:00
i40e_txrx.c net: intel: move RSS packet classifier types to libie 2025-06-09 09:56:18 -07:00
i40e_txrx.h net: intel: move RSS packet classifier types to libie 2025-06-09 09:56:18 -07:00
i40e_type.h net: intel: move RSS packet classifier types to libie 2025-06-09 09:56:18 -07:00
i40e_virtchnl_pf.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2025-06-12 10:09:10 -07:00
i40e_virtchnl_pf.h i40e: add ability to reset VF for Tx and Rx MDD events 2025-01-07 18:16:02 -08:00
i40e_xsk.c i40e: use generic unrolled_count() macro 2025-02-10 17:54:43 -08:00
i40e_xsk.h i40e: use generic unrolled_count() macro 2025-02-10 17:54:43 -08:00
i40e.h Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2025-07-17 11:00:33 -07:00
Makefile net: intel: Use *-y instead of *-objs in Makefile 2024-06-10 19:52:44 -07:00