diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-04-02 19:01:43 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-04-02 19:01:43 +0000 |
| commit | 36051731334c63a63d8667278d75a307b53201fa (patch) | |
| tree | 1fdb7d7a94741adcfd6bcb8cf490fbe3dcf42fca /pkg | |
| parent | 139f4fec9679157a2dff5ead91ad91088a920440 (diff) | |
| parent | 30388ff5919df33e7184719dfc6c0d9cb110b2e2 (diff) | |
Merge release-20200323.0-57-g30388ff (automated)
Diffstat (limited to 'pkg')
| -rwxr-xr-x | pkg/sync/mutex_unsafe.go (renamed from pkg/sync/tmutex_unsafe.go) | 0 | ||||
| -rwxr-xr-x | pkg/sync/rwmutex_unsafe.go (renamed from pkg/sync/downgradable_rwmutex_unsafe.go) | 0 | ||||
| -rwxr-xr-x | pkg/sync/sync.go (renamed from pkg/sync/syncutil.go) | 0 | ||||
| -rwxr-xr-x | pkg/sync/sync_state_autogen.go | 4 |
4 files changed, 2 insertions, 2 deletions
diff --git a/pkg/sync/tmutex_unsafe.go b/pkg/sync/mutex_unsafe.go index 3dd15578b..3dd15578b 100755 --- a/pkg/sync/tmutex_unsafe.go +++ b/pkg/sync/mutex_unsafe.go diff --git a/pkg/sync/downgradable_rwmutex_unsafe.go b/pkg/sync/rwmutex_unsafe.go index ea6cdc447..ea6cdc447 100755 --- a/pkg/sync/downgradable_rwmutex_unsafe.go +++ b/pkg/sync/rwmutex_unsafe.go diff --git a/pkg/sync/syncutil.go b/pkg/sync/sync.go index b16cf5333..b16cf5333 100755 --- a/pkg/sync/syncutil.go +++ b/pkg/sync/sync.go diff --git a/pkg/sync/sync_state_autogen.go b/pkg/sync/sync_state_autogen.go index 7ce796ad8..6876ee883 100755 --- a/pkg/sync/sync_state_autogen.go +++ b/pkg/sync/sync_state_autogen.go @@ -1,9 +1,9 @@ // automatically generated by stateify. -// +build go1.13 -// +build !go1.15 // +build go1.12 // +build !go1.15 +// +build go1.13 +// +build !go1.15 // +build !race // +build race // +build go1.13 |