linux

mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-12-29 17:04:44 -05:00

Files

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

Cross-merge networking fixes after downstream PR.

Conflicts:

drivers/net/ethernet/broadcom/bnxt/bnxt.c
  f7ce5eb2cb ("bnxt_en: Fix crash in bnxt_get_max_rss_ctx_ring()")
  20c8ad72eb ("eth: bnxt: use the RSS context XArray instead of the local list")

Adjacent changes:

net/ethtool/ioctl.c
  503757c809 ("net: ethtool: Fix RSS setting")
  eac9122f0c ("net: ethtool: record custom RSS contexts in the XArray")

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

2024-07-12 22:20:30 -07:00

events

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

2024-07-12 22:20:30 -07:00

misc

NFS/knfsd: Remove the invalid NFS error 'NFSERR_OPNOTSUPP'

2024-05-06 12:47:24 -04:00

stages

tracing/treewide: Remove second parameter of __assign_str()

2024-05-22 20:14:47 -04:00

bpf_probe.h

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