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/tcpip | |
| parent | 9253ef5a85a731313fb148a5aa687575431f58dc (diff) | |
| parent | f80a857a4f5f57908c64a22f5de0e07df722227d (diff) | |
Merge release-20210208.0-73-gf80a857a4 (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 5db4bf12b..7f238102e 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.17 +// +build !go1.18 // 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 239d165f0..f5eace013 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.17 +// +build !go1.18 // +build linux package rawfile diff --git a/pkg/tcpip/tcpip_unsafe_state_autogen.go b/pkg/tcpip/tcpip_unsafe_state_autogen.go index 8f6fc08cf..92ada718b 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.17 +// +build !go1.18 package tcpip diff --git a/pkg/tcpip/time_unsafe.go b/pkg/tcpip/time_unsafe.go index 606363567..eeea97b12 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.17 +// +build !go1.18 // Check go:linkname function signatures when updating Go version. |