projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9d0cd5d
57012c5
)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
author
Jakub Kicinski
<kuba@kernel.org>
Thu, 27 Jul 2023 22:21:46 +0000
(15:21 -0700)
committer
Jakub Kicinski
<kuba@kernel.org>
Thu, 27 Jul 2023 22:22:46 +0000
(15:22 -0700)
Cross-merge networking fixes after downstream PR.
No conflicts or adjacent changes.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1
2
MAINTAINERS
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/dsa/qca/qca8k-8xxx.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/freescale/fec_main.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/intel/igc/igc_main.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/stmicro/stmmac/dwmac4_lib.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/vxlan/vxlan_core.c
patch
|
diff1
|
diff2
|
blob
|
history
net/ipv6/addrconf.c
patch
|
diff1
|
diff2
|
blob
|
history
net/mptcp/protocol.c
patch
|
diff1
|
diff2
|
blob
|
history
tools/testing/selftests/net/mptcp/mptcp_join.sh
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
MAINTAINERS
Simple merge
diff --cc
drivers/net/dsa/qca/qca8k-8xxx.c
Simple merge
diff --cc
drivers/net/ethernet/freescale/fec_main.c
Simple merge
diff --cc
drivers/net/ethernet/intel/igc/igc_main.c
Simple merge
diff --cc
drivers/net/ethernet/stmicro/stmmac/dwmac4_lib.c
Simple merge
diff --cc
drivers/net/vxlan/vxlan_core.c
Simple merge
diff --cc
net/ipv6/addrconf.c
Simple merge
diff --cc
net/mptcp/protocol.c
Simple merge
diff --cc
tools/testing/selftests/net/mptcp/mptcp_join.sh
Simple merge