diff options
| author | gVisor bot <gvisor-bot@google.com> | 2019-10-29 20:23:30 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2019-10-29 20:23:30 +0000 |
| commit | a3fdb33c4583a9443abca60e479884e0bf45919f (patch) | |
| tree | 47e6019abb94433b53c1d35cf179cdf44e58b0e8 /pkg/sentry | |
| parent | fd17402e9a4d1e8f6bbc381f0f28bdc104c09847 (diff) | |
| parent | c0b8fd4b6a9fcb595f3200577b93d07737cfaacd (diff) | |
Merge release-20190806.1-340-gc0b8fd4 (automated)
Diffstat (limited to 'pkg/sentry')
| -rw-r--r-- | pkg/sentry/platform/kvm/bluepill_unsafe.go | 2 | ||||
| -rw-r--r-- | pkg/sentry/platform/kvm/machine_unsafe.go | 2 | ||||
| -rw-r--r-- | pkg/sentry/platform/ptrace/subprocess_unsafe.go | 2 | ||||
| -rwxr-xr-x | pkg/sentry/vfs/mount_unsafe.go | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/pkg/sentry/platform/kvm/bluepill_unsafe.go b/pkg/sentry/platform/kvm/bluepill_unsafe.go index 7e8e9f42a..ee730ad70 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.14 +// +build !go1.15 // Check go:linkname function signatures when updating Go version. diff --git a/pkg/sentry/platform/kvm/machine_unsafe.go b/pkg/sentry/platform/kvm/machine_unsafe.go index 405e00292..e00c7ae40 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.14 +// +build !go1.15 // Check go:linkname function signatures when updating Go version. diff --git a/pkg/sentry/platform/ptrace/subprocess_unsafe.go b/pkg/sentry/platform/ptrace/subprocess_unsafe.go index b80a3604d..2ae6b9f9d 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.14 +// +build !go1.15 // Check go:linkname function signatures when updating Go version. diff --git a/pkg/sentry/vfs/mount_unsafe.go b/pkg/sentry/vfs/mount_unsafe.go index b0511aa40..75e6c7dfa 100755 --- a/pkg/sentry/vfs/mount_unsafe.go +++ b/pkg/sentry/vfs/mount_unsafe.go @@ -13,7 +13,7 @@ // limitations under the License. // +build go1.12 -// +build !go1.14 +// +build !go1.15 // Check go:linkname function signatures when updating Go version. |