Pierrick Bouvier <[email protected]> writes:

> Signed-off-by: Pierrick Bouvier <[email protected]>
> ---
<snip>
>  tests/tcg/multiarch/Makefile.target           | 232 ---------------
<snip>

There is a conflict here, probably because of db6b71f1ad7 (Revert "tests/tcg: 
skip the vma-pthread test on CI")

-- 
Alex Bennée
Virtualisation Tech Lead @ Linaro

Reply via email to