diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-08-24 20:01:46 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-08-24 20:01:46 +0000 |
| commit | a7ddc49e790effe9d369d3aae3f5c1e2634c00da (patch) | |
| tree | ccab4932488c18fea6e3d9779d81aa2489047e02 /pkg/tcpip | |
| parent | 9e6ec44f211e4f7777154bce00b5c463f9e8d8ee (diff) | |
| parent | ab6c474210cca380e8e6504bb2368b077f50ceae (diff) | |
Merge release-20200818.0-33-gab6c47421 (automated)
Diffstat (limited to 'pkg/tcpip')
| -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 | ||||
| -rw-r--r-- | pkg/tcpip/tcpip_unsafe_state_autogen.go | 2 | ||||
| -rw-r--r-- | pkg/tcpip/time_unsafe.go | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/pkg/tcpip/link/rawfile/blockingpoll_yield_unsafe.go b/pkg/tcpip/link/rawfile/blockingpoll_yield_unsafe.go index 99313ee25..5db4bf12b 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.16 +// +build !go1.17 // 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 6e426ee05..239d165f0 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.16 +// +build !go1.17 // +build linux package rawfile diff --git a/pkg/tcpip/tcpip_unsafe_state_autogen.go b/pkg/tcpip/tcpip_unsafe_state_autogen.go index ae5ab873a..adefdcc37 100644 --- a/pkg/tcpip/tcpip_unsafe_state_autogen.go +++ b/pkg/tcpip/tcpip_unsafe_state_autogen.go @@ -1,7 +1,7 @@ // automatically generated by stateify. // +build go1.9 -// +build !go1.16 +// +build !go1.17 package tcpip diff --git a/pkg/tcpip/time_unsafe.go b/pkg/tcpip/time_unsafe.go index f32d58091..606363567 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.16 +// +build !go1.17 // Check go:linkname function signatures when updating Go version. |