Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753321AbdFVQV1 (ORCPT ); Thu, 22 Jun 2017 12:21:27 -0400 Received: from mail-pg0-f68.google.com ([74.125.83.68]:35621 "EHLO mail-pg0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751742AbdFVQVY (ORCPT ); Thu, 22 Jun 2017 12:21:24 -0400 Date: Thu, 22 Jun 2017 11:21:12 -0500 From: Rob Herring To: Geert Uytterhoeven Cc: Frank Rowand , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] scripts/dtc: dtx_diff - Show real file names in diff header Message-ID: <20170622162112.45uobyoar7cddorv@rob-hp-laptop> References: <1498136826-6793-1-git-send-email-geert+renesas@glider.be> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1498136826-6793-1-git-send-email-geert+renesas@glider.be> User-Agent: NeoMutt/20170113 (1.7.2) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 903 Lines: 23 On Thu, Jun 22, 2017 at 03:07:06PM +0200, Geert Uytterhoeven wrote: > As the comparison uses process substitution to pass files after > conversion to DTS format, the diff header doesn't show the real > filenames, but the names of the file descriptors used: > > --- /dev/fd/63 2017-06-22 11:21:47.531637188 +0200 > +++ /dev/fd/62 2017-06-22 11:21:47.531637188 +0200 > > This is especially annoying when comparing a bunch of DT files in a > loop, as the output doesn't show a clue about which files it refers to. > > Fix this by explicitly passing the original file names to the diff > command using the --label option, giving e.g.: > > --- arch/arm/boot/dts/r8a7791-koelsch.dtb > +++ arch/arm/boot/dts/r8a7791-porter.dtb > > Signed-off-by: Geert Uytterhoeven > --- > scripts/dtc/dtx_diff | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Applied.