diff options
| author | gVisor bot <gvisor-bot@google.com> | 2021-07-28 01:18:12 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2021-07-28 01:18:12 +0000 |
| commit | a41384306d0ab75f6b0ceac3d5e0047531e3ad4f (patch) | |
| tree | d019e4466c09d970d368402ea4bf7f5d597fb0f2 /pkg/sentry/socket | |
| parent | ab1c2bd3680ffe5ff4a614bc320a9b367f3fdc8d (diff) | |
| parent | 964fb3ca768756fbc58d1d9312c53886964ae608 (diff) | |
Merge release-20210720.0-39-g964fb3ca7 (automated)
Diffstat (limited to 'pkg/sentry/socket')
| -rw-r--r-- | pkg/sentry/socket/hostinet/hostinet_impl_state_autogen.go | 1 | ||||
| -rw-r--r-- | pkg/sentry/socket/netfilter/netfilter_abi_autogen_unsafe.go | 6 |
2 files changed, 1 insertions, 6 deletions
diff --git a/pkg/sentry/socket/hostinet/hostinet_impl_state_autogen.go b/pkg/sentry/socket/hostinet/hostinet_impl_state_autogen.go index 7dd0e5006..e52b4a6d6 100644 --- a/pkg/sentry/socket/hostinet/hostinet_impl_state_autogen.go +++ b/pkg/sentry/socket/hostinet/hostinet_impl_state_autogen.go @@ -1,5 +1,6 @@ // automatically generated by stateify. +//go:build go1.1 // +build go1.1 package hostinet diff --git a/pkg/sentry/socket/netfilter/netfilter_abi_autogen_unsafe.go b/pkg/sentry/socket/netfilter/netfilter_abi_autogen_unsafe.go index ea4abc34f..786b62935 100644 --- a/pkg/sentry/socket/netfilter/netfilter_abi_autogen_unsafe.go +++ b/pkg/sentry/socket/netfilter/netfilter_abi_autogen_unsafe.go @@ -1,11 +1,5 @@ // Automatically generated marshal implementation. See tools/go_marshal. -// If there are issues with build tag aggregation, see -// tools/go_marshal/gomarshal/generator.go:writeHeader(). The build tags here -// come from the input set of files used to generate this file. This input set -// is filtered based on pre-defined file suffixes related to build tags, see -// tools/defs.bzl:calculate_sets(). - package netfilter import ( |