diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2024-04-18 23:10:20 +0300 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2024-04-18 23:12:24 +0300 |
| commit | 41e3ddb291b8578c5c3b44def9cf3892fbc51838 (patch) | |
| tree | fcca07ee3e511f97ed837aee324476e4ad3a8cd7 /net/unix/sysctl_net_unix.c | |
| parent | aa37f8916d20cf58437d507fc9599492a342b3cd (diff) | |
| parent | 7586c8501d090609c6eb1af6ba05e3ed68806c83 (diff) | |
| download | linux-41e3ddb291b8578c5c3b44def9cf3892fbc51838.tar.xz | |
Merge git://git.kernel.org/pub/scm/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>
Diffstat (limited to 'net/unix/sysctl_net_unix.c')
0 files changed, 0 insertions, 0 deletions