From: David S. Miller <davem@davemloft.net>
Date: Wed, 5 Jun 2024 12:42:55 +0000 (+0100)
Subject: Merge branch 'tcp-rto-min-us'
X-Git-Tag: v6.11-rc1~163^2~247
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=54751f4d5406760f46305725cc61fb72260971b6;p=users%2Fgriffoul%2Flinux.git

Merge branch 'tcp-rto-min-us'

Kevin Yang says:

====================
tcp: add sysctl_tcp_rto_min_us

Adding a sysctl knob to allow user to specify a default
rto_min at socket init time.

After this patch series, the rto_min will has multiple sources:
route option has the highest precedence, followed by the
TCP_BPF_RTO_MIN socket option, followed by this new
tcp_rto_min_us sysctl.

v3:
    fix typo, simplify min/max_t to min/max

v2:
    fit line width to 80 column.

v2: https://lore.kernel.org/netdev/20240530153436.2202800-1-yyd@google.com/
v1: https://lore.kernel.org/netdev/20240528171320.1332292-1-yyd@google.com/
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
---

54751f4d5406760f46305725cc61fb72260971b6