On Mon, 27 Jan 2020 at 19:01, Richard Henderson <richard.hender...@linaro.org> wrote: > > Version 4 fixes trivial conflicts with > > commit 4f67d30b5e74e060b8dbe10528829b47345cd6e8 > Author: Marc-André Lureau <marcandre.lur...@redhat.com> > Date: Fri Jan 10 19:30:32 2020 +0400 > > qdev: set properties with device_class_set_props() > > > r~ > > > The following changes since commit 105b07f1ba462ec48b27e5cb74ddf81c6a79364c: > > Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20200127' into > staging (2020-01-27 13:02:36 +0000) > > are available in the Git repository at: > > https://github.com/rth7680/qemu.git tags/pull-pa-20200127 > > for you to fetch changes up to b1af755c33bf0d690553a5ccd93689dfd15a98e8: > > target/hppa: Allow, but diagnose, LDCW aligned only mod 4 (2020-01-27 > 10:49:51 -0800) > > ---------------------------------------------------------------- > Improve LASI emulation > Add Artist graphics > Fix main memory allocation > Improve LDCW emulation wrt real hw >
Applied, thanks. Please update the changelog at https://wiki.qemu.org/ChangeLog/5.0 for any user-visible changes. -- PMM
