Re: [PATCH v4 01/13] lcitool: refresh

[Philippe Mathieu-Daudé]

On 12/2/22 16:14, Akihiko Odaki wrote:
> On 2022/02/12 1:34, Philippe Mathieu-Daudé via wrote:
> > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> > ---
> >   tests/docker/dockerfiles/ubuntu1804.docker | 2 --
> >   tests/docker/dockerfiles/ubuntu2004.docker | 2 --
> >   2 files changed, 4 deletions(-)

> > diff --git a/tests/docker/dockerfiles/ubuntu2004.docker 
> > b/tests/docker/dockerfiles/ubuntu2004.docker
> > index 87513125b8..159e7f60c9 100644
> > --- a/tests/docker/dockerfiles/ubuntu2004.docker
> > +++ b/tests/docker/dockerfiles/ubuntu2004.docker
> > @@ -66,7 +66,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
> >               libpam0g-dev \
> >               libpcre2-dev \
> >               libpixman-1-dev \
> > -            libpmem-dev \
> >               libpng-dev \
> >               libpulse-dev \
> >               librbd-dev \
> > @@ -91,7 +90,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
> >               libvdeplug-dev \
> >               libvirglrenderer-dev \
> >               libvte-2.91-dev \
> > -            libxen-dev \
> >               libzstd-dev \
> >               llvm \
> >               locales \
>
> This can't be applied to master.
>
> % git am ~/mbox.txt
> Applying: lcitool: refresh
> error: patch failed: tests/docker/dockerfiles/ubuntu1804.docker:89
> error: tests/docker/dockerfiles/ubuntu1804.docker: patch does not apply
> error: patch failed: tests/docker/dockerfiles/ubuntu2004.docker:91
> error: tests/docker/dockerfiles/ubuntu2004.docker: patch does not apply
> Patch failed at 0001 lcitool: refresh

This was based on the testing/next tree which is now merged,
so this should now applies directly.