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

include/net/sock.h
  7b50ecfc ("net: Rename ->stream_memory_read to ->sock_is_readable")
  4c1e34c0 ("vsock: Enable y2038 safe timeval for timeout")

drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c
  0daa55d0 ("octeontx2-af: cn10k: debugfs for dumping LMTST map table")
  e77bcdd1 ("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>