diff options
author | Jakub Kicinski <kuba@kernel.org> | 2025-06-12 10:08:24 -0700 |
---|---|---|
committer | Jakub Kicinski <kuba@kernel.org> | 2025-08-29 11:48:01 -0700 |
commit | d23ad54de795ec0054f90ecb03b41e8f2c410f3a (patch) | |
tree | 93ee9c1bfac4b54c567cc613039d4898cac04871 /drivers/net/ethernet/intel/ice/ice_txrx.h | |
parent | 29828b81a46a3ae55ebc053fce512219172560ba (diff) | |
parent | 9c736ace0666efe68efd53fcdfa2c6653c3e0e72 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR (net-6.17-rc4).
No conflicts.
Adjacent changes:
drivers/net/ethernet/intel/idpf/idpf_txrx.c
02614eee26fb ("idpf: do not linearize big TSO packets")
6c4e68480238 ("idpf: remove obsolete stashing code")
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/net/ethernet/intel/ice/ice_txrx.h')
0 files changed, 0 insertions, 0 deletions