On Fri, Oct 20, 2017 at 05:51:13PM +0100, Peter Maydell wrote:
> On 13 October 2017 at 15:57, Stafford Horne <shorne@gmail.com> wrote:
> > Hello,
> >
> > Please consider for pull.
> >
> > The following changes since commit 7851197b812b383ae1208c5d86391c5179c8209d:
> >
> > Update version for 2.10.1 release (2017-10-02 12:42:58 -0500)
> >
> > are available in the git repository at:
> >
> > git://github.com/stffrdhrn/qemu.git tags/openrisc-20171113-smp-pr
> >
> > for you to fetch changes up to 017a118ebed8757ccdce6fa217640963579aeb13:
> >
> > openrisc: Only kick cpu on timeout, not on update (2017-10-13 23:31:22 +0900)
> >
> > ----------------------------------------------------------------
> > OpenRISC SMP patchset 20171113
> >
> > ----------------------------------------------------------------
> > Stafford Horne (5):
> > openrisc/ompic: Add OpenRISC Multicore PIC (OMPIC)
> > target/openrisc: Make coreid and numcores variable
> > openrisc/cputimer: Perparation for Multicore
> > openrisc: Initial SMP support
> > openrisc: Only kick cpu on timeout, not on update
>
> Hi -- I'm afraid this pull request doesn't apply to master.
> Looking at it, that seems to be because you've based it on the
> 2.10.1 branch. All pull requests for master need to be based
> on master -- can you rebase to the right thing and resubmit,
> please?
Yes, sorry. I didnt realize 2.10.1 was a branch, I will stick to master from
now on.
I have done the rebase and there was one minor conflict due to the
cpu_generic_init() changes. I retested and everything looks good, please look
out for the v2 PULL series.
-Stafford