From 0aed4d248dcbb3bc1d650f980e404952daa6f9c7 Mon Sep 17 00:00:00 2001
From: "bot-for-go[bot]" <199222863+bot-for-go[bot]@users.noreply.github.com>
Date: Wed, 8 Jul 2026 16:03:52 +0000
Subject: [PATCH 1/2] Update submodule to latest master (1cee9dbe): os: rewrite
 PathError.Path in dirFS.ReadLink to relative name

---
 go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/go b/go
index 976f0044da..1cee9dbe3f 160000
--- a/go
+++ b/go
@@ -1 +1 @@
-Subproject commit 976f0044daeec716ad2d1bb88611145b3e43f796
+Subproject commit 1cee9dbe3fa7101b991c048e39129d6235864dc6

From 124d04c585213123b104781824ba51af8aabe623 Mon Sep 17 00:00:00 2001
From: George Adams <georgeadams1995@gmail.com>
Date: Wed, 8 Jul 2026 17:51:11 +0100
Subject: [PATCH 2/2] resolve 3-way merge conflicts

---
 patches/0002-Add-crypto-backends.patch | 24 +++++-------------------
 1 file changed, 5 insertions(+), 19 deletions(-)

diff --git a/patches/0002-Add-crypto-backends.patch b/patches/0002-Add-crypto-backends.patch
index 545bfb9e6f..27f48ec149 100644
--- a/patches/0002-Add-crypto-backends.patch
+++ b/patches/0002-Add-crypto-backends.patch
@@ -19,7 +19,6 @@ Subject: [PATCH] Add crypto backends
  src/cmd/go/internal/help/helpdoc.go           |   3 +
  src/cmd/go/internal/load/pkg.go               |  50 ++-
  src/cmd/go/internal/tool/tool.go              |   9 +-
- .../verylongtest/testdata/script/README       |   2 +
  src/cmd/go/script_test.go                     |   3 +
  src/cmd/go/systemcrypto_test.go               | 284 ++++++++++++++++++
  src/cmd/go/testdata/script/README             |   2 +
@@ -138,7 +137,7 @@ Subject: [PATCH] Add crypto backends
  src/os/exec/exec_test.go                      |   9 +
  src/runtime/runtime_boring.go                 |   5 +
  src/syscall/syscall_windows.go                |   3 +
- 134 files changed, 2525 insertions(+), 378 deletions(-)
+ 133 files changed, 2523 insertions(+), 378 deletions(-)
  create mode 100644 src/cmd/go/systemcrypto_test.go
  create mode 100644 src/crypto/dsa/boring.go
  create mode 100644 src/crypto/dsa/notboring.go
@@ -734,24 +733,11 @@ index 97c27c8caa44d6..bb18bb112a314a 100644
  	}
  
  	buildAndRunTool(ld, ctx, tool, args, runFunc)
-diff --git a/src/cmd/go/internal/verylongtest/testdata/script/README b/src/cmd/go/internal/verylongtest/testdata/script/README
-index 9ec997a138f0f2..09c4e7955ec162 100644
---- a/src/cmd/go/internal/verylongtest/testdata/script/README
-+++ b/src/cmd/go/internal/verylongtest/testdata/script/README
-@@ -281,6 +281,8 @@ The available conditions are:
- 	testing.Short()
- [symlink]
- 	testenv.HasSymlink()
-+[systemcrypto]
-+	system crypto is enabled
- [verbose]
- 	testing.Verbose()
- 
 diff --git a/src/cmd/go/script_test.go b/src/cmd/go/script_test.go
-index 088b9a8b5fdb2e..4e1e545367afef 100644
+index 6033ec420b8452..a8374234a3f0a5 100644
 --- a/src/cmd/go/script_test.go
 +++ b/src/cmd/go/script_test.go
-@@ -299,6 +299,9 @@ var extraEnvKeys = []string{
+@@ -300,6 +300,9 @@ var extraEnvKeys = []string{
  	"GO_TESTING_GOTOOLS", // for gccgo testing
  	"GCCGO",              // for gccgo testing
  	"GCCGOTOOLDIR",       // for gccgo testing
@@ -1052,10 +1038,10 @@ index 00000000000000..8e7f07fe1f758c
 +	}
 +}
 diff --git a/src/cmd/go/testdata/script/README b/src/cmd/go/testdata/script/README
-index 9fa2c92c0b32b2..c0dd9e533e8e48 100644
+index 71052159b6e4f5..6e05ef51f89c17 100644
 --- a/src/cmd/go/testdata/script/README
 +++ b/src/cmd/go/testdata/script/README
-@@ -421,6 +421,8 @@ The available conditions are:
+@@ -419,6 +419,8 @@ The available conditions are:
  	testing.Short()
  [symlink]
  	testenv.HasSymlink()