On 22/12/22 06:21, Markus Armbruster wrote:
Philippe Mathieu-Daudé <phi...@linaro.org> writes:
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:phi...@linaro.org"><phi...@linaro.org></a> commit 69779192acfeb9480183fd076be7480de56b1009 Signed-off-by: Philippe Mathieu-Daudé <a class="moz-txt-link-rfc2396E" href="mailto:phi...@linaro.org"><phi...@linaro.org></a> commit f983e598e5a4eada5bfa4731c9db9fba1943e4e6 Suggested-by: Richard Henderson <a class="moz-txt-link-rfc2396E" href="mailto:richard.hender...@linaro.org"><richard.hender...@linaro.org></a> Signed-off-by: Philippe Mathieu-Daudé <a class="moz-txt-link-rfc2396E" href="mailto:phi...@linaro.org"><phi...@linaro.org></a> Please stop that :)
The original patch looks fine: https://lore.kernel.org/qemu-devel/20221213111707.34921-7-phi...@linaro.org/ Michael, did you change something in your workflow?