projects
/
linux-2.6-microblaze.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
bfc52de
aa0743a
)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
author
Jakub Kicinski
<kuba@kernel.org>
Fri, 23 Aug 2024 00:05:09 +0000
(17:05 -0700)
committer
Jakub Kicinski
<kuba@kernel.org>
Fri, 23 Aug 2024 00:06:18 +0000
(17:06 -0700)
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:
1
2
MAINTAINERS
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/bonding/bond_main.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/dsa/ocelot/felix.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/broadcom/bnxt/bnxt.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/broadcom/bnxt/bnxt.h
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/mellanox/mlx5/core/en.h
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/xilinx/xilinx_axienet.h
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/xilinx/xilinx_axienet_main.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/virtio_net.c
patch
|
diff1
|
diff2
|
blob
|
history
net/core/netpoll.c
patch
|
diff1
|
diff2
|
blob
|
history
net/mptcp/protocol.h
patch
|
diff1
|
diff2
|
blob
|
history
tools/testing/selftests/net/forwarding/lib.sh
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
MAINTAINERS
Simple merge
diff --cc
drivers/net/bonding/bond_main.c
Simple merge
diff --cc
drivers/net/dsa/ocelot/felix.c
Simple merge
diff --cc
drivers/net/ethernet/broadcom/bnxt/bnxt.c
Simple merge
diff --cc
drivers/net/ethernet/broadcom/bnxt/bnxt.h
Simple merge
diff --cc
drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
Simple merge
diff --cc
drivers/net/ethernet/mellanox/mlx5/core/en.h
Simple merge
diff --cc
drivers/net/ethernet/xilinx/xilinx_axienet.h
Simple merge
diff --cc
drivers/net/ethernet/xilinx/xilinx_axienet_main.c
Simple merge
diff --cc
drivers/net/virtio_net.c
Simple merge
diff --cc
net/core/netpoll.c
Simple merge
diff --cc
net/mptcp/protocol.h
Simple merge
diff --cc
tools/testing/selftests/net/forwarding/lib.sh
Simple merge