From nobody Sun Nov 24 14:42:13 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1722805551; cv=none; d=zohomail.com; s=zohoarc; b=YIR71CnEN0HJ+4Z2V7euxNm98mkUz9Qh2DTjdjq9kq6mQGVIzsIE8lDYzN8kEkJj87zV0n7V8YC9GSdz8RgOqUZeMnc9+1FdYTAieIVNaxq4q6ATrRfW44Y2bHfQqYUIgDdF66/NfuFph8osBQ41YsPZX75Cllo2JQmNMKSG698= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1722805551; 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=TXjCGVQS/+hcLwTR+qUNdXq2a9N5/772SuBnlrJC6HA=; b=mhjii/EKhZO4n+T9CQWew3rGNs0S14lYHYowsUAqiDP4o/7A4VeIDiNaMGsSQRJmXAaWum2+nIcMdQdgPGUL7IZXIVn/B5vM5QHULGv6+QYStm/gcnmZ7a3RxHj+RiJbYyN9D02QUutXOzelWFnsyoSpcMYaIx0xy5XNslVIh0g= 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 172280555180675.06941144968926; Sun, 4 Aug 2024 14:05:51 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1saiP6-0008Qo-DE; Sun, 04 Aug 2024 17:04:36 -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 1saiP5-0008OB-N5 for qemu-devel@nongnu.org; Sun, 04 Aug 2024 17:04:35 -0400 Received: from mail-ej1-x635.google.com ([2a00:1450:4864:20::635]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1saiP4-0005gD-8K for qemu-devel@nongnu.org; Sun, 04 Aug 2024 17:04:35 -0400 Received: by mail-ej1-x635.google.com with SMTP id a640c23a62f3a-a7de4364ca8so141865066b.2 for ; Sun, 04 Aug 2024 14:04:33 -0700 (PDT) Received: from localhost.localdomain (adsl-146.37.6.160.tellas.gr. [37.6.160.146]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a7dc9d437a5sm366348766b.101.2024.08.04.14.04.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 Aug 2024 14:04:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1722805473; x=1723410273; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=TXjCGVQS/+hcLwTR+qUNdXq2a9N5/772SuBnlrJC6HA=; b=AsTVICNjdSvtmOoOKrOPR4jI0s2QT9x0J1xU5GXxqQW+WsNVCWx0PglZpOLpzzld7N SqyB10oOQp9pSN+iHDQPpzI7mTsWqFPIYqujEuNTUsU6jKu6zJWMIPkjPcCp6gureznT KKAV1KTqPb/nZRM2vUWEzWjyb9Kf71S+sPqEFV+9bQtjU7WqsEz6E4g/eBrw+r50kcqb sftq1TO+fxeupAsewIkK+wLE9utMbdwWLW26QaFom+MNVBFQBY1gqO01iDYbqN3ldudY 1kd83pPGcAninmbfs+CD+rcLvq1iYy0t8pqzHsMxy9/InVGobDGbSjjEli/ygaKR4vwe 9G1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722805473; x=1723410273; 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=TXjCGVQS/+hcLwTR+qUNdXq2a9N5/772SuBnlrJC6HA=; b=l174QeU7z7UFiPma1E0DzOg84JpoB40fQ2KmAMziwIOUYc91HdH5FenLD+V1OoAs3G Hxj3cB+lkFGaD7PHBBoUrrRvrET/fHXFlM0+vy22CSmgi1tXjFJ3I+ETE3n/c8yBiiq6 v61GsEndihpN9LK8e8UfDtDAAr1y1Rv2cGvsdXiQTS0A8qBhlBrZze9AzU3cIZSzCpcv M44iDdpJxsQRCDBeZTCEOb8hSYazMl3EGDmDDks4iAqsCtiEox0kRpcqmJsVMoESocic s4Eqzy1uRPXPmx7yYNIgT9QTCbsbrTYAy6ghCfCk2GF75/xc3jETesyhyB4X0+VjpNr7 wTWg== X-Gm-Message-State: AOJu0Yw37oeZiGba6k9mjNi3OBy44KCyLed/rKEosv7q4mi7fDJAqvmH S4eauaW+I81wWP6xUitvJzhLYLHyCeuq4fODOh7tE1N1KyxdWFPmHvpNH/t3KC7Vh51+xoelqes qc6E= X-Google-Smtp-Source: AGHT+IFAI78lroo4zBkS9350SkmGgdPM0vLMvWdhx7R+YlY9viSj84iyZfMT5JWg/uUJLYSTMxhX3w== X-Received: by 2002:a17:907:3f97:b0:a7a:a212:be4e with SMTP id a640c23a62f3a-a7dc4dbfe3dmr734661266b.7.1722805472711; Sun, 04 Aug 2024 14:04:32 -0700 (PDT) From: Manos Pitsidianakis To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , Mads Ynddal , Peter Maydell , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Thomas Huth , Markus Armbruster , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Zhao Liu , Gustavo Romero , Pierrick Bouvier , rowan.hart@intel.com, Richard Henderson Subject: [RFC PATCH v6 3/5] .gitattributes: add Rust diff and merge attributes Date: Mon, 5 Aug 2024 00:04:14 +0300 Message-ID: X-Mailer: git-send-email 2.44.0 In-Reply-To: References: 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=2a00:1450:4864:20::635; envelope-from=manos.pitsidianakis@linaro.org; helo=mail-ej1-x635.google.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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 @linaro.org) X-ZM-MESSAGEID: 1722805552529116600 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 --- .gitattributes | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitattributes b/.gitattributes index a217cb7bfe..6dc6383d3d 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 =CE=B3=CE=B1=E1=BF=96=CE=B1 =CF=80=CF=85=CF=81=CE=AF =CE=BC=CE=B9=CF=87=CE= =B8=CE=AE=CF=84=CF=89