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/ice
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
..
devlink iidc/ice/irdma: Update IDC to support multiple consumers 2025-05-09 11:35:43 -07:00
ice_adapter.c ice: add functions to get and set Tx queue context 2025-07-10 14:33:33 -07:00
ice_adapter.h ice: add functions to get and set Tx queue context 2025-07-10 14:33:33 -07:00
ice_adminq_cmd.h ice: add functions to get and set Tx queue context 2025-07-10 14:33:33 -07:00
ice_arfs.c net: ice: Perform accurate aRFS flow match 2025-06-17 10:09:18 -07:00
ice_arfs.h ice: use napi's irq affinity and rmap IRQ notifiers 2025-02-26 19:51:37 -08:00
ice_base.c ice: add a separate Rx handler for flow director commands 2025-06-09 09:56:18 -07:00
ice_base.h ice: make ice_vsi_cfg_txq() static 2024-02-02 09:13:13 -08:00
ice_common.c ice: add functions to get and set Tx queue context 2025-07-10 14:33:33 -07:00
ice_common.h ice: add functions to get and set Tx queue context 2025-07-10 14:33:33 -07:00
ice_controlq.c ice: Report NVM version numbers on mismatch during load 2024-08-26 09:47:13 -07:00
ice_controlq.h ice: remove unnecessary control queue cmd_buf arrays 2024-08-26 09:46:14 -07:00
ice_dcb_lib.c Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/linux 2025-05-12 18:48:27 -07:00
ice_dcb_lib.h iidc/ice/irdma: Update IDC to support multiple consumers 2025-05-09 11:35:43 -07:00
ice_dcb_nl.c ice: Replace ice specific DSCP mapping num with a kernel define 2025-04-30 13:09:08 -07:00
ice_dcb_nl.h
ice_dcb.c ice: Replace ice specific DSCP mapping num with a kernel define 2025-04-30 13:09:08 -07:00
ice_dcb.h
ice_ddp.c ice: fix Get Tx Topology AQ command error on E830 2025-04-28 15:59:13 -07:00
ice_ddp.h ice: support optional flags in signature segment header 2024-11-13 10:30:09 -08:00
ice_debugfs.c ice: check correct pointer in fwlog debugfs 2025-07-15 13:01:16 -07:00
ice_devids.h ice: update E830 device ids and comments 2024-05-06 09:18:48 -07:00
ice_dpll.c ice: add ref-sync dpll pins 2025-06-27 16:38:02 -07:00
ice_dpll.h ice: add ref-sync dpll pins 2025-06-27 16:38:02 -07:00
ice_eswitch_br.c ice: Flush FDB entries before reset 2024-10-08 14:08:19 -07:00
ice_eswitch_br.h ice: Flush FDB entries before reset 2024-10-08 14:08:19 -07:00
ice_eswitch.c ice: fix eswitch code memory leak in reset scenario 2025-06-17 10:09:24 -07:00
ice_eswitch.h ice: rename devlink_port.[ch] to port.[ch] 2024-12-17 09:32:08 -08:00
ice_ethtool_fdir.c ice: make const read-only array dflt_rules static 2025-04-11 11:58:57 -07:00
ice_ethtool.c eth: ice: drop the dead code related to rss_contexts 2025-07-08 11:56:40 -07:00
ice_ethtool.h ice: remove invalid parameter of equalizer 2025-01-24 10:49:42 -08:00
ice_fdir.c ice: Implement 'flow-type ether' rules 2024-04-12 10:34:24 -07:00
ice_fdir.h ice: change q_index variable type to s16 to store -1 value 2024-11-04 13:09:33 -08:00
ice_flex_pipe.c ice: enable FDIR filters from raw binary patterns for VFs 2024-08-13 14:51:29 -07:00
ice_flex_pipe.h ice: Cleanup unused declarations 2024-10-08 15:22:32 -07:00
ice_flex_type.h ice: Add support for PFCP hardware offload in switchdev 2024-04-01 10:49:29 +01:00
ice_flow.c net: intel: move RSS packet classifier types to libie 2025-06-09 09:56:18 -07:00
ice_flow.h net: intel: move RSS packet classifier types to libie 2025-06-09 09:56:18 -07:00
ice_fltr.c
ice_fltr.h
ice_fw_update.c ice: support FW Recovery Mode 2025-01-16 13:05:06 -08:00
ice_fw_update.h ice: Add tx_scheduling_layers devlink param 2024-04-22 13:05:19 -07:00
ice_fwlog.c ice: Fix debugfs with devlink reload 2024-02-12 10:12:42 -08:00
ice_fwlog.h
ice_gnss.c ice: Don't check device type when checking GNSS presence 2025-02-10 08:52:04 -08:00
ice_gnss.h ice: Don't check device type when checking GNSS presence 2025-02-10 08:52:04 -08:00
ice_hw_autogen.h ice: add functions to get and set Tx queue context 2025-07-10 14:33:33 -07:00
ice_hwmon.c ice: use proper macro for testing bit 2024-07-03 19:36:52 -07:00
ice_hwmon.h
ice_idc_int.h iidc/ice/irdma: Break iidc.h into two headers 2025-04-30 13:09:08 -07:00
ice_idc.c iidc/ice/irdma: Update IDC to support multiple consumers 2025-05-09 11:35:43 -07:00
ice_irq.c ice: Fix signedness bug in ice_init_interrupt_scheme() 2025-02-14 17:18:00 -08:00
ice_irq.h ice: simplify VF MSI-X managing 2025-02-05 09:04:57 -08:00
ice_lag.c ice: add NULL check in eswitch lag check 2025-07-15 13:01:15 -07:00
ice_lag.h ice: control default Tx rule in lag 2024-03-25 13:08:05 -07:00
ice_lan_tx_rx.h ice: Add E830 checksum offload support 2025-03-18 10:15:49 +01:00
ice_lib.c ice: move ice_vsi_update_l2tsel to ice_lib.c 2025-07-10 14:36:58 -07:00
ice_lib.h ice: move ice_vsi_update_l2tsel to ice_lib.c 2025-07-10 14:36:58 -07:00
ice_main.c ice: convert to ndo_hwtstamp_get() and ndo_hwtstamp_set() 2025-07-03 09:37:49 -07:00
ice_nvm.c ice: fix reads from NVM Shadow RAM on E830 and E825-C devices 2024-06-05 19:27:55 -07:00
ice_nvm.h ice: Add tx_scheduling_layers devlink param 2024-04-22 13:05:19 -07:00
ice_osdep.h ice: stop intermixing AQ commands/responses debug dumps 2024-08-26 09:40:44 -07:00
ice_parser_rt.c ice: fix ice_parser_rt::bst_key array size 2025-01-24 10:49:30 -08:00
ice_parser.c ice: add API for parser profile initialization 2024-08-13 14:51:28 -07:00
ice_parser.h ice: fix ice_parser_rt::bst_key array size 2025-01-24 10:49:30 -08:00
ice_pf_vsi_vlan_ops.c
ice_pf_vsi_vlan_ops.h
ice_protocol_type.h ice: Remove unused members from switch API 2024-07-11 09:40:56 -07:00
ice_ptp_consts.h ice: rename TSPLL and CGU functions and definitions 2025-06-18 08:59:22 -07:00
ice_ptp_hw.c ice: move TSPLL init calls to ice_ptp.c 2025-06-26 08:37:00 -07:00
ice_ptp_hw.h ice: rename TSPLL and CGU functions and definitions 2025-06-18 08:59:22 -07:00
ice_ptp.c ice: convert to ndo_hwtstamp_get() and ndo_hwtstamp_set() 2025-07-03 09:37:49 -07:00
ice_ptp.h ice: convert to ndo_hwtstamp_get() and ndo_hwtstamp_set() 2025-07-03 09:37:49 -07:00
ice_repr.c ice: enable LLDP TX for VFs through tc 2025-04-11 10:45:52 -07:00
ice_repr.h ice: check if SF is ready in ethtool ops 2024-09-06 11:01:24 -07:00
ice_sbq_cmd.h ice: refactor ice_sbq_msg_dev enum 2025-04-11 10:46:37 -07:00
ice_sched.c ice: fix rebuilding the Tx scheduler tree for large queue counts 2025-05-30 13:54:43 -07:00
ice_sched.h ice: Support 5 layer topology 2024-04-22 13:05:19 -07:00
ice_sf_eth.c ice: rename devlink_port.[ch] to port.[ch] 2024-12-17 09:32:08 -08:00
ice_sf_eth.h ice: subfunction activation and base devlink ops 2024-09-06 11:01:24 -07:00
ice_sf_vsi_vlan_ops.c ice: basic support for VLAN in subfunctions 2024-09-06 11:01:24 -07:00
ice_sf_vsi_vlan_ops.h ice: basic support for VLAN in subfunctions 2024-09-06 11:01:24 -07:00
ice_sriov.c ice: introduce ice_get_vf_by_dev() wrapper 2025-07-10 14:37:39 -07:00
ice_sriov.h ice: expose VF functions used by live migration 2025-07-10 14:36:58 -07:00
ice_switch.c ice: fix check for existing switch rule 2025-04-11 09:32:31 -07:00
ice_switch.h ice: Remove unused members from switch API 2024-07-11 09:40:56 -07:00
ice_tc_lib.c ice: improve error message for insufficient filter space 2025-04-11 11:58:57 -07:00
ice_tc_lib.h ice: enable LLDP TX for VFs through tc 2025-04-11 10:45:52 -07:00
ice_trace.h ice: Add tracepoint for adding and removing switch rules 2024-07-11 09:40:56 -07:00
ice_tspll.c ice: move TSPLL init calls to ice_ptp.c 2025-06-26 08:37:00 -07:00
ice_tspll.h ice: use designated initializers for TSPLL consts 2025-06-18 08:59:23 -07:00
ice_txrx_lib.c ice: Add E830 checksum offload support 2025-03-18 10:15:49 +01:00
ice_txrx_lib.h ice: stop storing XDP verdict within ice_rx_buf 2025-01-31 10:07:46 -08:00
ice_txrx.c ice: add a separate Rx handler for flow director commands 2025-06-09 09:56:18 -07:00
ice_txrx.h ice: add a separate Rx handler for flow director commands 2025-06-09 09:56:18 -07:00
ice_type.h ice: rename TSPLL and CGU functions and definitions 2025-06-18 08:59:22 -07:00
ice_vf_lib_private.h ice: Fix deinitializing VF in error path 2025-02-25 19:09:36 -08:00
ice_vf_lib.c ice: save RSS hash configuration for migration 2025-07-10 14:36:58 -07:00
ice_vf_lib.h ice: introduce ice_get_vf_by_dev() wrapper 2025-07-10 14:37:39 -07:00
ice_vf_mbx.c ice: add E830 HW VF mailbox message limit support 2024-10-08 14:37:15 -07:00
ice_vf_mbx.h ice: add E830 HW VF mailbox message limit support 2024-10-08 14:37:15 -07:00
ice_vf_vsi_vlan_ops.c ice: fix enabling RX VLAN filtering 2024-04-03 09:16:19 -07:00
ice_vf_vsi_vlan_ops.h
ice_virtchnl_allowlist.c net: intel: rename 'hena' to 'hashcfg' for clarity 2025-06-09 09:56:18 -07:00
ice_virtchnl_allowlist.h
ice_virtchnl_fdir.c treewide, timers: Rename from_timer() to timer_container_of() 2025-06-08 09:07:37 +02:00
ice_virtchnl_fdir.h ice: Add a per-VF limit on number of FDIR filters 2024-07-23 15:26:41 -07:00
ice_virtchnl.c ice: expose VF functions used by live migration 2025-07-10 14:36:58 -07:00
ice_virtchnl.h ice: expose VF functions used by live migration 2025-07-10 14:36:58 -07:00
ice_vlan_mode.c
ice_vlan_mode.h
ice_vlan.h
ice_vsi_vlan_lib.c ice: clear port vlan config during reset 2024-09-30 14:23:31 -07:00
ice_vsi_vlan_lib.h ice: clear port vlan config during reset 2024-09-30 14:23:31 -07:00
ice_vsi_vlan_ops.c ice: basic support for VLAN in subfunctions 2024-09-06 11:01:24 -07:00
ice_vsi_vlan_ops.h
ice_xsk.c ice: use generic unrolled_count() macro 2025-02-10 17:54:43 -08:00
ice_xsk.h ice: use generic unrolled_count() macro 2025-02-10 17:54:43 -08:00
ice.h ice: move TSPLL functions to a separate file 2025-06-18 08:59:22 -07:00
Makefile ice: move TSPLL functions to a separate file 2025-06-18 08:59:22 -07:00