Merge release-20210720.0-39-g964fb3ca7 (automated)

15 files changed, 17 insertions, 5 deletions

diff --git a/runsc/boot/filter/filter_amd64_state_autogen.go b/runsc/boot/filter/filter_amd64_state_autogen.go
index 0f27e5568..19c1470c5 100644
--- a/runsc/boot/filter/filter_amd64_state_autogen.go
+++ b/runsc/boot/filter/filter_amd64_state_autogen.go
@@ -1,5 +1,6 @@
 // automatically generated by stateify.
 
+//go:build amd64
 // +build amd64
 
 package filter
diff --git a/runsc/boot/filter/filter_arm64_state_autogen.go b/runsc/boot/filter/filter_arm64_state_autogen.go
index e87cf5af7..c919c17bb 100644
--- a/runsc/boot/filter/filter_arm64_state_autogen.go
+++ b/runsc/boot/filter/filter_arm64_state_autogen.go
@@ -1,5 +1,6 @@
 // automatically generated by stateify.
 
+//go:build arm64
 // +build arm64
 
 package filter
diff --git a/runsc/boot/filter/filter_race_state_autogen.go b/runsc/boot/filter/filter_race_state_autogen.go
index c4a858e80..033b96638 100644
--- a/runsc/boot/filter/filter_race_state_autogen.go
+++ b/runsc/boot/filter/filter_race_state_autogen.go
@@ -1,5 +1,6 @@
 // automatically generated by stateify.
 
+//go:build race
 // +build race
 
 package filter
diff --git a/runsc/boot/filter/filter_state_autogen.go b/runsc/boot/filter/filter_state_autogen.go
index 0d245ca8a..4377166f9 100644
--- a/runsc/boot/filter/filter_state_autogen.go
+++ b/runsc/boot/filter/filter_state_autogen.go
@@ -1,7 +1,6 @@
 // automatically generated by stateify.
 
-// +build go1.1
-// +build !msan,!race
-// +build msan
+//go:build go1.1 && !msan && !race && msan
+// +build go1.1,!msan,!race,msan
 
 package filter
diff --git a/runsc/boot/pprof/pprof_state_autogen.go b/runsc/boot/pprof/pprof_state_autogen.go
index 64bdd7b52..4114c5cd8 100644
--- a/runsc/boot/pprof/pprof_state_autogen.go
+++ b/runsc/boot/pprof/pprof_state_autogen.go
@@ -1,5 +1,6 @@
 // automatically generated by stateify.
 
+//go:build go1.1
 // +build go1.1
 
 package pprof
diff --git a/runsc/cmd/cmd_state_autogen.go b/runsc/cmd/cmd_state_autogen.go
index f65d1508d..94f283a59 100644
--- a/runsc/cmd/cmd_state_autogen.go
+++ b/runsc/cmd/cmd_state_autogen.go
@@ -1,5 +1,6 @@
 // automatically generated by stateify.
 
+//go:build go1.1
 // +build go1.1
 
 package cmd
diff --git a/runsc/flag/flag_state_autogen.go b/runsc/flag/flag_state_autogen.go
index 5f6c0f28e..1166f6d5b 100644
--- a/runsc/flag/flag_state_autogen.go
+++ b/runsc/flag/flag_state_autogen.go
@@ -1,5 +1,6 @@
 // automatically generated by stateify.
 
+//go:build go1.1
 // +build go1.1
 
 package flag
diff --git a/runsc/fsgofer/filter/filter_amd64_state_autogen.go b/runsc/fsgofer/filter/filter_amd64_state_autogen.go
index 0f27e5568..19c1470c5 100644
--- a/runsc/fsgofer/filter/filter_amd64_state_autogen.go
+++ b/runsc/fsgofer/filter/filter_amd64_state_autogen.go
@@ -1,5 +1,6 @@
 // automatically generated by stateify.
 
+//go:build amd64
 // +build amd64
 
 package filter
diff --git a/runsc/fsgofer/filter/filter_arm64_state_autogen.go b/runsc/fsgofer/filter/filter_arm64_state_autogen.go
index e87cf5af7..c919c17bb 100644
--- a/runsc/fsgofer/filter/filter_arm64_state_autogen.go
+++ b/runsc/fsgofer/filter/filter_arm64_state_autogen.go
@@ -1,5 +1,6 @@
 // automatically generated by stateify.
 
+//go:build arm64
 // +build arm64
 
 package filter
diff --git a/runsc/fsgofer/filter/filter_race_state_autogen.go b/runsc/fsgofer/filter/filter_race_state_autogen.go
index c4a858e80..033b96638 100644
--- a/runsc/fsgofer/filter/filter_race_state_autogen.go
+++ b/runsc/fsgofer/filter/filter_race_state_autogen.go
@@ -1,5 +1,6 @@
 // automatically generated by stateify.
 
+//go:build race
 // +build race
 
 package filter
diff --git a/runsc/fsgofer/filter/filter_state_autogen.go b/runsc/fsgofer/filter/filter_state_autogen.go
index 41ff99424..3daffe032 100644
--- a/runsc/fsgofer/filter/filter_state_autogen.go
+++ b/runsc/fsgofer/filter/filter_state_autogen.go
@@ -1,6 +1,6 @@
 // automatically generated by stateify.
 
-// +build !msan,!race
-// +build msan
+//go:build !msan && !race && msan
+// +build !msan,!race,msan
 
 package filter
diff --git a/runsc/fsgofer/fsgofer_amd64_unsafe_state_autogen.go b/runsc/fsgofer/fsgofer_amd64_unsafe_state_autogen.go
index df6721aaa..335efb201 100644
--- a/runsc/fsgofer/fsgofer_amd64_unsafe_state_autogen.go
+++ b/runsc/fsgofer/fsgofer_amd64_unsafe_state_autogen.go
@@ -1,5 +1,6 @@
 // automatically generated by stateify.
 
+//go:build amd64
 // +build amd64
 
 package fsgofer
diff --git a/runsc/fsgofer/fsgofer_arm64_unsafe_state_autogen.go b/runsc/fsgofer/fsgofer_arm64_unsafe_state_autogen.go
index d2a18c61c..dd4015fc5 100644
--- a/runsc/fsgofer/fsgofer_arm64_unsafe_state_autogen.go
+++ b/runsc/fsgofer/fsgofer_arm64_unsafe_state_autogen.go
@@ -1,5 +1,6 @@
 // automatically generated by stateify.
 
+//go:build arm64
 // +build arm64
 
 package fsgofer
diff --git a/runsc/specutils/seccomp/seccomp_amd64_state_autogen.go b/runsc/specutils/seccomp/seccomp_amd64_state_autogen.go
index 27a96018b..6c95fd6fb 100644
--- a/runsc/specutils/seccomp/seccomp_amd64_state_autogen.go
+++ b/runsc/specutils/seccomp/seccomp_amd64_state_autogen.go
@@ -1,5 +1,6 @@
 // automatically generated by stateify.
 
+//go:build amd64
 // +build amd64
 
 package seccomp
diff --git a/runsc/specutils/seccomp/seccomp_arm64_state_autogen.go b/runsc/specutils/seccomp/seccomp_arm64_state_autogen.go
index 96c64c23d..e6f1039cd 100644
--- a/runsc/specutils/seccomp/seccomp_arm64_state_autogen.go
+++ b/runsc/specutils/seccomp/seccomp_arm64_state_autogen.go
@@ -1,5 +1,6 @@
 // automatically generated by stateify.
 
+//go:build arm64
 // +build arm64
 
 package seccomp