From: "Philippe Mathieu-Daudé via" <qemu-devel@nongnu.org>
To: Akihiko Odaki <akihiko.odaki@gmail.com>, qemu-devel@nongnu.org
Cc: "Cameron Esfahani" <dirty@apple.com>,
"Peter Maydell" <peter.maydell@linaro.org>,
"Will Cohen" <wwcohen@gmail.com>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Christian Schoenebeck" <qemu_oss@crudebyte.com>,
"Roman Bolshakov" <r.bolshakov@yadro.com>,
"Li Zhang" <lizhang@suse.de>
Subject: Re: [PATCH v4 01/13] lcitool: refresh
Date: Mon, 14 Feb 2022 13:10:30 +0100 [thread overview]
Message-ID: <ccacb932-0d51-10c4-081c-ab1a8ad95f4a@amsat.org> (raw)
In-Reply-To: <d1bfb5c5-8b7b-849d-d0a4-cab3ebe07057@gmail.com>
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.
next prev parent reply other threads:[~2022-02-14 13:24 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-11 16:34 [PATCH v4 00/13] host: Support macOS 12 Philippe Mathieu-Daudé via
2022-02-11 16:34 ` [PATCH v4 01/13] lcitool: refresh Philippe Mathieu-Daudé via
2022-02-12 15:14 ` Akihiko Odaki
2022-02-14 12:10 ` Philippe Mathieu-Daudé via [this message]
2022-02-11 16:34 ` [PATCH v4 02/13] configure: Allow passing extra Objective C compiler flags Philippe Mathieu-Daudé via
2022-02-11 16:34 ` [PATCH v4 03/13] tests/fp/berkeley-testfloat-3: Ignore ignored #pragma directives Philippe Mathieu-Daudé via
2022-02-11 16:34 ` [PATCH v4 04/13] hvf: Use standard CR0 and CR4 register definitions Philippe Mathieu-Daudé via
2022-02-11 16:34 ` [PATCH v4 05/13] hvf: Fix OOB write in RDTSCP instruction decode Philippe Mathieu-Daudé via
2022-02-14 12:49 ` Philippe Mathieu-Daudé via
2022-02-11 16:34 ` [PATCH v4 06/13] hvf: Enable RDTSCP support Philippe Mathieu-Daudé via
2022-02-11 16:34 ` [PATCH v4 07/13] hvf: Make hvf_get_segments() / hvf_put_segments() local Philippe Mathieu-Daudé via
2022-02-11 16:34 ` [PATCH v4 08/13] hvf: Remove deprecated hv_vcpu_flush() calls Philippe Mathieu-Daudé via
2022-02-11 16:34 ` [PATCH v4 09/13] block/file-posix: Remove a deprecation warning on macOS 12 Philippe Mathieu-Daudé via
2022-02-12 13:35 ` Christian Schoenebeck
2022-02-14 3:27 ` Cameron Esfahani
2022-02-11 16:34 ` [PATCH v4 10/13] audio/coreaudio: " Philippe Mathieu-Daudé via
2022-02-12 13:15 ` Christian Schoenebeck
2022-02-12 15:23 ` Akihiko Odaki
2022-02-12 17:27 ` Christian Schoenebeck
2022-02-12 17:41 ` Christian Schoenebeck
2022-02-14 12:43 ` Philippe Mathieu-Daudé via
2022-02-11 16:34 ` [PATCH v4 11/13] audio/dbus: Fix building with modules on macOS Philippe Mathieu-Daudé via
2022-02-11 16:34 ` [PATCH v4 12/13] ui/cocoa: Remove allowedFileTypes restriction in SavePanel Philippe Mathieu-Daudé via
2022-02-12 13:25 ` Christian Schoenebeck
2022-02-14 3:26 ` Cameron Esfahani
2022-02-11 16:34 ` [PATCH v4 13/13] gitlab-ci: Support macOS 12 via cirrus-run Philippe Mathieu-Daudé via
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ccacb932-0d51-10c4-081c-ab1a8ad95f4a@amsat.org \
--to=qemu-devel@nongnu.org \
--cc=akihiko.odaki@gmail.com \
--cc=alex.bennee@linaro.org \
--cc=dirty@apple.com \
--cc=f4bug@amsat.org \
--cc=lizhang@suse.de \
--cc=peter.maydell@linaro.org \
--cc=qemu_oss@crudebyte.com \
--cc=r.bolshakov@yadro.com \
--cc=wwcohen@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).