On 27/6/23 20:54, Daniel Henrique Barboza wrote:
Phil,
Can you rebase this on top of Alistair's riscv-to-apply.next?
https://github.com/alistair23/qemu/tree/riscv-to-apply.next
There's a trivial conflict in patch 8 and a not so trivial conflict in
patch 14
that I'd rather let you deal with it.
Sure, no problem.
I'd like patches 1-4,6 to go for the 8.1 release. I don't expect the
rest to be picked, and am ready to rebase and repost once the tree
re-opens after the release. So don't worry about 8/14.
Also, can you take a look at these KVM patches to see if there's a
potential
design conflict with what you're doing here?
"[PATCH v5 00/19] target/riscv, KVM: fixes and enhancements"
We're missing a few details in one of the patches and it seems good to
go. I am
doing some stuff there that I'm unsure if it will compromise the work
you're
doing here (e.g. creating kvm user properties by using TCG user
properties). In
a quick glance at your series I think we'll be fine, but better safe
than sorry.
I had a quick look and I don't see any particular divergeance. Anyhow
your work is older and more important that what I'm cleaning here, so
don't worry :)
I guess I'll wait for you to send a rebased version of this series and
apply
mine on top of it to see what happens. That would be a good test.
Nah, at this point in the cycle, don't bother.
Thanks for having a look at this series!
Phil.