linux-mainline/net/mptcp
Jakub Kicinski 7df621a3ee Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
include/net/sock.h
  7b50ecfcc6 ("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.c
  0daa55d033 ("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>
2021-10-28 10:43:58 -07:00
..
crypto_test.c
crypto.c
ctrl.c
diag.c
Kconfig
Makefile
mib.c
mib.h
mptcp_diag.c
options.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2021-10-28 10:43:58 -07:00
pm_netlink.c
pm.c
protocol.c tcp: factorize ip_summed setting 2021-10-28 12:44:39 +01:00
protocol.h
sockopt.c
subflow.c
syncookies.c
token_test.c
token.c