Skip to content
Commit 816cd168 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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

include/net/sock.h
  310731e2 ("net: Fix data-races around sysctl_mem.")
  e70f3c70 ("Revert "net: set SK_MEM_QUANTUM to 4096"")
https://lore.kernel.org/all/20220711120211.7c8b7cba@canb.auug.org.au/



net/ipv4/fib_semantics.c
  747c1430 ("ip: fix dflt addr selection for connected nexthop")
  d62607c3 ("net: rename reference+tracking helpers")

net/tls/tls.h
include/net/tls.h
  3d8c51b2 ("net/tls: Check for errors in tls_device_init")
  58790314 ("tls: create an internal header")

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents b126047f db886979
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment