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

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

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

mptcp: move crypto test to KUNIT

2020-06-26 16:21:39 -07:00

crypto.c

kunit: mptcp: adhere to KUNIT formatting standard

2021-04-16 17:10:40 -07:00

ctrl.c

mptcp: faster active backup recovery

2021-08-14 11:37:25 +01:00

diag.c

mptcp: allow dumping subflow context to userspace

2020-03-29 22:14:48 -07:00

Kconfig

kunit: mptcp: adhere to KUNIT formatting standard

2021-04-16 17:10:40 -07:00

Makefile

kunit: mptcp: adhere to KUNIT formatting standard

2021-04-16 17:10:40 -07:00

mib.c

mptcp: use batch snmp operations in mptcp_seq_show()

2021-09-30 14:17:10 +01:00

mib.h

mptcp: add the mibs for MP_FAIL

2021-08-25 11:02:35 +01:00

mptcp_diag.c

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

2021-09-30 14:49:21 -07:00

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

mptcp: Make mptcp_pm_nl_mp_prio_send_ack() static

2021-10-16 08:46:08 +01:00

pm.c

mptcp: MP_FAIL suboption receiving

2021-08-25 11:02:34 +01:00

protocol.c

tcp: factorize ip_summed setting

2021-10-28 12:44:39 +01:00

protocol.h

mptcp: allocate fwd memory separately on the rx and tx path

2021-10-27 18:20:29 -07:00

sockopt.c

mptcp: Avoid NULL dereference in mptcp_getsockopt_subflow_addrs()

2021-10-16 08:46:08 +01:00

subflow.c

mptcp: don't return sockets in foreign netns

2021-09-24 10:51:36 +01:00

syncookies.c

mptcp: don't return sockets in foreign netns

2021-09-24 10:51:36 +01:00

token_test.c

mptcp: don't return sockets in foreign netns

2021-09-24 10:51:36 +01:00

token.c

mptcp: don't return sockets in foreign netns

2021-09-24 10:51:36 +01:00