public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-08-04 00:06:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
linux/drivers/net/ethernet/intel/ice
History
Jakub Kicinski 2bd87951de Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 
Cross-merge networking fixes after downstream PR.

Conflicts:

drivers/net/ethernet/ti/icssg/icssg_prueth.c

net/mac80211/chan.c
  89884459a0 ("wifi: mac80211: fix idle calculation with multi-link")
  87f5500285 ("wifi: mac80211: simplify ieee80211_assign_link_chanctx()")
https://lore.kernel.org/all/20240422105623.7b1fbda2@canb.auug.org.au/

net/unix/garbage.c
  1971d13ffa ("af_unix: Suppress false-positive lockdep splat for spin_lock() in __unix_gc().")
  4090fa373f ("af_unix: Replace garbage collection algorithm.")

drivers/net/ethernet/ti/icssg/icssg_prueth.c
drivers/net/ethernet/ti/icssg/icssg_common.c
  4dcd0e83ea ("net: ti: icssg-prueth: Fix signedness bug in prueth_init_rx_chns()")
  e2dc7bfd67 ("net: ti: icssg-prueth: Move common functions into a separate file")

No adjacent changes.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2024-04-25 12:41:37 -07:00
..
devlink ice: Add tx_scheduling_layers devlink param 2024-04-22 13:05:19 -07:00
ice.h ice: store VF relative MSI-X index in q_vector->vf_reg_idx 2024-04-12 10:34:29 -07:00
ice_adapter.c ice: avoid the PTP hardware semaphore in gettimex64 path 2024-04-01 08:58:09 -07:00
ice_adapter.h ice: avoid the PTP hardware semaphore in gettimex64 path 2024-04-01 08:58:09 -07:00
ice_adminq_cmd.h ice: Add tx_scheduling_layers devlink param 2024-04-22 13:05:19 -07:00
ice_arfs.c net: introduce include/net/rps.h 2024-03-07 21:12:43 -08:00
ice_arfs.h
ice_base.c ice: store VF relative MSI-X index in q_vector->vf_reg_idx 2024-04-12 10:34:29 -07:00
ice_base.h ice: make ice_vsi_cfg_txq() static 2024-02-02 09:13:13 -08:00
ice_cgu_regs.h
ice_common.c ice: Support 5 layer topology 2024-04-22 13:05:19 -07:00
ice_common.h ice: cleanup line splitting for context set functions 2024-03-04 10:28:15 -08:00
ice_controlq.c ice: Add helper function ice_is_generic_mac 2024-02-12 10:06:18 -08:00
ice_controlq.h
ice_dcb.c ice: cleanup inconsistent code 2023-12-18 11:20:43 -08:00
ice_dcb.h
ice_dcb_lib.c ice: move ice_devlink.[ch] to devlink folder 2024-04-01 08:58:09 -07:00
ice_dcb_lib.h
ice_dcb_nl.c ice: field get conversion 2023-12-18 11:20:43 -08:00
ice_dcb_nl.h
ice_ddp.c ice: Support 5 layer topology 2024-04-22 13:05:19 -07:00
ice_ddp.h ice: Support 5 layer topology 2024-04-22 13:05:19 -07:00
ice_debugfs.c ice: Fix debugfs with devlink reload 2024-02-12 10:12:42 -08:00
ice_devids.h ice: introduce new E825C devices family 2024-02-12 09:57:06 -08:00
ice_dpll.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2024-03-07 10:29:36 -08:00
ice_dpll.h
ice_eswitch.c ice: move ice_devlink.[ch] to devlink folder 2024-04-01 08:58:09 -07:00
ice_eswitch.h ice: do switchdev slow-path Rx using PF VSI 2024-03-25 13:08:47 -07:00
ice_eswitch_br.c
ice_eswitch_br.h
ice_ethtool.c ice: Fix freeing uninitialized pointers 2024-04-03 09:15:18 -07:00
ice_ethtool.h
ice_ethtool_fdir.c ice: Implement 'flow-type ether' rules 2024-04-12 10:34:24 -07:00
ice_fdir.c ice: Implement 'flow-type ether' rules 2024-04-12 10:34:24 -07:00
ice_fdir.h ice: Implement 'flow-type ether' rules 2024-04-12 10:34:24 -07:00
ice_flex_pipe.c ice: field prep conversion 2023-12-18 11:20:26 -08:00
ice_flex_pipe.h
ice_flex_type.h ice: Add support for PFCP hardware offload in switchdev 2024-04-01 10:49:29 +01:00
ice_flow.c
ice_flow.h ice: Implement RSS settings for GTP using ethtool 2024-03-06 09:31:49 -08:00
ice_fltr.c
ice_fltr.h
ice_fw_update.c ice: Add tx_scheduling_layers devlink param 2024-04-22 13:05:19 -07: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: add ability to read and configure FW log data 2023-12-14 09:50:58 -08:00
ice_gnss.c
ice_gnss.h
ice_hw_autogen.h ice: Enable SW interrupt from FW for LL TS 2024-01-02 11:18:32 -08:00
ice_hwmon.c
ice_hwmon.h
ice_idc.c
ice_idc_int.h
ice_irq.c
ice_irq.h
ice_lag.c Merge branch '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue 2024-03-28 22:50:22 -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_lib.c ice: move devlink port code to a separate file 2024-04-01 09:06:28 -07:00
ice_lib.h ice: do not disable Tx queues twice in ice_down() 2024-03-04 10:33:44 -08:00
ice_main.c ice: Enable switching default Tx scheduler topology 2024-04-22 13:05:19 -07:00
ice_nvm.c ice: Add tx_scheduling_layers devlink param 2024-04-22 13:05:19 -07:00
ice_nvm.h ice: Add tx_scheduling_layers devlink param 2024-04-22 13:05:19 -07:00
ice_osdep.h net: intel: fix old compiler regressions 2024-02-07 09:15:27 -08:00
ice_pf_vsi_vlan_ops.c
ice_pf_vsi_vlan_ops.h
ice_protocol_type.h ice: Add support for PFCP hardware offload in switchdev 2024-04-01 10:49:29 +01:00
ice_ptp.c ice: fold ice_ptp_read_time into ice_ptp_gettimex64 2024-04-01 08:58:09 -07:00
ice_ptp.h ice: factor out ice_ptp_rebuild_owner() 2024-01-30 11:49:04 +01:00
ice_ptp_consts.h
ice_ptp_hw.c ice: avoid the PTP hardware semaphore in gettimex64 path 2024-04-01 08:58:09 -07:00
ice_ptp_hw.h ice: Enable SW interrupt from FW for LL TS 2024-01-02 11:18:32 -08:00
ice_repr.c ice: Remove ndo_get_phys_port_name 2024-04-17 09:40:33 -07:00
ice_repr.h ice: count representor stats 2024-03-25 13:09:36 -07:00
ice_sbq_cmd.h
ice_sched.c ice: Adjust the VSI/Aggregator layers 2024-04-22 13:05:19 -07:00
ice_sched.h ice: Support 5 layer topology 2024-04-22 13:05:19 -07:00
ice_sriov.c ice: Add automatic VF reset on Tx MDD events 2024-04-17 08:57:21 -07:00
ice_sriov.h ice: Add automatic VF reset on Tx MDD events 2024-04-17 08:57:21 -07:00
ice_switch.c ice: Add switch recipe reusing feature 2024-04-01 08:58:09 -07:00
ice_switch.h ice: Add switch recipe reusing feature 2024-04-01 08:58:09 -07:00
ice_tc_lib.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2024-04-18 13:12:24 -07:00
ice_tc_lib.h ice: Add support for PFCP hardware offload in switchdev 2024-04-01 10:49:29 +01:00
ice_trace.h
ice_txrx.c net: remove gfp_mask from napi_alloc_skb() 2024-03-28 18:30:40 -07:00
ice_txrx.h ice: do switchdev slow-path Rx using PF VSI 2024-03-25 13:08:47 -07:00
ice_txrx_lib.c ice: count representor stats 2024-03-25 13:09:36 -07:00
ice_txrx_lib.h ice: work on pre-XDP prog frag count 2024-01-24 16:24:06 -08:00
ice_type.h ice: Support 5 layer topology 2024-04-22 13:05:19 -07:00
ice_vf_lib.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2024-04-25 12:41:37 -07:00
ice_vf_lib.h ice: remove vf->lan_vsi_num field 2024-03-04 10:25:07 -08:00
ice_vf_lib_private.h ice: replace ice_vf_recreate_vsi() with ice_vf_reconfig_vsi() 2024-01-02 11:18:32 -08:00
ice_vf_mbx.c
ice_vf_mbx.h
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.c ice: store VF relative MSI-X index in q_vector->vf_reg_idx 2024-04-12 10:34:29 -07:00
ice_virtchnl.h ice: use relative VSI index for VFs instead of PF VSI number 2024-03-04 10:24:13 -08:00
ice_virtchnl_allowlist.c ice: virtchnl: stop pretending to support RSS over AQ or registers 2024-03-05 09:49:21 -08:00
ice_virtchnl_allowlist.h
ice_virtchnl_fdir.c ice: remove unnecessary duplicate checks for VF VSI ID 2024-03-04 10:23:19 -08:00
ice_virtchnl_fdir.h
ice_vlan.h
ice_vlan_mode.c
ice_vlan_mode.h
ice_vsi_vlan_lib.c ice: fix pre-shifted bit usage 2023-12-18 11:20:43 -08:00
ice_vsi_vlan_lib.h
ice_vsi_vlan_ops.c ice: remove switchdev control plane VSI 2024-03-25 13:08:05 -07:00
ice_vsi_vlan_ops.h
ice_xsk.c net: remove gfp_mask from napi_alloc_skb() 2024-03-28 18:30:40 -07:00
ice_xsk.h
Makefile ice: move devlink port code to a separate file 2024-04-01 09:06:28 -07:00