git.maquefel.me Git - linux.git/commit

projects / linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 28b17f6 50749f2)

author	Paolo Abeni <pabeni@redhat.com>
	Wed, 26 Apr 2023 08:17:46 +0000 (10:17 +0200)
committer	Paolo Abeni <pabeni@redhat.com>
	Wed, 26 Apr 2023 08:17:46 +0000 (10:17 +0200)
commit	c248b27cfc0a8a5fee93e000d47e659bca335d0f
tree	e4898df753acf2d2d9885844ea37b9f03ccf661c	tree \| snapshot
parent	28b17f6270f182e22cdad5a0fdc4979031e4486a	commit \| diff
parent	50749f2dd6854a41830996ad302aef2ffaf011d8	commit \| diff

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

No conflicts.

Signed-off-by: Paolo Abeni <pabeni@redhat.com>

17 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/freescale/dpaa/dpaa_eth.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/devlink.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en/rep/tc.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_rep.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/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h	diff1 \|	diff2 \|	blob \| history
net/core/skbuff.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ip_output.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_conntrack_bpf.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_conntrack_core.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_conntrack_netlink.c	diff1 \|	diff2 \|	blob \| history
net/netlink/af_netlink.c	diff1 \|	diff2 \|	blob \| history

ep93xx device tree rework repo: git://git.maquefel.me/linux.git