Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorPaolo Abeni <pabeni@redhat.com>
Wed, 26 Apr 2023 08:17:46 +0000 (10:17 +0200)
committerPaolo Abeni <pabeni@redhat.com>
Wed, 26 Apr 2023 08:17:46 +0000 (10:17 +0200)
commitc248b27cfc0a8a5fee93e000d47e659bca335d0f
treee4898df753acf2d2d9885844ea37b9f03ccf661c
parent28b17f6270f182e22cdad5a0fdc4979031e4486a
parent50749f2dd6854a41830996ad302aef2ffaf011d8
Merge git://git./linux/kernel/git/netdev/net

No conflicts.

Signed-off-by: Paolo Abeni <pabeni@redhat.com>
17 files changed:
MAINTAINERS
drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
drivers/net/ethernet/mellanox/mlx5/core/devlink.c
drivers/net/ethernet/mellanox/mlx5/core/en/rep/tc.c
drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c
drivers/net/ethernet/mellanox/mlx5/core/en_main.c
drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
drivers/net/ethernet/mellanox/mlx5/core/eswitch.h
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
drivers/net/ethernet/mellanox/mlx5/core/main.c
drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h
net/core/skbuff.c
net/ipv4/ip_output.c
net/netfilter/nf_conntrack_bpf.c
net/netfilter/nf_conntrack_core.c
net/netfilter/nf_conntrack_netlink.c
net/netlink/af_netlink.c