From nobody Mon May 13 05:32:55 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1683651795; cv=none; d=zohomail.com; s=zohoarc; b=GYhC+2s39V8ZGWemqeRglaz3VuT+rOb5EE3Px30mFjV+yvqCVGQkbMAnJ4lcxA2yS/gbWmoGFrZ/StV/52FkjmyRWschNnU3X3SUGS72RNKVYR5d/o5t5W8g2lJ6Ph2LcBYPFQGkmZizAAToe/rfaiWsusEAciwlS+Z4p2B3Vvg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1683651795; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=w+T1PU/VS1lCXYmNNNmLuDgqDBP6wzfwHm7Fj0oBCtU=; b=fQShIJZU56pT2qnuB6tzs6I8ez/hJtiTmNwTRIRePD9LoSoX5TvoP00vAKY/Cto1He3zsF5GQa+jYrQaXNPakIGfmgW1w3JfK9g1AFmbLQSIOEB/GkS3yzhUzyaMXc4XHrxlJM9uP6TsFLbSjVLCD2jkaTgkcW1ewDMeb8nhNbc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1683651795356248.8128213907189; Tue, 9 May 2023 10:03:15 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pwQjT-0003JI-IK; Tue, 09 May 2023 13:02:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pwQjK-0003HH-Np for qemu-devel@nongnu.org; Tue, 09 May 2023 13:02:27 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pwQjJ-0005Ke-1z for qemu-devel@nongnu.org; Tue, 09 May 2023 13:02:26 -0400 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-338-psrC6psfMpqd4wazNsaYDw-1; Tue, 09 May 2023 13:02:20 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A751E3C0F675 for ; Tue, 9 May 2023 17:02:19 +0000 (UTC) Received: from secure.mitica (unknown [10.39.193.236]) by smtp.corp.redhat.com (Postfix) with ESMTP id E030640C6E68; Tue, 9 May 2023 17:02:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1683651741; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=w+T1PU/VS1lCXYmNNNmLuDgqDBP6wzfwHm7Fj0oBCtU=; b=jSUrLNJPW/Ap3LtfZu7DZNbiPZuCEvx4IpKbzWa6ZEuHzIiE19URBnLlOOZ/XaZ/fI094D Hzh6qFDF1DYwvdrGIL5fEL4yNEVQ5tLMd8mAEWIxGQcvXe2lZfo1F2OF1fOUmmbxTOgkzl y31eFJwok9S87fzHuAXbqamfKTUuZd4= X-MC-Unique: psrC6psfMpqd4wazNsaYDw-1 From: Juan Quintela To: qemu-devel@nongnu.org Cc: Peter Xu , Leonardo Bras , Juan Quintela Subject: [PATCH] migration: Fix duplicated included in meson.build Date: Tue, 9 May 2023 19:02:17 +0200 Message-Id: <20230509170217.83246-1-quintela@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=quintela@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1683651797100100003 Content-Type: text/plain; charset="utf-8" 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=C3=A9 Reviewed-by: Peter Xu --- 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', --=20 2.40.0