mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/
synced 2026-11-15 19:56:03 +00:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
include/net/sock.h7b50ecfcc6("net: Rename ->stream_memory_read to ->sock_is_readable")4c1e34c0db("vsock: Enable y2038 safe timeval for timeout") drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c0daa55d033("octeontx2-af: cn10k: debugfs for dumping LMTST map table")e77bcdd1f6("octeontx2-af: Display all enabled PF VF rsrc_alloc entries.") Adjacent code addition in both cases, keep both. Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
commit
7df621a3ee
164 changed files with 1603 additions and 922 deletions
Loading…
Add table
Add a link
Reference in a new issue