From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 10761C43603 for ; Thu, 5 Dec 2019 01:00:25 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id BD20D24667 for ; Thu, 5 Dec 2019 01:00:24 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="pQ+PWJkp" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BD20D24667 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 6AA6A6B0E1B; Wed, 4 Dec 2019 20:00:24 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 65AFA6B0E1C; Wed, 4 Dec 2019 20:00:24 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 571086B0E1D; Wed, 4 Dec 2019 20:00:24 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0059.hostedemail.com [216.40.44.59]) by kanga.kvack.org (Postfix) with ESMTP id 432166B0E1B for ; Wed, 4 Dec 2019 20:00:24 -0500 (EST) Received: from smtpin27.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with SMTP id 03AFA180AD807 for ; Thu, 5 Dec 2019 01:00:24 +0000 (UTC) X-FDA: 76229281968.27.dock97_5ab877cf90d2f X-HE-Tag: dock97_5ab877cf90d2f X-Filterd-Recvd-Size: 6024 Received: from mail-pl1-f196.google.com (mail-pl1-f196.google.com [209.85.214.196]) by imf16.hostedemail.com (Postfix) with ESMTP for ; Thu, 5 Dec 2019 01:00:23 +0000 (UTC) Received: by mail-pl1-f196.google.com with SMTP id k20so482530pls.3 for ; Wed, 04 Dec 2019 17:00:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:references:from:message-id:date:user-agent:mime-version :in-reply-to:content-language:content-transfer-encoding; bh=8Lt0/2njaJ4kBBlTKjLPZ1gLRGD2RvyHaV0ME7uePpw=; b=pQ+PWJkpqO17ZSVKWd/gWR1iDXDyUU6qCuq8gamCQvUS8JRIlxWNoDIYF+kqCoQLqa pFHz12949DJQH9FyTM5tbJEF5Yy9kb6Q2M9EvBVKxEtEPRY8cvvmaCYKQCWWqYaK8Rsb 5zoyYjajiqS1jC+QXPQdobkC+/0bH95D0dz4AXOQg0EMCJ7vYrZgPM6xvaPHw84L3yyI a3pVdkNUxvfYrzIlX8n/+MLw0Wj9RgM+0Chd23Tf4Wayo0QJh1kfuy8TP6YALuNMaEFP dTtKADrdsz+YGD9HIjM7vNeFiYoK1KbA8mFL9kMzXdxwoaYnb0zAPUF6ty0xmH0QKbo0 FlVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=8Lt0/2njaJ4kBBlTKjLPZ1gLRGD2RvyHaV0ME7uePpw=; b=BATjV9+cOEhW7mNSXZkUAyvf1il+EeJ1DEUCXCjgPqRuEKpkJX3xTm3S1n37EivRns X0bwWv9qbIbCQvdgmLio1EXRDWLKJlZ+VXYx3lcDCjicxoPQYhxIqalXlImyExtxdvYG vVb/+RUg68kwF+RoIBeJpwzg9ofTNy9QilK6kqd67T7m3G6cwk5dAovrcR1Qw0RG1C7r ztWVfgcp4HtR3KOgGGNaUmeZRfudVy0qwnwAUntlAZ30RR5nhQdH6Rh+EgVvhHqRmVG+ 50Qur9uQGe5w0BJOrX7dkIrbUokcmYmJEU6ZkIviaWRAwhFREmfrBI/eKTw8B8fGzrz1 Qcqg== X-Gm-Message-State: APjAAAWYONcJCyjIDV8wHUZxock3ibw25F3J8Zg87wjeWvF9+Wh2pln/ u285Y/ruvEaWnlzMd1dAe3U= X-Google-Smtp-Source: APXvYqzN8HHOwYNPAyXTd58VAodUklR8SjSJkGC8hLaxEQnrWxtM7/m+2D9LDbx99GZ9Fpa3qCslhg== X-Received: by 2002:a17:902:ac97:: with SMTP id h23mr6381654plr.237.1575507622278; Wed, 04 Dec 2019 17:00:22 -0800 (PST) Received: from ?IPv6:240d:1a:90a:7900:c9ba:60a6:b93d:a99a? ([240d:1a:90a:7900:c9ba:60a6:b93d:a99a]) by smtp.gmail.com with ESMTPSA id a26sm9075642pfo.5.2019.12.04.17.00.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 04 Dec 2019 17:00:21 -0800 (PST) Subject: Re: [patch 12/86] .gitattributes: use 'dts' diff driver for dts files To: Andrew Morton , linux-mm@kvack.org, mm-commits@vger.kernel.org, rdunlap@infradead.org, robh+dt@kernel.org, swboyd@chromium.org, torvalds@linux-foundation.org References: <20191205005017.S9yQEAsVn%akpm@linux-foundation.org> From: Frank Rowand Message-ID: <5ab99890-c9a8-1470-ea37-b779a2025982@gmail.com> Date: Wed, 4 Dec 2019 19:00:15 -0600 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.9.0 MIME-Version: 1.0 In-Reply-To: <20191205005017.S9yQEAsVn%akpm@linux-foundation.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Hi Andrew, On 12/4/19 6:50 PM, Andrew Morton wrote: > From: Stephen Boyd > Subject: .gitattributes: use 'dts' diff driver for dts files > > Git is gaining support to display the closest node to the diff in the > hunk header via the 'dts' diff driver. Use that driver for all dts and > dtsi files so we can gain some more context on where the diff is. Taking > a recent commit in the kernel dts files you can see the difference. > > With this patch and an updated git > > : diff --git a/arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi b/arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi > : index 62e07e1197cc..4c38426a6969 100644 > : --- a/arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi > : +++ b/arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi > : @@ -289,5 +289,29 @@ vdd_hdmi: regulator@1 { > : gpio = <&gpio TEGRA194_MAIN_GPIO(A, 3) GPIO_ACTIVE_HIGH>; > : enable-active-high; > : }; > : + > : + vdd_3v3_pcie: regulator@2 { > : + compatible = "regulator-fixed"; > > vs. without this patch > > : diff --git a/arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi b/arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi > : index 62e07e1197cc..4c38426a6969 100644 > : --- a/arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi > : +++ b/arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi > : @@ -289,5 +289,29 @@ > : gpio = <&gpio TEGRA194_MAIN_GPIO(A, 3) GPIO_ACTIVE_HIGH>; > : enable-active-high; > : }; > : + > : + vdd_3v3_pcie: regulator@2 { > : + compatible = "regulator-fixed"; > > You can see that we don't know what the context node is because it isn't > shown after the '@@'. > > dts is not released yet but it is staged to be in the next release[1]. > One can probably build git from source and try it out. > > [1] https://git.kernel.org/pub/scm/git/git.git/commit/?id=d49c2c3466d2c8cb0b3d0a43e6b406b07078fdb1 > > Link: http://lkml.kernel.org/r/20191004212311.141538-1-swboyd@chromium.org > Signed-off-by: Stephen Boyd > Cc: Rob Herring > Cc: Frank Rowand > Cc: Randy Dunlap > Signed-off-by: Andrew Morton > --- > > .gitattributes | 2 ++ > 1 file changed, 2 insertions(+) > > --- a/.gitattributes~gitattributes-use-dts-diff-driver-for-dts-files > +++ a/.gitattributes > @@ -1,2 +1,4 @@ > *.c diff=cpp > *.h diff=cpp > +*.dtsi diff=dts > +*.dts diff=dts > _ > Thank you for picking this up. Acked-by: Frank Rowand -Frank