Switched to a new branch '20190516091153.31502-1-wei.liu2@citrix.com'
Applying: libxl: fix regression introduced in 5c883cf036cf
error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	tools/libxl/libxl_device.c
Falling back to patching base and 3-way merge...
Auto-merging tools/libxl/libxl_device.c
CONFLICT (content): Merge conflict in tools/libxl/libxl_device.c
Patch failed at 0001 libxl: fix regression introduced in 5c883cf036cf
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".
Failed to apply patch:
[Xen-devel] [PATCH] libxl: fix regression introduced in 5c883cf036cf