diff options
| author | gVisor bot <gvisor-bot@google.com> | 2021-02-18 23:35:57 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2021-02-18 23:35:57 +0000 |
| commit | 86cb33a031425bcc61210778836acfb935c4d7db (patch) | |
| tree | aaf1ee3e79fd67b339e1922e193368ea3f5df488 /pkg/sentry | |
| parent | 9253ef5a85a731313fb148a5aa687575431f58dc (diff) | |
| parent | f80a857a4f5f57908c64a22f5de0e07df722227d (diff) | |
Merge release-20210208.0-73-gf80a857a4 (automated)
Diffstat (limited to 'pkg/sentry')
5 files changed, 6 insertions, 6 deletions
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. |