[CRIU] ✗ ci.openvz.org: failure for NFS migration support (rev4)

[Pavel Emelyanov]

On 05/20/2016 08:35 PM, Patchwork wrote:
> == Series Details ==
> 
> Series: NFS migration support (rev4)
> URL   : https://zdtm.openvz.org/series/137/
> State : failure
> 
> == Logs ==
> 
> For more details see: https://ci.openvz.org/job/CRIU/job/criu-patchwork/235//console


Falling back to patching base and 3-way merge...
Auto-merging images/mnt.proto
CONFLICT (content): Merge conflict in images/mnt.proto
Failed to merge in the changes.