www.infradead.org Git - users/jedix/linux-maple.git/commit

]> www.infradead.org Git - users/jedix/linux-maple.git/commit

projects / users / jedix / linux-maple.git / commit

author	Jakub Kicinski <kuba@kernel.org>
	Thu, 15 May 2025 18:22:32 +0000 (11:22 -0700)
committer	Jakub Kicinski <kuba@kernel.org>
	Thu, 15 May 2025 18:28:30 +0000 (11:28 -0700)
commit	bebd7b262638af611a0e699ba37c43ec2238801b
tree	361c8116078d4923b630a5bff78614d136ba5716	tree
parent	21c608a88f4fdd55180a228ca297206ef588847c	commit \| diff
parent	ef935650e044fc742b531bf85cc315ff7aa781ea	commit \| diff

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Cross-merge networking fixes after downstream PR (net-6.15-rc7).

Conflicts:

tools/testing/selftests/drivers/net/hw/ncdevmem.c
  97c4e094a4b2 ("tests/ncdevmem: Fix double-free of queue array")
  2f1a805f32ba ("selftests: ncdevmem: Implement devmem TCP TX")
https://lore.kernel.org/20250514122900.1e77d62d@canb.auug.org.au

Adjacent changes:

net/core/devmem.c
net/core/devmem.h
  0afc44d8cdf6 ("net: devmem: fix kernel panic when netlink socket close after module unload")
  bd61848900bf ("net: devmem: Implement TX path")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

18 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/dsa/b53/b53_common.c	diff1 \|	diff2 \|	blob \| history
drivers/net/dsa/b53/b53_regs.h	diff1 \|	diff2 \|	blob \| history
drivers/net/dsa/microchip/ksz_common.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnxt/bnxt.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mediatek/mtk_eth_soc.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/wangxun/libwx/wx_hw.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/wangxun/txgbe/txgbe_type.h	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/micrel.c	diff1 \|	diff2 \|	blob \| history
include/net/sch_generic.h	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/core/devmem.c	diff1 \|	diff2 \|	blob \| history
net/core/devmem.h	diff1 \|	diff2 \|	blob \| history
net/core/netdev-genl.c	diff1 \|	diff2 \|	blob \| history
tools/net/ynl/pyynl/ynl_gen_c.py	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/Makefile	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/drivers/net/hw/ncdevmem.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/dsa/b53/b53_common.c	diff1 \|	diff2 \|	blob \| history
drivers/net/dsa/b53/b53_regs.h	diff1 \|	diff2 \|	blob \| history
drivers/net/dsa/microchip/ksz_common.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnxt/bnxt.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mediatek/mtk_eth_soc.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/wangxun/libwx/wx_hw.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/wangxun/txgbe/txgbe_type.h	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/micrel.c	diff1 \|	diff2 \|	blob \| history
include/net/sch_generic.h	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/core/devmem.c	diff1 \|	diff2 \|	blob \| history
net/core/devmem.h	diff1 \|	diff2 \|	blob \| history
net/core/netdev-genl.c	diff1 \|	diff2 \|	blob \| history
tools/net/ynl/pyynl/ynl_gen_c.py	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/Makefile	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/drivers/net/hw/ncdevmem.c	diff1 \|	diff2 \|	blob \| history