From nobody Sun Nov 24 01:01:57 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=1728299072; cv=none; d=zohomail.com; s=zohoarc; b=BX+5qKg80q2SKk658I6cK4Z0Vvm12YNCu99XlP1yzIMmMHewLcC6uWa8HAiolDxJFwpwpnnZw62ZVAk3v1vVbhA9piK6acvqIsg9+lCQPLquZACtsIWR+kUuZ5tRw/3N02PT/T0sPAJ1OKNS9NDvJ8eT7RJjhI+4AKBfgVAj7BE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1728299072; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=20dyWKLKsbm7AEIlw57210l6FlDmgfQn7D0criFKTj8=; b=fCCWs+vHzFFqLPdD0jXEaVgXATQywkTvl6qD/llFcb+eKeB06KklXFMDjY2c/dXQ/9Fs+kuIfQ1NsMlb8p/5etjINL18xmIQg7Ei36Yq4zOwK25wbcUXCGw4X9x/Eku1bJyKRm1+4ocEGMgjywlukKZAnBIRhOniZ6g+3N0ktDw= 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 172829907238493.7766598901054; Mon, 7 Oct 2024 04:04:32 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sxlXH-0001nv-HO; Mon, 07 Oct 2024 07:04:19 -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 1sxlXE-0001nA-8S for qemu-devel@nongnu.org; Mon, 07 Oct 2024 07:04:16 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sxlXC-0006XK-Mk for qemu-devel@nongnu.org; Mon, 07 Oct 2024 07:04:16 -0400 Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-659-Nog-IN-pP3CxoJL11WPFnA-1; Mon, 07 Oct 2024 07:04:12 -0400 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-42cb6f3c476so38931215e9.0 for ; Mon, 07 Oct 2024 04:04:12 -0700 (PDT) Received: from avogadro.local ([151.62.111.131]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-37d1695e462sm5488869f8f.87.2024.10.07.04.04.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Oct 2024 04:04:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1728299054; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=20dyWKLKsbm7AEIlw57210l6FlDmgfQn7D0criFKTj8=; b=Y5uj/dRLkSb9BqJdVnKT8jDDqd1vDfNfeFjQZVfuKhcBRq/BxAAiFgherwoFnuClosjBZZ caK/C5J8Pnd2ryh5ISIlBhU7nYpfWyfxrwzHN+d4SCpF8xHl5K1urWVB/tf9X4mP53QQ9u pMxI6WX3Fbv+lSEuvCTsFqaUNebV4/c= X-MC-Unique: Nog-IN-pP3CxoJL11WPFnA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728299050; x=1728903850; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=20dyWKLKsbm7AEIlw57210l6FlDmgfQn7D0criFKTj8=; b=oDFeBevVUzeitriEMMVa0AeqqNYTKCzhd9G8/nxnUKB345YD9wxeKdbnF1Sw2i414B ZQnMdHn+ONU9qVicukOMJEjk0g9M4q1xSirqYYdO8blV61K+h2I00ifXZa+wjBYwiC9N 5gcVhP95TyIxS31K5lSuZJDOoPMOBha3EsN1ES/fn4FeoKlJuglzJBIirz99uh71ZRoR wyOI0s3azwihNJnI+THAX2DS+b93+vEoqZPp0lvdKCjNfifQFLydTG3KaZFxBmp5N6qz /t9SoqsWmn5aOoLVopKo9LkL1Y3VcvpgXqy4HmYzx5ivrgPdsBdeF99OjnnvEzsQyGR3 RlAg== X-Gm-Message-State: AOJu0YySUA6uGdWKRryQklkcfemRY7KXreUMONEBT6Qqn3TvOaAIrrAr eBI+dr7cAeh6sUZ7QiaN8FSztD9vrnzc62Au+/BaGnq8eZ/jSgUEZ3liaHjKAgdGtGEGMlfYms0 2q6XzACyr5+OxEj8w/bQ358RCFPYYXckPnwtM3BsviOi8SuWzLwNmlIXEnsU3i21b/H3zDSUd8z /5i+DMqm3Y7DAP58E/q5HLD7o4iWbg6NYsvlqxLOM= X-Received: by 2002:a05:600c:3b96:b0:42f:6878:a696 with SMTP id 5b1f17b1804b1-42f85ab9c1amr87493545e9.21.1728299050475; Mon, 07 Oct 2024 04:04:10 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFHs7YjEMTk8RhwPariSJFJQHZ55cjhhJCmnGDi48BwQbisjA3t3LWk4THctiaLiYJidYRMHg== X-Received: by 2002:a05:600c:3b96:b0:42f:6878:a696 with SMTP id 5b1f17b1804b1-42f85ab9c1amr87493225e9.21.1728299050028; Mon, 07 Oct 2024 04:04:10 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: manos.pitsidianakis@linaro.org, zhao1.liu@intel.com, junjie.mao@intel.com, pierrick.bouvier@linaro.org, alex.bennee@linaro.org Subject: [PULL 05/12] .gitattributes: add Rust diff and merge attributes Date: Mon, 7 Oct 2024 13:03:33 +0200 Message-ID: <20241007110342.1298598-6-pbonzini@redhat.com> X-Mailer: git-send-email 2.46.1 In-Reply-To: <20241007110342.1298598-1-pbonzini@redhat.com> References: <20241007110342.1298598-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.151, 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_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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: 1728299073912116600 From: Manos Pitsidianakis Set rust source code to diff=3Drust (built-in with new git versions) and merge=3Dbinary for Cargo.lock files (they should not be merged but auto-generated by cargo) Reviewed-by: Alex Benn=C3=A9e Reviewed-by: Zhao Liu Signed-off-by: Manos Pitsidianakis Link: https://lore.kernel.org/r/278e3878b40ecc7c424dec1ed978eedf21469f52.17= 27961605.git.manos.pitsidianakis@linaro.org Signed-off-by: Paolo Bonzini --- .gitattributes | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitattributes b/.gitattributes index a217cb7bfe9..6dc6383d3d1 100644 --- a/.gitattributes +++ b/.gitattributes @@ -2,3 +2,6 @@ *.h.inc diff=3Dc *.m diff=3Dobjc *.py diff=3Dpython +*.rs diff=3Drust +*.rs.inc diff=3Drust +Cargo.lock diff=3Dtoml merge=3Dbinary --=20 2.46.1