all: go fix everything

64 files changed, 28 insertions, 64 deletions

diff --git a/dashboard/app/access.go b/dashboard/app/access.go
index 10a4ac3e9..b63eb9294 100644
--- a/dashboard/app/access.go
+++ b/dashboard/app/access.go
@@ -9,7 +9,7 @@ import (
 	"net/http"
 	"strings"
 
-	"golang.org/x/net/context"
+	"context"
 	db "google.golang.org/appengine/v2/datastore"
 	"google.golang.org/appengine/v2/log"
 	"google.golang.org/appengine/v2/user"
diff --git a/dashboard/app/access_test.go b/dashboard/app/access_test.go
index 208d79a29..3fb305f76 100644
--- a/dashboard/app/access_test.go
+++ b/dashboard/app/access_test.go
@@ -11,8 +11,8 @@ import (
 	"strconv"
 	"testing"
 
+	"context"
 	"github.com/google/syzkaller/dashboard/dashapi"
-	"golang.org/x/net/context"
 	"google.golang.org/appengine/v2/user"
 )
 
diff --git a/dashboard/app/admin.go b/dashboard/app/admin.go
index 58f2e05b2..af349c061 100644
--- a/dashboard/app/admin.go
+++ b/dashboard/app/admin.go
@@ -8,8 +8,8 @@ import (
 	"net/http"
 	"time"
 
+	"context"
 	"github.com/google/syzkaller/dashboard/dashapi"
-	"golang.org/x/net/context"
 	db "google.golang.org/appengine/v2/datastore"
 	"google.golang.org/appengine/v2/log"
 	aemail "google.golang.org/appengine/v2/mail"
diff --git a/dashboard/app/api.go b/dashboard/app/api.go
index 114213426..64db7aa28 100644
--- a/dashboard/app/api.go
+++ b/dashboard/app/api.go
@@ -19,6 +19,7 @@ import (
 	"time"
 	"unicode/utf8"
 
+	"context"
 	"github.com/google/syzkaller/dashboard/dashapi"
 	"github.com/google/syzkaller/pkg/asset"
 	"github.com/google/syzkaller/pkg/auth"
@@ -27,7 +28,6 @@ import (
 	"github.com/google/syzkaller/pkg/hash"
 	"github.com/google/syzkaller/pkg/subsystem"
 	"github.com/google/syzkaller/sys/targets"
-	"golang.org/x/net/context"
 	"google.golang.org/appengine/v2"
 	db "google.golang.org/appengine/v2/datastore"
 	"google.golang.org/appengine/v2/log"
diff --git a/dashboard/app/asset_storage.go b/dashboard/app/asset_storage.go
index 5e33931a5..016975e6f 100644
--- a/dashboard/app/asset_storage.go
+++ b/dashboard/app/asset_storage.go
@@ -10,10 +10,10 @@ import (
 	"sort"
 	"time"
 
+	"context"
 	"github.com/google/syzkaller/dashboard/dashapi"
 	"github.com/google/syzkaller/pkg/asset"
 	"github.com/google/syzkaller/sys/targets"
-	"golang.org/x/net/context"
 	"golang.org/x/sync/errgroup"
 	"google.golang.org/appengine/v2"
 	db "google.golang.org/appengine/v2/datastore"
diff --git a/dashboard/app/cache.go b/dashboard/app/cache.go
index 5867f4782..58322c703 100644
--- a/dashboard/app/cache.go
+++ b/dashboard/app/cache.go
@@ -11,9 +11,9 @@ import (
 	"sort"
 	"time"
 
+	"context"
 	"github.com/google/syzkaller/pkg/hash"
 	"github.com/google/syzkaller/pkg/image"
-	"golang.org/x/net/context"
 	"google.golang.org/appengine/v2"
 	"google.golang.org/appengine/v2/log"
 	"google.golang.org/appengine/v2/memcache"
diff --git a/dashboard/app/config.go b/dashboard/app/config.go
index f55a5f0ce..d0b01ff24 100644
--- a/dashboard/app/config.go
+++ b/dashboard/app/config.go
@@ -11,13 +11,13 @@ import (
 	"regexp"
 	"time"
 
+	"context"
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/syzkaller/dashboard/dashapi"
 	"github.com/google/syzkaller/pkg/auth"
 	"github.com/google/syzkaller/pkg/email"
 	"github.com/google/syzkaller/pkg/subsystem"
 	"github.com/google/syzkaller/pkg/vcs"
-	"golang.org/x/net/context"
 )
 
 // There are multiple configurable aspects of the app (namespaces, reporting, API clients, etc).
diff --git a/dashboard/app/discussion.go b/dashboard/app/discussion.go
index 64878f61c..bb9857bec 100644
--- a/dashboard/app/discussion.go
+++ b/dashboard/app/discussion.go
@@ -8,9 +8,9 @@ import (
 	"sort"
 	"strings"
 
+	"context"
 	"github.com/google/syzkaller/dashboard/dashapi"
 	"github.com/google/syzkaller/pkg/email"
-	"golang.org/x/net/context"
 	db "google.golang.org/appengine/v2/datastore"
 )
 
diff --git a/dashboard/app/email_test.go b/dashboard/app/email_test.go
index ae40d9e8a..8926774ad 100644
--- a/dashboard/app/email_test.go
+++ b/dashboard/app/email_test.go
@@ -9,11 +9,11 @@ import (
 	"testing"
 	"time"
 
+	"context"
 	"github.com/google/syzkaller/dashboard/dashapi"
 	"github.com/google/syzkaller/pkg/email"
 	"github.com/google/syzkaller/sys/targets"
 	"github.com/stretchr/testify/assert"
-	"golang.org/x/net/context"
 )
 
 // nolint: funlen
diff --git a/dashboard/app/entities.go b/dashboard/app/entities.go
index cdb8761dd..645d792c5 100644
--- a/dashboard/app/entities.go
+++ b/dashboard/app/entities.go
@@ -10,10 +10,10 @@ import (
 	"strings"
 	"time"
 
+	"context"
 	"github.com/google/syzkaller/dashboard/dashapi"
 	"github.com/google/syzkaller/pkg/hash"
 	"github.com/google/syzkaller/pkg/subsystem"
-	"golang.org/x/net/context"
 	db "google.golang.org/appengine/v2/datastore"
 )
 
diff --git a/dashboard/app/graphs.go b/dashboard/app/graphs.go
index 7c023ca89..af453f474 100644
--- a/dashboard/app/graphs.go
+++ b/dashboard/app/graphs.go
@@ -12,7 +12,7 @@ import (
 	"strconv"
 	"time"
 
-	"golang.org/x/net/context"
+	"context"
 	db "google.golang.org/appengine/v2/datastore"
 )
 
diff --git a/dashboard/app/handler.go b/dashboard/app/handler.go
index f547de6a9..5b2337a30 100644
--- a/dashboard/app/handler.go
+++ b/dashboard/app/handler.go
@@ -14,8 +14,8 @@ import (
 	"strings"
 	"time"
 
+	"context"
 	"github.com/google/syzkaller/pkg/html"
-	"golang.org/x/net/context"
 	"google.golang.org/appengine/v2"
 	"google.golang.org/appengine/v2/log"
 	"google.golang.org/appengine/v2/user"
diff --git a/dashboard/app/jobs.go b/dashboard/app/jobs.go
index b86d1ac8c..8898265e3 100644
--- a/dashboard/app/jobs.go
+++ b/dashboard/app/jobs.go
@@ -12,10 +12,10 @@ import (
 	"strings"
 	"time"
 
+	"context"
 	"github.com/google/syzkaller/dashboard/dashapi"
 	"github.com/google/syzkaller/pkg/email"
 	"github.com/google/syzkaller/pkg/vcs"
-	"golang.org/x/net/context"
 	db "google.golang.org/appengine/v2/datastore"
 	"google.golang.org/appengine/v2/log"
 	"google.golang.org/appengine/v2/user"
diff --git a/dashboard/app/kcidb.go b/dashboard/app/kcidb.go
index 19b704882..badff6513 100644
--- a/dashboard/app/kcidb.go
+++ b/dashboard/app/kcidb.go
@@ -8,8 +8,8 @@ import (
 	"net/http"
 	"time"
 
+	"context"
 	"github.com/google/syzkaller/pkg/kcidb"
-	"golang.org/x/net/context"
 	"google.golang.org/appengine/v2"
 	db "google.golang.org/appengine/v2/datastore"
 	"google.golang.org/appengine/v2/log"
diff --git a/dashboard/app/label.go b/dashboard/app/label.go
index 18215911e..bd5bb21fa 100644
--- a/dashboard/app/label.go
+++ b/dashboard/app/label.go
@@ -8,7 +8,7 @@ import (
 	"sort"
 	"strings"
 
-	"golang.org/x/net/context"
+	"context"
 )
 
 const (
diff --git a/dashboard/app/main.go b/dashboard/app/main.go
index 6e8b34b19..fdf86fb86 100644
--- a/dashboard/app/main.go
+++ b/dashboard/app/main.go
@@ -19,6 +19,7 @@ import (
 
 	"cloud.google.com/go/logging"
 	"cloud.google.com/go/logging/logadmin"
+	"context"
 	"github.com/google/syzkaller/dashboard/dashapi"
 	"github.com/google/syzkaller/pkg/debugtracer"
 	"github.com/google/syzkaller/pkg/email"
@@ -26,7 +27,6 @@ import (
 	"github.com/google/syzkaller/pkg/html"
 	"github.com/google/syzkaller/pkg/subsystem"
 	"github.com/google/syzkaller/pkg/vcs"
-	"golang.org/x/net/context"
 	"golang.org/x/sync/errgroup"
 	"google.golang.org/api/iterator"
 	"google.golang.org/appengine/v2"
diff --git a/dashboard/app/main_test.go b/dashboard/app/main_test.go
index 7875d60ba..5444f2e75 100644
--- a/dashboard/app/main_test.go
+++ b/dashboard/app/main_test.go
@@ -10,9 +10,9 @@ import (
 	"testing"
 	"time"
 
+	"context"
 	"github.com/google/syzkaller/dashboard/dashapi"
 	"github.com/stretchr/testify/assert"
-	"golang.org/x/net/context"
 )
 
 func TestOnlyManagerFilter(t *testing.T) {
diff --git a/dashboard/app/notifications_test.go b/dashboard/app/notifications_test.go
index 4e680baba..9ae20b770 100644
--- a/dashboard/app/notifications_test.go
+++ b/dashboard/app/notifications_test.go
@@ -9,10 +9,10 @@ import (
 	"testing"
 	"time"
 
+	"context"
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/syzkaller/dashboard/dashapi"
 	"github.com/google/syzkaller/pkg/email"
-	"golang.org/x/net/context"
 )
 
 func TestEmailNotifUpstreamEmbargo(t *testing.T) {
diff --git a/dashboard/app/reporting.go b/dashboard/app/reporting.go
index ccb7fa1ea..51cffc13f 100644
--- a/dashboard/app/reporting.go
+++ b/dashboard/app/reporting.go
@@ -13,11 +13,11 @@ import (
 	"strings"
 	"time"
 
+	"context"
 	"github.com/google/syzkaller/dashboard/dashapi"
 	"github.com/google/syzkaller/pkg/email"
 	"github.com/google/syzkaller/pkg/html"
 	"github.com/google/syzkaller/sys/targets"
-	"golang.org/x/net/context"
 	db "google.golang.org/appengine/v2/datastore"
 	"google.golang.org/appengine/v2/log"
 )
diff --git a/dashboard/app/reporting_email.go b/dashboard/app/reporting_email.go
index 8eaf5e5ff..d68b2c0ae 100644
--- a/dashboard/app/reporting_email.go
+++ b/dashboard/app/reporting_email.go
@@ -19,12 +19,12 @@ import (
 	"text/tabwriter"
 	"time"
 
+	"context"
 	"github.com/google/syzkaller/dashboard/dashapi"
 	"github.com/google/syzkaller/pkg/email"
 	"github.com/google/syzkaller/pkg/email/lore"
 	"github.com/google/syzkaller/pkg/html"
 	"github.com/google/syzkaller/sys/targets"
-	"golang.org/x/net/context"
 	"google.golang.org/appengine/v2"
 	db "google.golang.org/appengine/v2/datastore"
 	"google.golang.org/appengine/v2/log"
diff --git a/dashboard/app/reporting_external.go b/dashboard/app/reporting_external.go
index 625476918..1336cbc1c 100644
--- a/dashboard/app/reporting_external.go
+++ b/dashboard/app/reporting_external.go
@@ -9,8 +9,8 @@ import (
 	"fmt"
 	"net/http"
 
+	"context"
 	"github.com/google/syzkaller/dashboard/dashapi"
-	"golang.org/x/net/context"
 	"google.golang.org/appengine/v2/log"
 )
 
diff --git a/dashboard/app/reporting_lists.go b/dashboard/app/reporting_lists.go
index ec13136f2..5dd3b8693 100644
--- a/dashboard/app/reporting_lists.go
+++ b/dashboard/app/reporting_lists.go
@@ -11,9 +11,9 @@ import (
 	"strings"
 	"time"
 
+	"context"
 	"github.com/google/syzkaller/dashboard/dashapi"
 	"github.com/google/syzkaller/pkg/hash"
-	"golang.org/x/net/context"
 	"google.golang.org/appengine/v2"
 	db "google.golang.org/appengine/v2/datastore"
 	"google.golang.org/appengine/v2/log"
diff --git a/dashboard/app/reporting_test.go b/dashboard/app/reporting_test.go
index 7515cd810..c9ad1c8c2 100644
--- a/dashboard/app/reporting_test.go
+++ b/dashboard/app/reporting_test.go
@@ -11,12 +11,12 @@ import (
 	"testing"
 	"time"
 
+	"context"
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/syzkaller/dashboard/dashapi"
 	"github.com/google/syzkaller/pkg/email"
 	"github.com/google/syzkaller/sys/targets"
 	"github.com/stretchr/testify/assert"
-	"golang.org/x/net/context"
 )
 
 func TestReportBug(t *testing.T) {
diff --git a/dashboard/app/stats.go b/dashboard/app/stats.go
index 4133690cc..decbe6bc7 100644
--- a/dashboard/app/stats.go
+++ b/dashboard/app/stats.go
@@ -8,9 +8,9 @@ import (
 	"fmt"
 	"time"
 
+	"context"
 	"github.com/google/syzkaller/dashboard/dashapi"
 	"github.com/google/syzkaller/pkg/stats/syzbotstats"
-	"golang.org/x/net/context"
 	"google.golang.org/appengine/v2"
 	db "google.golang.org/appengine/v2/datastore"
 )
diff --git a/dashboard/app/subsystem.go b/dashboard/app/subsystem.go
index 5940612cc..07d52dcd5 100644
--- a/dashboard/app/subsystem.go
+++ b/dashboard/app/subsystem.go
@@ -9,9 +9,9 @@ import (
 	"sort"
 	"time"
 
+	"context"
 	"github.com/google/syzkaller/pkg/debugtracer"
 	"github.com/google/syzkaller/pkg/subsystem"
-	"golang.org/x/net/context"
 	db "google.golang.org/appengine/v2/datastore"
 	"google.golang.org/appengine/v2/log"
 )
diff --git a/dashboard/app/tree.go b/dashboard/app/tree.go
index 08da1a804..9cec1e70c 100644
--- a/dashboard/app/tree.go
+++ b/dashboard/app/tree.go
@@ -14,8 +14,8 @@ import (
 	"sync"
 	"time"
 
+	"context"
 	"github.com/google/syzkaller/dashboard/dashapi"
-	"golang.org/x/net/context"
 	"golang.org/x/sync/errgroup"
 	db "google.golang.org/appengine/v2/datastore"
 	"google.golang.org/appengine/v2/log"
diff --git a/dashboard/app/util_test.go b/dashboard/app/util_test.go
index db92174e4..19e03ff78 100644
--- a/dashboard/app/util_test.go
+++ b/dashboard/app/util_test.go
@@ -23,11 +23,11 @@ import (
 	"testing"
 	"time"
 
+	"context"
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/syzkaller/dashboard/dashapi"
 	"github.com/google/syzkaller/pkg/email"
 	"github.com/google/syzkaller/pkg/subsystem"
-	"golang.org/x/net/context"
 	"google.golang.org/appengine/v2/aetest"
 	db "google.golang.org/appengine/v2/datastore"
 	"google.golang.org/appengine/v2/log"
diff --git a/pkg/build/linux_nolinux.go b/pkg/build/linux_nolinux.go
index 03ea0da27..6e9c4fd5e 100644
--- a/pkg/build/linux_nolinux.go
+++ b/pkg/build/linux_nolinux.go
@@ -2,7 +2,6 @@
 // Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file.
 
 //go:build !linux
-// +build !linux
 
 package build
 
diff --git a/pkg/build/linux_test.go b/pkg/build/linux_test.go
index 91d344531..8f4e2d73c 100644
--- a/pkg/build/linux_test.go
+++ b/pkg/build/linux_test.go
@@ -2,7 +2,6 @@
 // Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file.
 
 //go:build linux
-// +build linux
 
 package build
 
diff --git a/pkg/cover/report_test.go b/pkg/cover/report_test.go
index d1ef7ac70..e93d43eda 100644
--- a/pkg/cover/report_test.go
+++ b/pkg/cover/report_test.go
@@ -4,7 +4,6 @@
 // It may or may not work on other OSes.
 // If you test on another OS and it works, enable it.
 //go:build linux
-// +build linux
 
 package cover
 
diff --git a/pkg/csource/gen.go b/pkg/csource/gen.go
index 2a491ccd6..7faf1ddaa 100644
--- a/pkg/csource/gen.go
+++ b/pkg/csource/gen.go
@@ -2,7 +2,6 @@
 // Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file.
 
 //go:build ignore
-// +build ignore
 
 package main
 
diff --git a/pkg/gce/gce.go b/pkg/gce/gce.go
index 0072bd21f..9bbdaa7b3 100644
--- a/pkg/gce/gce.go
+++ b/pkg/gce/gce.go
@@ -21,7 +21,7 @@ import (
 	"strings"
 	"time"
 
-	"golang.org/x/net/context"
+	"context"
 	"golang.org/x/oauth2"
 	"golang.org/x/oauth2/google"
 	"google.golang.org/api/compute/v1"
diff --git a/pkg/host/host_fuchsia.go b/pkg/host/host_fuchsia.go
index bbfb41d1d..49f1b6406 100644
--- a/pkg/host/host_fuchsia.go
+++ b/pkg/host/host_fuchsia.go
@@ -2,7 +2,6 @@
 // Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file.
 
 //go:build fuchsia
-// +build fuchsia
 
 package host
 
diff --git a/pkg/host/syscalls_linux_test.go b/pkg/host/syscalls_linux_test.go
index 375a640ea..fc5d13dd5 100644
--- a/pkg/host/syscalls_linux_test.go
+++ b/pkg/host/syscalls_linux_test.go
@@ -2,7 +2,6 @@
 // Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file.
 
 //go:build linux
-// +build linux
 
 package host
 
diff --git a/pkg/ifuzz/powerpc/generated/insns.go b/pkg/ifuzz/powerpc/generated/insns.go
index 2dcdc88cf..898ccd163 100644
--- a/pkg/ifuzz/powerpc/generated/insns.go
+++ b/pkg/ifuzz/powerpc/generated/insns.go
@@ -1,7 +1,6 @@
 // Code generated by ./pkg/ifuzz/powerpc/gen/powerisa31_tex_to_syz. DO NOT EDIT.
 
 //go:build !codeanalysis
-// +build !codeanalysis
 
 package generated
 
diff --git a/pkg/ifuzz/x86/generated/insns.go b/pkg/ifuzz/x86/generated/insns.go
index 3a7153a09..3e990da92 100644
--- a/pkg/ifuzz/x86/generated/insns.go
+++ b/pkg/ifuzz/x86/generated/insns.go
@@ -1,7 +1,6 @@
 // Code generated by pkg/ifuzz/gen. DO NOT EDIT.
 
 //go:build !codeanalysis
-// +build !codeanalysis
 
 package generated
 
diff --git a/pkg/ifuzz/x86/xed.go b/pkg/ifuzz/x86/xed.go
index 6adf45314..0eebcb096 100644
--- a/pkg/ifuzz/x86/xed.go
+++ b/pkg/ifuzz/x86/xed.go
@@ -8,7 +8,6 @@
 //	go test -v -tags xed
 
 //go:build xed
-// +build xed
 
 package x86
 
diff --git a/pkg/image/compression_nonoptimized.go b/pkg/image/compression_nonoptimized.go
index 83e17c167..333b46815 100644
--- a/pkg/image/compression_nonoptimized.go
+++ b/pkg/image/compression_nonoptimized.go
@@ -2,7 +2,6 @@
 // Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file.
 
 //go:build windows || 386 || arm
-// +build windows 386 arm
 
 package image
 
diff --git a/pkg/image/compression_optimized.go b/pkg/image/compression_optimized.go
index ac043c3e7..ea6be9569 100644
--- a/pkg/image/compression_optimized.go
+++ b/pkg/image/compression_optimized.go
@@ -2,7 +2,6 @@
 // Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file.
 
 //go:build !windows && !386 && !arm
-// +build !windows,!386,!arm
 
 package image
 
diff --git a/pkg/kd/kd_test.go b/pkg/kd/kd_test.go
index 5c55ffd29..e250db420 100644
--- a/pkg/kd/kd_test.go
+++ b/pkg/kd/kd_test.go
@@ -2,7 +2,6 @@
 // Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file.
 
 //go:build !s390x
-// +build !s390x
 
 package kd
 
diff --git a/pkg/osutil/osutil_bsd.go b/pkg/osutil/osutil_bsd.go
index d139b9a76..b54c9126f 100644
--- a/pkg/osutil/osutil_bsd.go
+++ b/pkg/osutil/osutil_bsd.go
@@ -2,7 +2,6 @@
 // Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file.
 
 //go:build freebsd || netbsd || openbsd
-// +build freebsd netbsd openbsd
 
 package osutil
 
diff --git a/pkg/osutil/osutil_fuchsia.go b/pkg/osutil/osutil_fuchsia.go
index f1dad3aff..4103e7f52 100644
--- a/pkg/osutil/osutil_fuchsia.go
+++ b/pkg/osutil/osutil_fuchsia.go
@@ -2,7 +2,6 @@
 // Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file.
 
 //go:build fuchsia
-// +build fuchsia
 
 package osutil
 
diff --git a/pkg/osutil/osutil_unix.go b/pkg/osutil/osutil_unix.go
index cf6b0284e..7243a7014 100644
--- a/pkg/osutil/osutil_unix.go
+++ b/pkg/osutil/osutil_unix.go
@@ -2,7 +2,6 @@
 // Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file.
 
 //go:build freebsd || netbsd || openbsd || linux || darwin
-// +build freebsd netbsd openbsd linux darwin
 
 package osutil
 
diff --git a/pkg/osutil/sharedmem_file.go b/pkg/osutil/sharedmem_file.go
index 1e969cdba..0d899fab5 100644
--- a/pkg/osutil/sharedmem_file.go
+++ b/pkg/osutil/sharedmem_file.go
@@ -2,7 +2,6 @@
 // Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file.
 
 //go:build freebsd || netbsd || openbsd || darwin
-// +build freebsd netbsd openbsd darwin
 
 package osutil
 
diff --git a/pkg/osutil/sharedmem_memfd.go b/pkg/osutil/sharedmem_memfd.go
index 213080e49..84077b9ec 100644
--- a/pkg/osutil/sharedmem_memfd.go
+++ b/pkg/osutil/sharedmem_memfd.go
@@ -2,7 +2,6 @@
 // Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file.
 
 //go:build linux
-// +build linux
 
 package osutil
 
diff --git a/pkg/testutil/norace.go b/pkg/testutil/norace.go
index ceb03928f..47cc90150 100644
--- a/pkg/testutil/norace.go
+++ b/pkg/testutil/norace.go
@@ -2,7 +2,6 @@
 // Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file.
 
 //go:build !race
-// +build !race
 
 package testutil
 
diff --git a/pkg/testutil/race.go b/pkg/testutil/race.go
index 96a9043bb..cdd242454 100644
--- a/pkg/testutil/race.go
+++ b/pkg/testutil/race.go
@@ -2,7 +2,6 @@
 // Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file.
 
 //go:build race
-// +build race
 
 package testutil
 
diff --git a/pkg/tools/tools.go b/pkg/tools/tools.go
index da65663e1..3c11b7e53 100644
--- a/pkg/tools/tools.go
+++ b/pkg/tools/tools.go
@@ -2,7 +2,6 @@
 // Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file.
 
 //go:build tools
-// +build tools
 
 // tools is not a normal package, it's only purpose is tools dependency management.
 // It allows us to vendor all used tools, ensure that all contributors have the same versions of tools,
diff --git a/prog/big_endian.go b/prog/big_endian.go
index 5add364f1..629b8d3c4 100644
--- a/prog/big_endian.go
+++ b/prog/big_endian.go
@@ -2,7 +2,6 @@
 // Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file.
 
 //go:build s390x
-// +build s390x
 
 package prog
 
diff --git a/prog/little_endian.go b/prog/little_endian.go
index 9ebe8925c..8269d209a 100644
--- a/prog/little_endian.go
+++ b/prog/little_endian.go
@@ -2,7 +2,6 @@
 // Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file.
 
 //go:build amd64 || 386 || arm64 || arm || mips64le || ppc64le || riscv64
-// +build amd64 386 arm64 arm mips64le ppc64le riscv64
 
 package prog
 
diff --git a/sys/linux/init_alg_test.go b/sys/linux/init_alg_test.go
index a8810da84..ba801f9aa 100644
--- a/sys/linux/init_alg_test.go
+++ b/sys/linux/init_alg_test.go
@@ -2,7 +2,6 @@
 // Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file.
 
 //go:build linux
-// +build linux
 
 package linux
 
diff --git a/tools/syz-imagegen/imagegen.go b/tools/syz-imagegen/imagegen.go
index af64f77aa..3d3d16d60 100644
--- a/tools/syz-imagegen/imagegen.go
+++ b/tools/syz-imagegen/imagegen.go
@@ -3,7 +3,6 @@
 
 // As we use syscall package:
 //go:build linux
-// +build linux
 
 // syz-imagegen generates sys/linux/test/syz_mount_image_* test files.
 // It requires the following packages to be installed:
diff --git a/tools/syz-trace2syz/parser/lex.go b/tools/syz-trace2syz/parser/lex.go
index e200463c1..96801b8d8 100644
--- a/tools/syz-trace2syz/parser/lex.go
+++ b/tools/syz-trace2syz/parser/lex.go
@@ -3,7 +3,6 @@
 // Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file.
 
 //go:build !codeanalysis
-// +build !codeanalysis
 
 package parser
 
diff --git a/tools/syz-trace2syz/parser/parser.go b/tools/syz-trace2syz/parser/parser.go
index b91f3ac29..91add1a38 100644
--- a/tools/syz-trace2syz/parser/parser.go
+++ b/tools/syz-trace2syz/parser/parser.go
@@ -2,7 +2,6 @@
 // Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file.
 
 //go:build !codeanalysis
-// +build !codeanalysis
 
 package parser
 
diff --git a/tools/syz-trace2syz/parser/parser_test.go b/tools/syz-trace2syz/parser/parser_test.go
index c08712d3a..f30329520 100644
--- a/tools/syz-trace2syz/parser/parser_test.go
+++ b/tools/syz-trace2syz/parser/parser_test.go
@@ -2,7 +2,6 @@
 // Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file.
 
 //go:build !codeanalysis
-// +build !codeanalysis
 
 package parser
 
diff --git a/tools/syz-trace2syz/parser/strace.go b/tools/syz-trace2syz/parser/strace.go
index 47ace7fba..68d791874 100644
--- a/tools/syz-trace2syz/parser/strace.go
+++ b/tools/syz-trace2syz/parser/strace.go
@@ -5,7 +5,6 @@
 // Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file.
 
 //go:build !codeanalysis
-// +build !codeanalysis
 
 package parser
 
diff --git a/tools/syz-trace2syz/proggen/fuzz.go b/tools/syz-trace2syz/proggen/fuzz.go
index 656e8adbe..dac2a9ef0 100644
--- a/tools/syz-trace2syz/proggen/fuzz.go
+++ b/tools/syz-trace2syz/proggen/fuzz.go
@@ -2,7 +2,6 @@
 // Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file.
 
 //go:build !codeanalysis
-// +build !codeanalysis
 
 package proggen
 
diff --git a/tools/syz-trace2syz/proggen/generate_unions.go b/tools/syz-trace2syz/proggen/generate_unions.go
index d3caa7bf0..b7e2d8a96 100644
--- a/tools/syz-trace2syz/proggen/generate_unions.go
+++ b/tools/syz-trace2syz/proggen/generate_unions.go
@@ -2,7 +2,6 @@
 // Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file.
 
 //go:build !codeanalysis
-// +build !codeanalysis
 
 package proggen
 
diff --git a/tools/syz-trace2syz/proggen/proggen.go b/tools/syz-trace2syz/proggen/proggen.go
index f06fe61ae..4fc8240c8 100644
--- a/tools/syz-trace2syz/proggen/proggen.go
+++ b/tools/syz-trace2syz/proggen/proggen.go
@@ -2,7 +2,6 @@
 // Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file.
 
 //go:build !codeanalysis
-// +build !codeanalysis
 
 package proggen
 
diff --git a/tools/syz-trace2syz/proggen/proggen_test.go b/tools/syz-trace2syz/proggen/proggen_test.go
index 06703df0e..bb2e62e9d 100644
--- a/tools/syz-trace2syz/proggen/proggen_test.go
+++ b/tools/syz-trace2syz/proggen/proggen_test.go
@@ -2,7 +2,6 @@
 // Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file.
 
 //go:build !codeanalysis
-// +build !codeanalysis
 
 package proggen
 
diff --git a/tools/syz-trace2syz/trace2syz.go b/tools/syz-trace2syz/trace2syz.go
index 500152d52..0a0a70952 100644
--- a/tools/syz-trace2syz/trace2syz.go
+++ b/tools/syz-trace2syz/trace2syz.go
@@ -2,7 +2,6 @@
 // Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file.
 
 //go:build !codeanalysis
-// +build !codeanalysis
 
 // syz-trace2syz converts strace traces to syzkaller programs.
 //
diff --git a/vm/adb/adb.go b/vm/adb/adb.go
index 5b162bc37..de1bcd2dd 100644
--- a/vm/adb/adb.go
+++ b/vm/adb/adb.go
@@ -2,7 +2,6 @@
 // Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file.
 
 //go:build !ppc64le
-// +build !ppc64le
 
 package adb
 
diff --git a/vm/gce/tar_go1.10.go b/vm/gce/tar_go1.10.go
index 713f71d36..ccdd52a75 100644
--- a/vm/gce/tar_go1.10.go
+++ b/vm/gce/tar_go1.10.go
@@ -2,7 +2,6 @@
 // Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file.
 
 //go:build go1.10
-// +build go1.10
 
 package gce
 
diff --git a/vm/gce/tar_go1.9.go b/vm/gce/tar_go1.9.go
index 7ca207100..45af1f947 100644
--- a/vm/gce/tar_go1.9.go
+++ b/vm/gce/tar_go1.9.go
@@ -2,7 +2,6 @@
 // Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file.
 
 //go:build !go1.10
-// +build !go1.10
 
 package gce