Failed in applying to current master (
apply log)
Maintainers: "Hervé Poussineau" <hpoussin@reactos.org>, Aleksandar Rikalo <aleksandar.rikalo@syrmia.com>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, Paolo Bonzini <pbonzini@redhat.com>, "Marc-André Lureau" <marcandre.lureau@redhat.com>, "Daniel P. Berrangé" <berrange@redhat.com>, Thomas Huth <thuth@redhat.com>, Pavel Dovgalyuk <pavel.dovgaluk@ispras.ru>, Cleber Rosa <crosa@redhat.com>, Wainer dos Santos Moschetta <wainersm@redhat.com>, Beraldo Leal <bleal@redhat.com>, Laurent Vivier <lvivier@redhat.com>
meson.build | 6 ++--
hw/mips/jazz.c | 81 +++++++++++++++++++++----------------------
tests/qtest/m48t59-test.c | 12 +++----
tests/qtest/netdev-socket.c | 8 +++--
meson_options.txt | 2 ++
scripts/meson-buildoptions.sh | 3 ++
tests/avocado/replay_linux.py | 2 +-
7 files changed, 60 insertions(+), 54 deletions(-)