From nobody Sat Nov 23 23:24:17 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=1728667218; cv=none; d=zohomail.com; s=zohoarc; b=cXyDSdoXPZoyC8uGgsOwslmSRknn0eLQjTsneEYYy2UUmzJzGUpBWW1fq4D0klKlVvGWl6ViP5B83qs/SP/GrBpXNMfguCFGnlmn9s3q8pwzyqu2NSQt0SghoEGnq7m3/xswrkxn6KFM+02dw4jYbrcNMLKO2KT29RtMc5dfBzo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1728667218; 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=s8vlBtfYk/aY00V5/AIvQmHcz5MFzLsYtflzR7ilOtw=; b=KB2MZ/BrH8gTkGMgnaEmGRO+9QSY0yaDWlynPb9nL0XI7azIGBQCA5C7ngoDBIaSjMZ3pc59dltY6IvsWDQC1hzNwfiorlTz6dsnFAKUE5tFyRR3JzeTbNZwP0chGdbouXGupM+JCyD/VArJVQ52cNzZiVl6NuIU9d0dpALjS3k= 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 1728667218118812.5049000824278; Fri, 11 Oct 2024 10:20:18 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1szJ6W-0003TH-3C; Fri, 11 Oct 2024 13:07:08 -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 1szJ4U-0000wP-4a for qemu-devel@nongnu.org; Fri, 11 Oct 2024 13:04:58 -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 1szHdT-0007D7-Hl for qemu-devel@nongnu.org; Fri, 11 Oct 2024 11:33:00 -0400 Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-141-7UJ1kSIxOjmrhyYkmbs3kw-1; Fri, 11 Oct 2024 11:32:57 -0400 Received: by mail-ed1-f71.google.com with SMTP id 4fb4d7f45d1cf-5c9452d6344so790328a12.3 for ; Fri, 11 Oct 2024 08:32:57 -0700 (PDT) Received: from avogadro.local ([151.81.124.37]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5c9370d3795sm2031803a12.9.2024.10.11.08.32.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Oct 2024 08:32:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1728660778; 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=s8vlBtfYk/aY00V5/AIvQmHcz5MFzLsYtflzR7ilOtw=; b=hPRZAMMC5tyIiGbVJLt9EyB38riHGzJTGdGk+pWhtqnlCS9lKgbiSpECTpJz68MBtOZ1IG UIrl/RUIsz64ZZPkmsvODjSiwHX0w9KWNPBmdkKjFTxl14hBVoMTLzPDdmfdZnGQlWvwrK oo9M0AzgqIg8Ak5rAAdE9Ojgv85p5lg= X-MC-Unique: 7UJ1kSIxOjmrhyYkmbs3kw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728660776; x=1729265576; 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=s8vlBtfYk/aY00V5/AIvQmHcz5MFzLsYtflzR7ilOtw=; b=MWvPvG2jQlTUZMyRufBJ3Qdrr5IKIFCzHmiNq/QgOJlqbylb2lqFYAVJtIfUhgkS4a UYRfdN5e4HNRwdfTp8XlXGOOzx4ym7i/6nV2VPnnEeIj7HO8DNyttdRUKdDSxiCCF7NJ 0xDlxqqKS0nbxzQwgxzSFYVluBRInBkff8LsYC4PkRTHgPSWJnDDgUo2bcDV6Wr3PSTc YuaLGE5kGytZd6yFqQTIzfcpFmGkcx4tlx/1HeFwvoq/xDCdawNg7FwWmAYZz3Tqcl0r 0g4chFf6gREoi8ABu1WWpi1Q2KtSFtk1ugXZK/JdDNDbv++6TCoT5XZ3e9uU1xAvbdyg FBHA== X-Gm-Message-State: AOJu0Yx6Objnty0nj2dqqUcSn/8WjvN0dFIXxGe+7SmUH7ICMmZ376hD c0dO5Ynm/jYdbQSMDRI6Uzy+yvqkPfTeOsVeBB8vNGo5QWKP+7H5XulDBWKj3fKOnzPKi8OjcQ3 jt6xPLRcAE84jGKrpto9RdgJc+Ko1w1R5AlR3Jy0zfckJnapmdffSSipx3Ek8+iFZw32AWu4YJn CD1M2YBQHFAz9w5LCIdRg9INw7CLPgwzIADsTTKZ4= X-Received: by 2002:a05:6402:42c9:b0:5c8:8d5e:18ad with SMTP id 4fb4d7f45d1cf-5c948cca082mr2365920a12.18.1728660775701; Fri, 11 Oct 2024 08:32:55 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEHwwT/irIzAfs9HVk8sJFzGgXcXsOLjEEbSRkN9I51QlvXi+doaU6KTmaezxnrldUik5KruQ== X-Received: by 2002:a05:6402:42c9:b0:5c8:8d5e:18ad with SMTP id 4fb4d7f45d1cf-5c948cca082mr2365879a12.18.1728660775114; Fri, 11 Oct 2024 08:32:55 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Manos Pitsidianakis , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Zhao Liu Subject: [PULL v3 05/18] .gitattributes: add Rust diff and merge attributes Date: Fri, 11 Oct 2024 17:32:13 +0200 Message-ID: <20241011153227.81770-6-pbonzini@redhat.com> X-Mailer: git-send-email 2.46.2 In-Reply-To: <20241011153227.81770-1-pbonzini@redhat.com> References: <20241011153227.81770-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: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.15, 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.001, RCVD_IN_MSPIKE_WL=0.001, 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: 1728667219563116600 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.2