From ba9d2cbc01b4e33f9a97edcd77247831a333eac2 Mon Sep 17 00:00:00 2001 From: Juan Quintela Date: Tue, 9 May 2023 19:02:17 +0200 Subject: [PATCH] migration: Fix duplicated included in meson.build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is the commint with the merge error (not in the submited patch). commit 52623f23b0d114837a0d6278180b3e3ae8947117 Author: Lukas Straub 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 Reviewed-by: Daniel P. Berrangé Reviewed-by: Peter Xu Message-Id: <20230509170217.83246-1-quintela@redhat.com> --- migration/meson.build | 1 - 1 file changed, 1 deletion(-) diff --git a/migration/meson.build b/migration/meson.build index b3d0c537c8..a8e01e70ae 100644 --- a/migration/meson.build +++ b/migration/meson.build @@ -22,7 +22,6 @@ softmmu_ss.add(files( 'migration.c', 'multifd.c', 'multifd-zlib.c', - 'multifd-zlib.c', 'ram-compress.c', 'options.c', 'postcopy-ram.c',