From: Neal Cardwell ncardwell@google.com Date: Tue, 2 Jan 2018 14:11:25 -0500
Looks like these 2 patches will cherry-pick cleanly if cherry-picked in the following sequence, on top of 4.9.74-rc1, which already has 6c9e73ef9aa7 ("tcp_bbr: record "full bw reached" decision in new full_bw_reached bit"):
$ git checkout linux-stable-rc/linux-4.9.y
$ git cherry-pick 2f6c498e4f15 Performing inexact rename detection: 100% (17803152/17803152), done. [detached HEAD 0982234c57e1] tcp_bbr: reset full pipe detection on loss recovery undo Date: Thu Dec 7 12:43:31 2017 -0500 1 file changed, 4 insertions(+)
$ git cherry-pick 600647d467c6 Performing inexact rename detection: 100% (17803152/17803152), done. [detached HEAD 7e866eccd083] tcp_bbr: reset long-term bandwidth sampling on loss recovery undo Date: Thu Dec 7 12:43:32 2017 -0500 1 file changed, 1 insertion(+)
$ git log --oneline --decorate | head -3 7e866eccd083 (HEAD) tcp_bbr: reset long-term bandwidth sampling on loss recovery undo 0982234c57e1 tcp_bbr: reset full pipe detection on loss recovery undo 79070be7f1ae (linux-stable-rc/linux-4.9.y) Linux 4.9.74-rc1
I verified that this compiles without warnings, and boots, and BBR works.
Shall I prepare another version of these 2 patches, or do we think this recipe will be sufficient? (Sorry I am not more familiar with the backport-to-stable process.)
If this works and Greg is OK with it, I am fine with it too.