[CRIU] ✗ travis-ci: failure for sockets: Placate logger when diag modules are missing

[Andrei Vagin]

[root at fc24 criu]# git-pw apply 3027
Applying series: sockets: Placate logger when diag modules are missing
(rev 2)
Applying: net: libnetlink -- Call error handler instead of unconditional
error message
Using index info to reconstruct a base tree...
M	criu/libnetlink.c
Falling back to patching base and 3-way merge...
Auto-merging criu/libnetlink.c
CONFLICT (content): Merge conflict in criu/libnetlink.c
error: Failed to merge in the changes.
Patch failed at 0001 net: libnetlink -- Call error handler instead of
unconditional error message
The copy of the patch that failed is found in: .git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".


On Thu, Sep 27, 2018 at 12:44:59PM +0000, Patchwork wrote:
> == Series Details ==
> 
> Series: sockets: Placate logger when diag modules are missing
> URL   : https://patchwork.criu.org/series/3027/
> State : failure
> 
> == Logs ==
> 
> For more details see: https://travis-ci.org/criupatchwork/criu/builds/434035052?utm_source=github_status&utm_medium=notification
> _______________________________________________
> CRIU mailing list
> CRIU at openvz.org
> https://lists.openvz.org/mailman/listinfo/criu