git.kernel.dk Git - linux-block.git/commit

projects / linux-block.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: dc9dfd8 aea27a9)

author	Jakub Kicinski <kuba@kernel.org>
	Tue, 14 May 2024 17:52:25 +0000 (10:52 -0700)
committer	Jakub Kicinski <kuba@kernel.org>
	Tue, 14 May 2024 17:53:19 +0000 (10:53 -0700)
commit	654de42f3fc6edc29d743c1dbcd1424f7793f63d
tree	926a117748f1789c60a9404e14da451975c21a69	tree \| snapshot
parent	dc9dfd8ae4b5ac28e457a830556b53b15f4b9a1c	commit \| diff
parent	aea27a92a41dae14843f92c79e9e42d8f570105c	commit \| diff

Merge git://git./linux/kernel/git/netdev/net

Merge in late fixes to prepare for the 6.10 net-next PR.

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

17 files changed:

drivers/net/ethernet/cortina/gemini.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/ice/ice_ddp.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mediatek/mtk_eth_soc.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mediatek/mtk_eth_soc.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/eswitch.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/sun/sungem.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/micrel.c	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/ax88179_178a.c	diff1 \|	diff2 \|	blob \| history
include/linux/mlx5/driver.h	diff1 \|	diff2 \|	blob \| history
include/net/ax25.h	diff1 \|	diff2 \|	blob \| history
kernel/bpf/syscall.c	diff1 \|	diff2 \|	blob \| history
net/ax25/ax25_dev.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/devinet.c	diff1 \|	diff2 \|	blob \| history
net/unix/af_unix.c	diff1 \|	diff2 \|	blob \| history

Linux 6.x block layer and io_uring tree(s)