OSDN Git Service

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Thu, 27 Jul 2023 22:21:46 +0000 (15:21 -0700)
committerJakub 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
drivers/net/dsa/qca/qca8k-8xxx.c
drivers/net/ethernet/freescale/fec_main.c
drivers/net/ethernet/intel/igc/igc_main.c
drivers/net/ethernet/stmicro/stmmac/dwmac4_lib.c
drivers/net/vxlan/vxlan_core.c
net/ipv6/addrconf.c
net/mptcp/protocol.c
tools/testing/selftests/net/mptcp/mptcp_join.sh

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge