Eric Blake <ebl...@redhat.com> writes: > On 02/02/2018 12:37 PM, Markus Armbruster wrote: >> From: Alistair Francis <alistair.fran...@xilinx.com> >> >> Convert fprintf(stderr, ...) to use qemu_log(). Double prints in >> target/ppc/translate.c were manually remove. A fprintf() in >> target/sh4/translate.c was kept as it's inside a #if 0. The #if 0 and >> fflush() was removed around the unimplemented log in >> target/sh4/translate.c as well. >> >> Signed-off-by: Alistair Francis <alistair.fran...@xilinx.com> >> [Trivial conflict with 6f1c2af641d resolved] >> Signed-off-by: Markus Armbruster <arm...@redhat.com> >> --- >> dtc | 2 +- >> target/cris/translate.c | 2 +- >> target/ppc/translate.c | 36 ++++++++++-------------------------- >> target/sh4/translate.c | 7 ++----- >> target/unicore32/translate.c | 2 +- >> 5 files changed, 15 insertions(+), 34 deletions(-) >> >> diff --git a/dtc b/dtc >> index e54388015a..558cd81bdd 160000 >> --- a/dtc >> +++ b/dtc >> @@ -1 +1 @@ >> -Subproject commit e54388015af1fb4bf04d0bca99caba1074d9cc42 >> +Subproject commit 558cd81bdd432769b59bff01240c44f82cfb1a9d > > Intentional?
Rebase accident, good catch!
