diff options
| author | Andrei Vagin <avagin@gmail.com> | 2019-10-06 01:01:50 +0300 |
|---|---|---|
| committer | Andrei Vagin <avagin@gmail.com> | 2020-02-04 23:39:04 +0300 |
| commit | 3efe44382fef816ea274ed1833adc1abfa4b4f06 (patch) | |
| tree | b7d4cdcd24c08957549e46f3ca8d968fde944e92 /images | |
| parent | 6b264f591f42e0ee3e1ceee103d5c557184829d5 (diff) | |
image: avoid name conflicts in image files
Conflict register for file "sk-opts.proto": READ is already defined in
file "rpc.proto". Please fix the conflict by adding package name on the
proto file, or use different name for the duplication. Note: enum
values appear as siblings of the enum type instead of children of it.
https://github.com/checkpoint-restore/criu/issues/815
Signed-off-by: Andrei Vagin <avagin@gmail.com>
Diffstat (limited to 'images')
| -rw-r--r-- | images/rpc.proto | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/images/rpc.proto b/images/rpc.proto index fc2f1bce2..df1b5aed2 100644 --- a/images/rpc.proto +++ b/images/rpc.proto @@ -49,7 +49,7 @@ enum criu_cg_mode { enum criu_pre_dump_mode { SPLICE = 1; - READ = 2; + VM_READ = 2; }; message criu_opts { |