Message ID | 20200429182856.2588202-1-alistair.francis@wdc.com |
---|---|
State | New |
Headers | show |
On Wed, 29 Apr 2020 at 19:37, Alistair Francis <alistair.francis@wdc.com> wrote: > > The following changes since commit a7922a3c81f34f45b1ebc9670a7769edc4c42a43: > > Open 5.1 development tree (2020-04-29 15:07:10 +0100) > > are available in the Git repository at: > > git@github.com:alistair23/qemu.git tags/pull-riscv-to-apply-20200429-1 > > for you to fetch changes up to 23766b6a35d5b1664ab782c02624bf2435c4ed5d: > > hw/riscv/spike: Allow more than one CPUs (2020-04-29 11:23:44 -0700) > > ---------------------------------------------------------------- > RISC-V pull request for 5.1 > > This is the first pull request for the 5.1 development period. It > contains all of the patches that were sent during the 5.0 timeframe. > > This is an assortment of fixes for RISC-V, including fixes for the > Hypervisor extension, the Spike machine and an update to OpenSBI. > > -------------------------------------------------------------- Hi; this doesn't apply to current master. The conflict looks like it's probably pretty easy to fix up, but could you fix it and resend, please? thanks -- PMM
On Wed, Apr 29, 2020 at 1:04 PM Peter Maydell <peter.maydell@linaro.org> wrote: > > On Wed, 29 Apr 2020 at 19:37, Alistair Francis <alistair.francis@wdc.com> wrote: > > > > The following changes since commit a7922a3c81f34f45b1ebc9670a7769edc4c42a43: > > > > Open 5.1 development tree (2020-04-29 15:07:10 +0100) > > > > are available in the Git repository at: > > > > git@github.com:alistair23/qemu.git tags/pull-riscv-to-apply-20200429-1 > > > > for you to fetch changes up to 23766b6a35d5b1664ab782c02624bf2435c4ed5d: > > > > hw/riscv/spike: Allow more than one CPUs (2020-04-29 11:23:44 -0700) > > > > ---------------------------------------------------------------- > > RISC-V pull request for 5.1 > > > > This is the first pull request for the 5.1 development period. It > > contains all of the patches that were sent during the 5.0 timeframe. > > > > This is an assortment of fixes for RISC-V, including fixes for the > > Hypervisor extension, the Spike machine and an update to OpenSBI. > > > > -------------------------------------------------------------- > > Hi; this doesn't apply to current master. The conflict looks like > it's probably pretty easy to fix up, but could you fix it and resend, > please? Done! There was a conflict with the other PR that went in after I sent the PR. Should be good to go now. Alistair > > thanks > -- PMM >