[PATCH v2] azure: gitlab: travis: Update OpenSBI used for RISC-V testing

[Rick Chen]

Hi Bin

> Hi Rick,
>
> On Mon, Jul 20, 2020 at 11:16 AM Rick Chen <rickchen36 at gmail.com> wrote:
> >
> > Hi Bin
> >
> > > From: Bin Meng [mailto:bmeng.cn at gmail.com]
> > > Sent: Monday, July 20, 2020 10:41 AM
> > > To: Rick Jian-Zhi Chen(陳建志); U-Boot Mailing List
> > > Cc: Tom Rini; Bin Meng
> > > Subject: Re: [PATCH v2] azure: gitlab: travis: Update OpenSBI used for RISC-V testing
> > >
> > > Hi Rick,
> > >
> > > On Thu, Jul 16, 2020 at 5:15 PM Bin Meng <bmeng.cn at gmail.com> wrote:
> > > >
> > > > From: Bin Meng <bin.meng at windriver.com>
> > > >
> > > > Change to use OpenSBI release v0.8 generic platform images for QEMU
> > > > RISC-V CI testing for azure, gitlab and travis-ci.
> > > >
> > > > Signed-off-by: Bin Meng <bin.meng at windriver.com>
> > > > Reviewed-by: Tom Rini <trini at konsulko.com>
> > > > ---
> > > >
> > > > Changes in v2:
> > > > - rebase on u-boot/master
> > > >
> > > >  .azure-pipelines.yml | 8 ++++----
> > > >  .gitlab-ci.yml       | 8 ++++----
> > > >  .travis.yml          | 8 ++++----
> > > >  3 files changed, 12 insertions(+), 12 deletions(-)
> > > >
> > >
> > > Ping?
> >
> > It still conflict with u-boot/master.
> >
> > Applying: azure: gitlab: travis: Update OpenSBI used for RISC-V testing
> > error: patch failed: .azure-pipelines.yml:299
> > error: .azure-pipelines.yml: patch does not apply
> > error: patch failed: .gitlab-ci.yml:25
> > error: .gitlab-ci.yml: patch does not apply
> >
>
> I suspect this is because u-boot-riscv/master is a little bit old. Can
> you rebase u-boot-riscv/master on top of u-boot/master and retry?

Yes, I have rebased to the latest u-boot/master. But the conflicts still occur

Thanks,
Rick.

>
> Regards,
> Bin