From 0e3df744399b34a5f82f55a2ef6a9ca8f0cead03 Mon Sep 17 00:00:00 2001 From: wangshuo Date: Fri, 29 Mar 2024 17:26:45 +0800 Subject: [PATCH] fix the commit information for Patch6118 and 6119 --- ...5-backport-runtime-decrement-netpollWaiters-in-ne.patch | 7 +++++++ ...5-backport-runtime-adjust-netpollWaiters-after-go.patch | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/0118-1.15-backport-runtime-decrement-netpollWaiters-in-ne.patch b/0118-1.15-backport-runtime-decrement-netpollWaiters-in-ne.patch index a72a84a..ed38d12 100644 --- a/0118-1.15-backport-runtime-decrement-netpollWaiters-in-ne.patch +++ b/0118-1.15-backport-runtime-decrement-netpollWaiters-in-ne.patch @@ -9,6 +9,12 @@ the common case of a descriptor becoming ready due to I/O. All calls to netpollgoready go through netpollunblock, so this shouldn't miss any decrements we missed before. +Note: +The upstream does not submit this change to go1.15 according to +the rules of MinorReleases. + +Edited-by: wangshuo + Fixes #60782 Change-Id: Ideefefa1ac96ca38e09fe2dd5d595c5dd7883237 @@ -19,6 +25,7 @@ Run-TryBot: Ian Lance Taylor Run-TryBot: Ian Lance Taylor Reviewed-by: Michael Knyszek Auto-Submit: Ian Lance Taylor +Signed-off-by: Wang Shuo --- src/runtime/crash_test.go | 9 +++ src/runtime/netpoll.go | 4 +- diff --git a/0119-1.15-backport-runtime-adjust-netpollWaiters-after-go.patch b/0119-1.15-backport-runtime-adjust-netpollWaiters-after-go.patch index 8629595..6eec2ce 100644 --- a/0119-1.15-backport-runtime-adjust-netpollWaiters-after-go.patch +++ b/0119-1.15-backport-runtime-adjust-netpollWaiters-after-go.patch @@ -16,6 +16,12 @@ an M stranded in a call to netpoll from which it will never return. At least this won't be a common case. And it's not new; this has been a potential problem for some time. +Note: +The upstream does not submit this change to go1.15 according to +the rules of MinorReleases. + +Edited-by: wangshuo + Fixes #61454 Change-Id: I17c7f891c2bb1262fda12c6929664e64686463c8 @@ -25,6 +31,7 @@ Run-TryBot: Ian Lance Taylor Reviewed-by: Michael Knyszek Auto-Submit: Ian Lance Taylor Reviewed-by: Heschi Kreinick +Signed-off-by: Wang Shuo --- src/runtime/netpoll.go | 68 +++++++++++++++++++++++++--------- src/runtime/netpoll_aix.go | 11 +++--- -- Gitee