From: David S. Miller Date: Fri, 1 Jul 2022 12:25:00 +0000 (+0100) Subject: Merge branch 'mptcp-mem-scheduling' X-Git-Tag: v6.1-rc5~731^2~230 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=13463f731fbbadbd6d7610600d4924c3707e4ecd;p=platform%2Fkernel%2Flinux-starfive.git Merge branch 'mptcp-mem-scheduling' Mat Martineau says: ==================== mptcp: Updates for mem scheduling and SK_RECLAIM In the "net: reduce tcp_memory_allocated inflation" series (merge commit e10b02ee5b6c), Eric Dumazet noted that "Removal of SK_RECLAIM_CHUNK and SK_RECLAIM_THRESHOLD is left to MPTCP maintainers as a follow up." Patches 1-3 align MPTCP with the above TCP changes to forward memory allocation, reclaim, and memory scheduling. Patch 4 removes the SK_RECLAIM_* macros as Eric requested. ==================== Signed-off-by: David S. Miller --- 13463f731fbbadbd6d7610600d4924c3707e4ecd