diff options
| author | Keiichi Watanabe <keiichiw@chromium.org> | 2021-07-09 17:34:48 +0900 |
|---|---|---|
| committer | Keiichi Watanabe <keiichiw@chromium.org> | 2021-07-09 17:34:48 +0900 |
| commit | 3091854e27242d09453004b011f701fa29c0b8e8 (patch) | |
| tree | c4513d000e87f9f277d477026748e0a909cf1a22 /OWNERS | |
| parent | eaca5d36a2701c99b354ab5bc0954a78dfc9ff4f (diff) | |
| parent | 12fa07029bb4dd2293900c080d741f33b26b8698 (diff) | |
| download | vmm_vhost-3091854e27242d09453004b011f701fa29c0b8e8.tar.gz | |
Merge remote-tracking branch 'upstream/master' into HEAD
Conflicts:
Cargo.toml
src/vhost_user/connection.rs
They conflicted with "0323efc use sys_util and tempfile from crosvm".
BUG=none
TEST=cargo test --all-features
Cq-Depend: chromium:2884021
Change-Id: I383721c587a065679078237e175f048152b8d6ec
Diffstat (limited to 'OWNERS')
0 files changed, 0 insertions, 0 deletions