From: Jakub Kicinski <kuba@kernel.org>
Date: Thu, 18 Apr 2024 20:10:20 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
X-Git-Tag: net-accept-more-20240515~4^2~195
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=41e3ddb291b8578c5c3b44def9cf3892fbc51838;p=linux-block.git

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>
---

41e3ddb291b8578c5c3b44def9cf3892fbc51838