diff options
| author | Kevin Krakauer <krakauer@google.com> | 2020-01-29 13:21:12 -0800 |
|---|---|---|
| committer | Kevin Krakauer <krakauer@google.com> | 2020-01-29 13:21:12 -0800 |
| commit | b615f94aeacb2c21bb59c8b44f303e7b7ca05ad6 (patch) | |
| tree | 79907e842eeba2a1f01acb5b5661800dc6ef2174 /pkg/sentry/fs/inotify.go | |
| parent | d6a2e01d3e57e0837c7e5cfda3b56c4dcfbb4627 (diff) | |
| parent | 148fda60e8dee29f2df85e3104e3d5de1a225bcf (diff) | |
Merge branch 'master' into ipt-udp-matchers
Diffstat (limited to 'pkg/sentry/fs/inotify.go')
| -rw-r--r-- | pkg/sentry/fs/inotify.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/sentry/fs/inotify.go b/pkg/sentry/fs/inotify.go index cc7dd1c92..928c90aa0 100644 --- a/pkg/sentry/fs/inotify.go +++ b/pkg/sentry/fs/inotify.go @@ -19,13 +19,13 @@ import ( "sync/atomic" "gvisor.dev/gvisor/pkg/abi/linux" + "gvisor.dev/gvisor/pkg/context" "gvisor.dev/gvisor/pkg/sentry/arch" - "gvisor.dev/gvisor/pkg/sentry/context" "gvisor.dev/gvisor/pkg/sentry/memmap" "gvisor.dev/gvisor/pkg/sentry/uniqueid" - "gvisor.dev/gvisor/pkg/sentry/usermem" "gvisor.dev/gvisor/pkg/sync" "gvisor.dev/gvisor/pkg/syserror" + "gvisor.dev/gvisor/pkg/usermem" "gvisor.dev/gvisor/pkg/waiter" ) |