git.samba.org / sfrench / cifs-2.6.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5a78a81 7c5e046)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorPaolo Abeni <pabeni@redhat.com>
Thu, 21 Dec 2023 21:17:23 +0000 (22:17 +0100)
committerPaolo Abeni <pabeni@redhat.com>
Thu, 21 Dec 2023 21:17:23 +0000 (22:17 +0100)
commit56794e5358542b7c652f202946e53bfd2373b5e0
treebf508c78138c8be82a2e306f2267d7ef6e3f79c3tree
parent5a78a8121c4d8e37035274c094e3af15fb79f004commit | diff
parent7c5e046bdcb2513f9decb3765d8bf92d604279cfcommit | diff
Merge git://git./linux/kernel/git/netdev/net

Cross-merge networking fixes after downstream PR.

Adjacent changes:

drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c
  23c93c3b6275 ("bnxt_en: do not map packet buffers twice")
  6d1add95536b ("bnxt_en: Modify TX ring indexing logic.")

tools/testing/selftests/net/Makefile
  2258b666482d ("selftests: add vlan hw filter tests")
  a0bc96c0cd6e ("selftests: net: verify fq per-band packet limit")

Signed-off-by: Paolo Abeni <pabeni@redhat.com>
26 files changed:
MAINTAINERS diff1 | diff2 | blob | history
drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/i40e/i40e_register.h diff1 | diff2 | blob | history
drivers/net/ethernet/intel/i40e/i40e_type.h diff1 | diff2 | blob | history
drivers/net/ethernet/intel/ice/ice_ethtool.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/ice/ice_lib.c diff1 | diff2 | blob | history
drivers/net/ethernet/mediatek/mtk_wed_wo.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/en_rep.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c diff1 | diff2 | blob | history
drivers/net/phy/phy_device.c diff1 | diff2 | blob | history
drivers/net/wireless/intel/iwlwifi/pcie/rx.c diff1 | diff2 | blob | history
drivers/net/wireless/intel/iwlwifi/pcie/trans.c diff1 | diff2 | blob | history
drivers/net/wireless/mediatek/mt76/dma.c diff1 | diff2 | blob | history
include/linux/ieee80211.h diff1 | diff2 | blob | history
include/net/sock.h diff1 | diff2 | blob | history
net/core/dev.c diff1 | diff2 | blob | history
net/core/skbuff.c diff1 | diff2 | blob | history
net/mac80211/cfg.c diff1 | diff2 | blob | history
net/mac80211/mlme.c diff1 | diff2 | blob | history
net/mptcp/protocol.h diff1 | diff2 | blob | history
tools/testing/selftests/Makefile diff1 | diff2 | blob | history
tools/testing/selftests/bpf/config.x86_64 diff1 | diff2 | blob | history
tools/testing/selftests/net/Makefile diff1 | diff2 | blob | history
tools/testing/selftests/net/mptcp/mptcp_join.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.