From patchwork Sun Feb 19 14:20:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 59163 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp869310wrn; Sun, 19 Feb 2023 06:24:58 -0800 (PST) X-Google-Smtp-Source: AK7set+7UPSJqpXIkFlaJlz4rA66SgcTfLvEIfhFqTCQNnO8zEzRIT+nZwoOKC1K2mM4A7gwM+qb X-Received: by 2002:a17:907:2da2:b0:889:33ca:70c6 with SMTP id gt34-20020a1709072da200b0088933ca70c6mr11145163ejc.2.1676816698333; Sun, 19 Feb 2023 06:24:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676816698; cv=none; d=google.com; s=arc-20160816; b=MbYDkekY+8YVL4kRxZ5BN67IrWBYTfCZ08r6hrpWDqArfYsAOLakaCuXDD9DB3V/RL YaTgEbeNksvPZDIS/bnxZE0hYqQdpdyCyZ6P71tAp56QvcDlhb6SIz9NgOk9IKiw89aH /O5P9r7Vkig9heQsRQgfPTAR9lP6ioWtip+U6KZmF2V3D73GVhZBNbwedoLzrxAyAbzE pZUNYBQr++Xiv6WGtWvUdQJEGfvhsp1xuW14aMonnW2TI0HSOPe+8MBZN68beLmgNkpf OJIa2TMVYYGo9zxVOzuAy9YrCbZV1hf7lHAlut9xTPDJTXWQrnAbJMtv5Kai74rEgDGt gV3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=vX2xUpOm1hk+n959atKtnMbs64HbLdN0cZUinW2jMSc=; b=MycnMOzBSl4gJc6HgPJSBRLPFFZnv1gX4GWuWlIQHyqgA+6qZDHtjSJt9ZGhX1uFZm e8YGfVvD2zoB6cCE4fcjGLVjdnSfbmuFoHPMnAWJBN4FOCUc8kls+1F1RqiBb2/NzzVq 2I1jspgDg6EXQ9CGFyGUF4QsXm0dI1eEReKpKq/4VpBCoG+zuZSsdSNsG3ne6xZXps6E qHHBdoqRUO+KF0DjmNUnQwVLxXMJHMSFcL1Y7p7A50sZtV/wMWKISM7zNhD301IA3PQL p9jG7P9SfFCbIIFTWQbYKoiGH9VL7QIFQ4dBtyarjPyHn3HP0Vjk/wvUAtub3/oqMaNH yk4g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=a5jEy1st; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id bf7-20020a170906c50700b008c4de1a4c2dsi3725752ejb.841.2023.02.19.06.24.35; Sun, 19 Feb 2023 06:24:58 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=a5jEy1st; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229954AbjBSOU2 (ORCPT + 99 others); Sun, 19 Feb 2023 09:20:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60836 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229506AbjBSOU0 (ORCPT ); Sun, 19 Feb 2023 09:20:26 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 516B8EF8D; Sun, 19 Feb 2023 06:20:25 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 0223FB802C8; Sun, 19 Feb 2023 14:20:24 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2F2BAC433D2; Sun, 19 Feb 2023 14:20:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1676816422; bh=FB3Y/kfHLJ/r2h8QI0rWOOJJsPc/twutba2eFYVvvT8=; h=From:To:Cc:Subject:Date:From; b=a5jEy1stwoReIxzO1ESQUvYgyztINiIvV+tbGS+B5I5c4Et2ODKf1+EHFDwpg1rJw SN5ORhEQnqEW7ww4ylr6cAAoKxMjbB5cEevDUKejq54IcwZSdBYQ02S7Nl0Lu2S7FX rNGxMoX+AMTLpaOOTnd+HTDZY/q9MpKhw2NL4JBmPrrW4FvrPWqqmGwwKcHt9ZWQI6 nApsnYw+85eOn1PQF2CiZcfRNPjIakg18IzaxrRax2xSaCCrBMJWO1tK/0BvuS96UL 2nCFnQFmyt79bUX8oLQ+RABBwju3mes16uCVdDOITAlIzreQRfPs3RTiFchNcLLX5O lQu2SQvgf+tOQ== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: devicetree@vger.kernel.org, Rob Herring , Frank Rowand , linux-kernel@vger.kernel.org, Masahiro Yamada Subject: [PATCH v2] .gitattributes: use 'dts' diff driver for *.dtso files Date: Sun, 19 Feb 2023 23:20:11 +0900 Message-Id: <20230219142011.2309026-1-masahiroy@kernel.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1758269746266376714?= X-GMAIL-MSGID: =?utf-8?q?1758269746266376714?= Now we have the third extension for DT source files (overlay). Give the diff=dts attribute to *.dtso as well. While I was here, I merged *.c and *.o into *.[ch]. Signed-off-by: Masahiro Yamada --- Changes in v2: - Slightly shorten the code .gitattributes | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.gitattributes b/.gitattributes index 4b32eaa9571e..3471356b2387 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,4 +1,3 @@ -*.c diff=cpp -*.h diff=cpp -*.dtsi diff=dts -*.dts diff=dts +*.[ch] diff=cpp +*.dts diff=dts +*.dts[io] diff=dts