Merge release-20210208.0-73-gf80a857a4 (automated)

16 files changed, 20 insertions, 18 deletions

diff --git a/pkg/gohacks/gohacks_unsafe.go b/pkg/gohacks/gohacks_unsafe.go
index d26c1ac05..10bbb1f58 100644
--- a/pkg/gohacks/gohacks_unsafe.go
+++ b/pkg/gohacks/gohacks_unsafe.go
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 // +build go1.13
-// +build !go1.17
+// +build !go1.18
 
 // Check type signatures when updating Go version.
 
diff --git a/pkg/goid/goid.go b/pkg/goid/goid.go
index 17c384cb0..193b2c2d4 100644
--- a/pkg/goid/goid.go
+++ b/pkg/goid/goid.go
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 // +build go1.12
-// +build !go1.17
+// +build !go1.18
 
 // Check type signatures when updating Go version.
 
diff --git a/pkg/procid/procid_amd64.s b/pkg/procid/procid_amd64.s
index a45920040..c4307c523 100644
--- a/pkg/procid/procid_amd64.s
+++ b/pkg/procid/procid_amd64.s
@@ -14,7 +14,7 @@
 
 // +build amd64
 // +build go1.8
-// +build !go1.17
+// +build !go1.18
 
 #include "textflag.h"
 
diff --git a/pkg/procid/procid_arm64.s b/pkg/procid/procid_arm64.s
index 9d3b0666d..c1c409f3c 100644
--- a/pkg/procid/procid_arm64.s
+++ b/pkg/procid/procid_arm64.s
@@ -14,7 +14,7 @@
 
 // +build arm64
 // +build go1.8
-// +build !go1.17
+// +build !go1.18
 
 #include "textflag.h"
 
diff --git a/pkg/sentry/platform/kvm/bluepill_unsafe.go b/pkg/sentry/platform/kvm/bluepill_unsafe.go
index 8c5369377..55da6dd95 100644
--- a/pkg/sentry/platform/kvm/bluepill_unsafe.go
+++ b/pkg/sentry/platform/kvm/bluepill_unsafe.go
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 // +build go1.12
-// +build !go1.17
+// +build !go1.18
 
 // Check go:linkname function signatures when updating Go version.
 
diff --git a/pkg/sentry/platform/kvm/kvm_unsafe_state_autogen.go b/pkg/sentry/platform/kvm/kvm_unsafe_state_autogen.go
index 04d30ac6d..a6d639a63 100644
--- a/pkg/sentry/platform/kvm/kvm_unsafe_state_autogen.go
+++ b/pkg/sentry/platform/kvm/kvm_unsafe_state_autogen.go
@@ -1,8 +1,8 @@
 // automatically generated by stateify.
 
 // +build go1.12
-// +build !go1.17
+// +build !go1.18
 // +build go1.12
-// +build !go1.17
+// +build !go1.18
 
 package kvm
diff --git a/pkg/sentry/platform/kvm/machine_unsafe.go b/pkg/sentry/platform/kvm/machine_unsafe.go
index 1d6ca245a..c322551d2 100644
--- a/pkg/sentry/platform/kvm/machine_unsafe.go
+++ b/pkg/sentry/platform/kvm/machine_unsafe.go
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 // +build go1.12
-// +build !go1.17
+// +build !go1.18
 
 // Check go:linkname function signatures when updating Go version.
 
diff --git a/pkg/sentry/platform/ptrace/ptrace_unsafe_state_autogen.go b/pkg/sentry/platform/ptrace/ptrace_unsafe_state_autogen.go
index 8a2ebe8da..0a0989650 100644
--- a/pkg/sentry/platform/ptrace/ptrace_unsafe_state_autogen.go
+++ b/pkg/sentry/platform/ptrace/ptrace_unsafe_state_autogen.go
@@ -1,6 +1,6 @@
 // automatically generated by stateify.
 
 // +build go1.12
-// +build !go1.17
+// +build !go1.18
 
 package ptrace
diff --git a/pkg/sentry/platform/ptrace/subprocess_unsafe.go b/pkg/sentry/platform/ptrace/subprocess_unsafe.go
index 7ee20d89a..38b7b1a5e 100644
--- a/pkg/sentry/platform/ptrace/subprocess_unsafe.go
+++ b/pkg/sentry/platform/ptrace/subprocess_unsafe.go
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 // +build go1.12
-// +build !go1.17
+// +build !go1.18
 
 // Check go:linkname function signatures when updating Go version.
 
diff --git a/pkg/sync/goyield_unsafe.go b/pkg/sync/goyield_unsafe.go
index 672ee274d..f3cc12163 100644
--- a/pkg/sync/goyield_unsafe.go
+++ b/pkg/sync/goyield_unsafe.go
@@ -4,7 +4,7 @@
 // license that can be found in the LICENSE file.
 
 // +build go1.14
-// +build !go1.17
+// +build !go1.18
 
 // Check go:linkname function signatures when updating Go version.
 
diff --git a/pkg/sync/mutex_unsafe.go b/pkg/sync/mutex_unsafe.go
index 21084b857..4e49a9b89 100644
--- a/pkg/sync/mutex_unsafe.go
+++ b/pkg/sync/mutex_unsafe.go
@@ -4,7 +4,7 @@
 // license that can be found in the LICENSE file.
 
 // +build go1.13
-// +build !go1.17
+// +build !go1.18
 
 // When updating the build constraint (above), check that syncMutex matches the
 // standard library sync.Mutex definition.
diff --git a/pkg/sync/runtime_unsafe.go b/pkg/sync/runtime_unsafe.go
index e925e2e5b..119ff832a 100644
--- a/pkg/sync/runtime_unsafe.go
+++ b/pkg/sync/runtime_unsafe.go
@@ -4,9 +4,10 @@
 // license that can be found in the LICENSE file.
 
 // +build go1.13
-// +build !go1.17
+// +build !go1.18
 
-// Check function signatures and constants when updating Go version.
+// Check go:linkname function signatures, type definitions, and constants when
+// updating Go version.
 
 package sync
 
@@ -95,6 +96,7 @@ func MapKeyHasher(m interface{}) func(unsafe.Pointer, uintptr) uintptr {
 	return mtyp.hasher
 }
 
+// maptype is equivalent to the beginning of runtime.maptype.
 type maptype struct {
 	size       uintptr
 	ptrdata    uintptr
diff --git a/pkg/tcpip/link/rawfile/blockingpoll_yield_unsafe.go b/pkg/tcpip/link/rawfile/blockingpoll_yield_unsafe.go
index 5db4bf12b..7f238102e 100644
--- a/pkg/tcpip/link/rawfile/blockingpoll_yield_unsafe.go
+++ b/pkg/tcpip/link/rawfile/blockingpoll_yield_unsafe.go
@@ -14,7 +14,7 @@
 
 // +build linux,amd64 linux,arm64
 // +build go1.12
-// +build !go1.17
+// +build !go1.18
 
 // Check go:linkname function signatures when updating Go version.
 
diff --git a/pkg/tcpip/link/rawfile/rawfile_unsafe_state_autogen.go b/pkg/tcpip/link/rawfile/rawfile_unsafe_state_autogen.go
index 239d165f0..f5eace013 100644
--- a/pkg/tcpip/link/rawfile/rawfile_unsafe_state_autogen.go
+++ b/pkg/tcpip/link/rawfile/rawfile_unsafe_state_autogen.go
@@ -3,7 +3,7 @@
 // +build linux,!amd64,!arm64
 // +build linux,amd64 linux,arm64
 // +build go1.12
-// +build !go1.17
+// +build !go1.18
 // +build linux
 
 package rawfile
diff --git a/pkg/tcpip/tcpip_unsafe_state_autogen.go b/pkg/tcpip/tcpip_unsafe_state_autogen.go
index 8f6fc08cf..92ada718b 100644
--- a/pkg/tcpip/tcpip_unsafe_state_autogen.go
+++ b/pkg/tcpip/tcpip_unsafe_state_autogen.go
@@ -1,7 +1,7 @@
 // automatically generated by stateify.
 
 // +build go1.9
-// +build !go1.17
+// +build !go1.18
 
 package tcpip
 
diff --git a/pkg/tcpip/time_unsafe.go b/pkg/tcpip/time_unsafe.go
index 606363567..eeea97b12 100644
--- a/pkg/tcpip/time_unsafe.go
+++ b/pkg/tcpip/time_unsafe.go
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 // +build go1.9
-// +build !go1.17
+// +build !go1.18
 
 // Check go:linkname function signatures when updating Go version.