git.monstr.eu Git - linux-2.6-microblaze.git/commit

projects / linux-2.6-microblaze.git / commit

author	Jakub Kicinski <kuba@kernel.org>
	Thu, 5 Dec 2024 19:48:58 +0000 (11:48 -0800)
committer	Jakub Kicinski <kuba@kernel.org>
	Sat, 4 Jan 2025 00:29:29 +0000 (16:29 -0800)
commit	385f186aba3d2f7122b71d6d4c7e236b9d4e8003
tree	f1e2a0433b260b137b5eb37e9d48588f5d5643bf	tree
parent	3fff5da4ca2164bb4d0f1e6cd33f6eb8a0e73e50	commit \| diff
parent	aba74e639f8d76d29b94991615e33319d7371b63	commit \| diff

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

Cross-merge networking fixes after downstream PR (net-6.13-rc6).

No conflicts.

Adjacent changes:

include/linux/if_vlan.h
f91a5b808938 ("af_packet: fix vlan_get_protocol_dgram() vs MSG_PEEK")
3f330db30638 ("net: reformat kdoc return statements")

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

12 files changed:

MicroBlaze GIT Repository

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
Makefile	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c	diff1 \|	diff2 \|	blob \| history
include/linux/if_vlan.h	diff1 \|	diff2 \|	blob \| history
include/linux/mlx5/mlx5_ifc.h	diff1 \|	diff2 \|	blob \| history
include/net/sock.h	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/core/filter.c	diff1 \|	diff2 \|	blob \| history
net/core/sock.c	diff1 \|	diff2 \|	blob \| history
net/packet/af_packet.c	diff1 \|	diff2 \|	blob \| history