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: 655217 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8F1DAC05027 for ; Sun, 19 Feb 2023 14:20:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229640AbjBSOU1 (ORCPT ); Sun, 19 Feb 2023 09:20:27 -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 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org 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