diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-05-29 22:46:46 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-05-29 22:46:46 +0000 |
| commit | 1ca003b78a6e1c633f5112b58f4ec81cf445afdf (patch) | |
| tree | d5186c91d929d14ad529f1b13d3581d9bea1d196 /pkg/tcpip/link | |
| parent | 7ce4a9b2edd6d65bbf3d21edc5db2bdae9b0cf49 (diff) | |
| parent | 65569cfca08a99e3700108cec64f3aa443c357b0 (diff) | |
Merge release-20200522.0-42-g65569cfc (automated)
Diffstat (limited to 'pkg/tcpip/link')
| -rw-r--r-- | pkg/tcpip/link/rawfile/blockingpoll_yield_unsafe.go | 2 | ||||
| -rw-r--r-- | pkg/tcpip/link/rawfile/rawfile_unsafe_state_autogen.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 0b5a6cf49..99313ee25 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.15 +// +build !go1.16 // 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 70d62c4a1..6e426ee05 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.15 +// +build !go1.16 // +build linux package rawfile |