On 11 May 2018 at 05:23, Richard Henderson <richard.hender...@linaro.org> wrote:
> Stafford Horne has acked and asked that I send the pull-request.
>
>
> r~
>
>
> The following changes since commit e5cd695266c5709308aa95b1baae499e4b5d4544:
>
>   Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into 
> staging (2018-05-08 17:05:58 +0100)
>
> are available in the Git repository at:
>
>   https://github.com/rth7680/qemu.git tags/tgt-openrisc-pull-request
>
> for you to fetch changes up to cf88ad60531a5b06834f6bf373a5f7fa91f2c3a8:
>
>   target/openrisc: Merge disas_openrisc_insn (2018-05-10 21:19:13 -0700)
>
> ----------------------------------------------------------------
> Convert OpenRISC to decodetree.py

Hi -- I get a bunch of merge conflicts in target/openrisc/translate.c
trying to apply this. Can you rebase and resend, please?

thanks
-- PMM

Reply via email to