linux

mirror of https://github.com/raspberrypi/linux.git synced 2025-12-27 20:42:52 +00:00

Files

Jakub Kicinski 41e3ddb291 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
  386f4a7379 ("trace: events: cleanup deprecated strncpy uses")
  a4833e3aba ("SUNRPC: Fix rpcgss_context trace event acceptor field")

Adjacent changes:

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

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

2024-04-18 13:12:24 -07:00

events

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

2024-04-18 13:12:24 -07:00

misc

Merge tag 'nfs-for-6.9-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

2024-03-16 11:44:00 -07:00

stages

tracing: Just use strcmp() for testing __string() and __assign_str() match

2024-03-19 11:23:30 -07:00

bpf_probe.h

bpf: pass whole link instead of prog when triggering raw tracepoint