* [PATCH] migration: Fix duplicated included in meson.build
@ 2023-05-09 17:02 Juan Quintela
2023-05-16 15:35 ` Daniel P. Berrangé
2023-05-16 15:50 ` Peter Xu
0 siblings, 2 replies; 3+ messages in thread
From: Juan Quintela @ 2023-05-09 17:02 UTC (permalink / raw)
To: qemu-devel; +Cc: Peter Xu, Leonardo Bras, Juan Quintela
This is the commint with the merge error (not in the submited patch).
commit 52623f23b0d114837a0d6278180b3e3ae8947117
Author: Lukas Straub <lukasstraub2@web.de>
Date: Thu Apr 20 11:48:35 2023 +0200
ram-compress.c: Make target independent
Make ram-compress.c target independent.
Fixes: 52623f23b0d114837a0d6278180b3e3ae8947117
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
migration/meson.build | 1 -
1 file changed, 1 deletion(-)
diff --git a/migration/meson.build b/migration/meson.build
index b81ccaec13..6b5c5a02f5 100644
--- a/migration/meson.build
+++ b/migration/meson.build
@@ -23,7 +23,6 @@ softmmu_ss.add(files(
'migration.c',
'multifd.c',
'multifd-zlib.c',
- 'multifd-zlib.c',
'ram-compress.c',
'options.c',
'postcopy-ram.c',
--
2.40.0
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] migration: Fix duplicated included in meson.build
2023-05-09 17:02 [PATCH] migration: Fix duplicated included in meson.build Juan Quintela
@ 2023-05-16 15:35 ` Daniel P. Berrangé
2023-05-16 15:50 ` Peter Xu
1 sibling, 0 replies; 3+ messages in thread
From: Daniel P. Berrangé @ 2023-05-16 15:35 UTC (permalink / raw)
To: Juan Quintela; +Cc: qemu-devel, Peter Xu, Leonardo Bras
On Tue, May 09, 2023 at 07:02:17PM +0200, Juan Quintela wrote:
> This is the commint with the merge error (not in the submited patch).
>
> commit 52623f23b0d114837a0d6278180b3e3ae8947117
> Author: Lukas Straub <lukasstraub2@web.de>
> Date: Thu Apr 20 11:48:35 2023 +0200
>
> ram-compress.c: Make target independent
>
> Make ram-compress.c target independent.
>
> Fixes: 52623f23b0d114837a0d6278180b3e3ae8947117
> Signed-off-by: Juan Quintela <quintela@redhat.com>
> ---
> migration/meson.build | 1 -
> 1 file changed, 1 deletion(-)
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
With regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] migration: Fix duplicated included in meson.build
2023-05-09 17:02 [PATCH] migration: Fix duplicated included in meson.build Juan Quintela
2023-05-16 15:35 ` Daniel P. Berrangé
@ 2023-05-16 15:50 ` Peter Xu
1 sibling, 0 replies; 3+ messages in thread
From: Peter Xu @ 2023-05-16 15:50 UTC (permalink / raw)
To: Juan Quintela; +Cc: qemu-devel, Leonardo Bras
On Tue, May 09, 2023 at 07:02:17PM +0200, Juan Quintela wrote:
> This is the commint with the merge error (not in the submited patch).
>
> commit 52623f23b0d114837a0d6278180b3e3ae8947117
> Author: Lukas Straub <lukasstraub2@web.de>
> Date: Thu Apr 20 11:48:35 2023 +0200
>
> ram-compress.c: Make target independent
>
> Make ram-compress.c target independent.
>
> Fixes: 52623f23b0d114837a0d6278180b3e3ae8947117
> Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
--
Peter Xu
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-05-16 15:50 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-05-09 17:02 [PATCH] migration: Fix duplicated included in meson.build Juan Quintela
2023-05-16 15:35 ` Daniel P. Berrangé
2023-05-16 15:50 ` Peter Xu
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).