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/tcpip | |
| parent | fd17402e9a4d1e8f6bbc381f0f28bdc104c09847 (diff) | |
| parent | c0b8fd4b6a9fcb595f3200577b93d07737cfaacd (diff) | |
Merge release-20190806.1-340-gc0b8fd4 (automated)
Diffstat (limited to 'pkg/tcpip')
| -rw-r--r-- | pkg/tcpip/link/rawfile/blockingpoll_yield_unsafe.go | 2 | ||||
| -rw-r--r-- | pkg/tcpip/time_unsafe.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkg/tcpip/link/rawfile/blockingpoll_yield_unsafe.go b/pkg/tcpip/link/rawfile/blockingpoll_yield_unsafe.go index dda3b10a6..0b5a6cf49 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.14 +// +build !go1.15 // Check go:linkname function signatures when updating Go version. diff --git a/pkg/tcpip/time_unsafe.go b/pkg/tcpip/time_unsafe.go index a52262e87..48764b978 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.14 +// +build !go1.15 // Check go:linkname function signatures when updating Go version. |