diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-01-27 23:45:00 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-01-27 23:45:00 +0000 |
| commit | e26ce51d1a5e6ccdcf2dcb10aaf761e0264f7d51 (patch) | |
| tree | a5a77be1c312396dd4e57482cb7213bf6f0a3910 /pkg/sentry/kernel/pipe/reader_writer.go | |
| parent | 39fc573e80eca187af64379bbf178da39a94cd29 (diff) | |
| parent | 0e2f1b7abd219f39d67cc2cecd00c441a13eeb29 (diff) | |
Merge release-20200115.0-110-g0e2f1b7 (automated)
Diffstat (limited to 'pkg/sentry/kernel/pipe/reader_writer.go')
| -rw-r--r-- | pkg/sentry/kernel/pipe/reader_writer.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/sentry/kernel/pipe/reader_writer.go b/pkg/sentry/kernel/pipe/reader_writer.go index b4d29fc77..b2b5691ee 100644 --- a/pkg/sentry/kernel/pipe/reader_writer.go +++ b/pkg/sentry/kernel/pipe/reader_writer.go @@ -17,11 +17,11 @@ package pipe import ( "io" + "gvisor.dev/gvisor/pkg/context" "gvisor.dev/gvisor/pkg/sentry/arch" - "gvisor.dev/gvisor/pkg/sentry/context" "gvisor.dev/gvisor/pkg/sentry/fs" "gvisor.dev/gvisor/pkg/sentry/fs/fsutil" - "gvisor.dev/gvisor/pkg/sentry/usermem" + "gvisor.dev/gvisor/pkg/usermem" ) // ReaderWriter satisfies the FileOperations interface and services both |