PS: While looking for commits that caused these conflicts, I saw
commit 28b629ab4aa93b9b7ec79c7e480611e4554586be
Signed-off-by: Philippe Mathieu-Daudé <a class="moz-txt-link-rfc2396E"
href="mailto:philmd@linaro.org"><philmd@linaro.org></a>
commit 69779192acfeb9480183fd076be7480de56b1009
Signed-off-by: Philippe Mathieu-Daudé <a class="moz-txt-link-rfc2396E"
href="mailto:philmd@linaro.org"><philmd@linaro.org></a>
commit f983e598e5a4eada5bfa4731c9db9fba1943e4e6
Suggested-by: Richard Henderson <a class="moz-txt-link-rfc2396E"
href="mailto:richard.henderson@linaro.org"><richard.henderson@linaro.org></a>
Signed-off-by: Philippe Mathieu-Daudé <a class="moz-txt-link-rfc2396E"
href="mailto:philmd@linaro.org"><philmd@linaro.org></a>
Please stop that :)