Skip to content

Update submodule to latest master in microsoft/main #2245

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bot-for-go merged 2 commits into from
Apr 23, 2026
+10 −10
Merged

Update submodule to latest master in microsoft/main #2245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dee646a
Update submodule to latest master (122eb7d0): internal/cpu: add zbc e…
bot-for-go[bot] Apr 22, 2026
5277f24
resolve 3-way merge conflicts
gdams Apr 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go
Open in desktop
Submodule go updated 117 files
18 changes: 9 additions & 9 deletions patches/0001-Vendor-external-dependencies.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2265,7 +2265,7 @@ index 00000000000000..ae4055d2d71303
+// that are used by the backend package. This allows to track
+// their versions in a single patch file.
diff --git a/src/go.mod b/src/go.mod
index 13194d3e0e55c2..094fc9bab7f346 100644
index f3c1d75f28cf16..e9ae7119fca209 100644
--- a/src/go.mod
+++ b/src/go.mod
@@ -11,3 +11,9 @@ require (
Expand All @@ -2279,7 +2279,7 @@ index 13194d3e0e55c2..094fc9bab7f346 100644
+ github.com/microsoft/go-crypto-winnative v0.0.0-20260307231751-f82d13314c5c
+)
diff --git a/src/go.sum b/src/go.sum
index 1403e6f10b6a03..f4c10be0c19b33 100644
index 4333b2a6605111..15822722755f56 100644
--- a/src/go.sum
+++ b/src/go.sum
@@ -1,3 +1,9 @@
Expand All @@ -2291,9 +2291,9 @@ index 1403e6f10b6a03..f4c10be0c19b33 100644
+github.com/microsoft/go-crypto-winnative v0.0.0-20260307231751-f82d13314c5c/go.mod h1:a1Z07CJIuWa8WT/pzFIGNTTKS96s8o1B1TPOziAHUxw=
golang.org/x/crypto v0.50.0 h1:zO47/JPrL6vsNkINmLoo/PH1gcxpls50DNogFvB5ZGI=
golang.org/x/crypto v0.50.0/go.mod h1:3muZ7vA7PBCE6xgPX7nkzzjiUq87kRItoJQM1Yo8S+Q=
golang.org/x/net v0.53.1-0.20260416211419-a4ac1da285b7 h1:pI4f6RycO6XrhGZl0Wt2rylPksDZLr8jT6uZGzLQGvA=
golang.org/x/net v0.53.1-0.20260420212600-f70faeaf29ed h1:7TjurTHs0hDGI2ZSxkEJy0ToTN3VoUsPAZ6MYUEvl48=
diff --git a/src/go/build/deps_test.go b/src/go/build/deps_test.go
index dd036a156898cf..e8eeb9455e4bb5 100644
index f1f86117c6c04c..94997ebea42dcd 100644
--- a/src/go/build/deps_test.go
+++ b/src/go/build/deps_test.go
@@ -152,6 +152,13 @@ var depsRules = `
Expand All @@ -2310,7 +2310,7 @@ index dd036a156898cf..e8eeb9455e4bb5 100644
# TIME is SYSCALL plus the core packages about time, including context.
SYSCALL
< time/tzdata
@@ -542,16 +549,46 @@ var depsRules = `
@@ -535,16 +542,46 @@ var depsRules = `
NONE < crypto/internal/boring/sig, crypto/internal/boring/syso;
sync/atomic < crypto/internal/boring/bcache;

Expand Down Expand Up @@ -2362,7 +2362,7 @@ index dd036a156898cf..e8eeb9455e4bb5 100644
< crypto/internal/boring
< crypto/boring
< crypto/internal/rand
@@ -576,6 +613,10 @@ var depsRules = `
@@ -569,6 +606,10 @@ var depsRules = `

# CRYPTO-MATH is crypto that exposes math/big APIs - no cgo, net; fmt now ok.

Expand All @@ -2373,7 +2373,7 @@ index dd036a156898cf..e8eeb9455e4bb5 100644
CRYPTO, FMT, math/big, internal/saferio
< crypto/internal/boring/bbig
< crypto/internal/fips140cache
@@ -935,7 +976,7 @@ var buildIgnore = []byte("\n//go:build ignore")
@@ -939,7 +980,7 @@ var buildIgnore = []byte("\n//go:build ignore")

func findImports(pkg string) ([]string, error) {
vpkg := pkg
Expand All @@ -2382,7 +2382,7 @@ index dd036a156898cf..e8eeb9455e4bb5 100644
vpkg = "vendor/" + pkg
}
dir := filepath.Join(Default.GOROOT, "src", vpkg)
@@ -945,7 +986,7 @@ func findImports(pkg string) ([]string, error) {
@@ -949,7 +990,7 @@ func findImports(pkg string) ([]string, error) {
}
var imports []string
var haveImport = map[string]bool{}
Expand Down Expand Up @@ -38256,7 +38256,7 @@ index 00000000000000..1722410e5af193
+ return getSystemDirectory() + "\\" + dll
+}
diff --git a/src/vendor/modules.txt b/src/vendor/modules.txt
index 03e65dc108d943..21165a217a76fc 100644
index 944f0194bdbd49..285068ad2f72e6 100644
--- a/src/vendor/modules.txt
+++ b/src/vendor/modules.txt
@@ -1,3 +1,26 @@
Expand Down
Loading