projects / linux-2.6-microblaze.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: bfc52de aa0743a)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Fri, 23 Aug 2024 00:05:09 +0000 (17:05 -0700)
committerJakub Kicinski <kuba@kernel.org>
Fri, 23 Aug 2024 00:06:18 +0000 (17:06 -0700)
commit761d527d5d0036b98a2cecf4de1293d84d452aa1
tree077007afc1704c75f7e733c69bfd1603b8c8e0dftree
parentbfc52deef5ed58d92cfbe68dbceee3102617a8dfcommit | diff
parentaa0743a229366e8c1963f1b72a1c974a9d15f08fcommit | diff
Merge git://git./linux/kernel/git/netdev/net

Cross-merge networking fixes after downstream PR.

No conflicts.

Adjacent changes:

drivers/net/ethernet/broadcom/bnxt/bnxt.h
  c948c0973df5 ("bnxt_en: Don't clear ntuple filters and rss contexts during ethtool ops")
  f2878cdeb754 ("bnxt_en: Add support to call FW to update a VNIC")

Link: https://patch.msgid.link/20240822210125.1542769-1-kuba@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
13 files changed:
MAINTAINERS diff1 | diff2 | blob | history
drivers/net/bonding/bond_main.c diff1 | diff2 | blob | history
drivers/net/dsa/ocelot/felix.c diff1 | diff2 | blob | history
drivers/net/ethernet/broadcom/bnxt/bnxt.c diff1 | diff2 | blob | history
drivers/net/ethernet/broadcom/bnxt/bnxt.h diff1 | diff2 | blob | history
drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/en.h diff1 | diff2 | blob | history
drivers/net/ethernet/xilinx/xilinx_axienet.h diff1 | diff2 | blob | history
drivers/net/ethernet/xilinx/xilinx_axienet_main.c diff1 | diff2 | blob | history
drivers/net/virtio_net.c diff1 | diff2 | blob | history
net/core/netpoll.c diff1 | diff2 | blob | history
net/mptcp/protocol.h diff1 | diff2 | blob | history
tools/testing/selftests/net/forwarding/lib.sh diff1 | diff2 | blob | history
MicroBlaze GIT Repository