Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Thu, 18 Apr 2024 20:10:20 +0000 (13:10 -0700)
committerJakub Kicinski <kuba@kernel.org>
Thu, 18 Apr 2024 20:12:24 +0000 (13:12 -0700)
commit41e3ddb291b8578c5c3b44def9cf3892fbc51838
treefcca07ee3e511f97ed837aee324476e4ad3a8cd7
parentaa37f8916d20cf58437d507fc9599492a342b3cd
parent7586c8501d090609c6eb1af6ba05e3ed68806c83
Merge git://git./linux/kernel/git/netdev/net

Cross-merge networking fixes after downstream PR.

Conflicts:

include/trace/events/rpcgss.h
  386f4a737964 ("trace: events: cleanup deprecated strncpy uses")
  a4833e3abae1 ("SUNRPC: Fix rpcgss_context trace event acceptor field")

Adjacent changes:

drivers/net/ethernet/intel/ice/ice_tc_lib.c
  2cca35f5dd78 ("ice: Fix checking for unsupported keys on non-tunnel device")
  784feaa65dfd ("ice: Add support for PFCP hardware offload in switchdev")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
17 files changed:
MAINTAINERS
drivers/net/dsa/mt7530.c
drivers/net/ethernet/intel/ice/ice_tc_lib.c
drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
drivers/net/ethernet/mellanox/mlx5/core/en_main.c
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
drivers/net/ethernet/microchip/sparx5/sparx5_tc_flower.c
drivers/net/ethernet/renesas/ravb_main.c
drivers/net/ethernet/stmicro/stmmac/common.h
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
drivers/net/ethernet/ti/am65-cpsw-nuss.c
drivers/net/usb/ax88179_178a.c
drivers/net/usb/qmi_wwan.c
include/net/sch_generic.h
net/bridge/br_netfilter_hooks.c
net/core/dev.c
net/unix/af_unix.c