diff options
author | 2022-12-08 16:07:53 -0800 | |
---|---|---|
committer | 2022-12-08 18:19:59 -0800 | |
commit | 837e8ac871499d337212e2161c046f5adf1bad33 (patch) | |
tree | 2d7bb495b5ce2bce04bf18afd6a57116391efabc /net/core/sock.c | |
parent | Merge branch 'mlx4-better-big-tcp-support' (diff) | |
parent | Merge tag 'net-6.1-rc9' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net (diff) | |
download | wireguard-linux-837e8ac871499d337212e2161c046f5adf1bad33.tar.xz wireguard-linux-837e8ac871499d337212e2161c046f5adf1bad33.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
No conflicts.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/core/sock.c')
0 files changed, 0 insertions, 0 deletions