From: Russell King - ARM Linux <linux@armlinux.org.uk>
To: Rob Herring <robh@kernel.org>
Cc: "Andreas Färber" <afaerber@suse.de>,
"Mark Rutland" <mark.rutland@arm.com>,
devicetree@vger.kernel.org, "Kevin Hilman" <khilman@baylibre.com>,
"Will Deacon" <will.deacon@arm.com>,
linux-kernel@vger.kernel.org,
"Catalin Marinas" <catalin.marinas@arm.com>,
"Carlo Caione" <carlo@caione.org>,
linux-amlogic@lists.infradead.org,
linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH 10/18] ARM64: dts: meson-gxbb: Reorder nodes
Date: Mon, 30 Jan 2017 14:59:24 +0000 [thread overview]
Message-ID: <20170130145924.GX27312@n2100.armlinux.org.uk> (raw)
In-Reply-To: <20170123165208.4ujwm6rjz2b3dom5@rob-hp-laptop>
On Mon, Jan 23, 2017 at 10:52:08AM -0600, Rob Herring wrote:
> On Fri, Jan 20, 2017 at 11:21:10PM +0100, Andreas Färber wrote:
> > Sort nodes referenced by label alphabetically.
>
> Seems to be pointless churn.
Depends - if, as the author of a dts file, I order the nodes
alphabetically, and then someone comes along and adds a new node
non-alphabetically, meanwhile someone else also adds a node
elsewhere in the file which conflicts, git will silently merge the
changes without complaint.
Having an alphabetical sorting order means that (a) conflicting
changes are more likely to be highlighted, and (b) non-conflicting
changes are less likely to cause merge issues.
I've noticed exactly this with clearfog when merging my tree with
arm-soc. I have a version of the DSA patch, meanwhile the mvebu
people merged the DSA patch. Somehow, the order of nodes in my
file are alphabetical, the order in their file has the pinctrl and
mdio nodes swapped, which results in totally unnecessary merge
conflicts when I try merging the two trees.
It's more, unnecessary work.
So, I'm going to be submitting a patch to fix the mis-ordered nodes
in the clearfog dts file today to avoid having to resolve this each
time I rebuild my nightly build tree.
--
RMK's Patch system: http://www.armlinux.org.uk/developer/patches/
FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up
according to speedtest.net.
WARNING: multiple messages have this Message-ID (diff)
From: linux@armlinux.org.uk (Russell King - ARM Linux)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 10/18] ARM64: dts: meson-gxbb: Reorder nodes
Date: Mon, 30 Jan 2017 14:59:24 +0000 [thread overview]
Message-ID: <20170130145924.GX27312@n2100.armlinux.org.uk> (raw)
In-Reply-To: <20170123165208.4ujwm6rjz2b3dom5@rob-hp-laptop>
On Mon, Jan 23, 2017 at 10:52:08AM -0600, Rob Herring wrote:
> On Fri, Jan 20, 2017 at 11:21:10PM +0100, Andreas F?rber wrote:
> > Sort nodes referenced by label alphabetically.
>
> Seems to be pointless churn.
Depends - if, as the author of a dts file, I order the nodes
alphabetically, and then someone comes along and adds a new node
non-alphabetically, meanwhile someone else also adds a node
elsewhere in the file which conflicts, git will silently merge the
changes without complaint.
Having an alphabetical sorting order means that (a) conflicting
changes are more likely to be highlighted, and (b) non-conflicting
changes are less likely to cause merge issues.
I've noticed exactly this with clearfog when merging my tree with
arm-soc. I have a version of the DSA patch, meanwhile the mvebu
people merged the DSA patch. Somehow, the order of nodes in my
file are alphabetical, the order in their file has the pinctrl and
mdio nodes swapped, which results in totally unnecessary merge
conflicts when I try merging the two trees.
It's more, unnecessary work.
So, I'm going to be submitting a patch to fix the mis-ordered nodes
in the clearfog dts file today to avoid having to resolve this each
time I rebuild my nightly build tree.
--
RMK's Patch system: http://www.armlinux.org.uk/developer/patches/
FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up
according to speedtest.net.
WARNING: multiple messages have this Message-ID (diff)
From: linux@armlinux.org.uk (Russell King - ARM Linux)
To: linus-amlogic@lists.infradead.org
Subject: [PATCH 10/18] ARM64: dts: meson-gxbb: Reorder nodes
Date: Mon, 30 Jan 2017 14:59:24 +0000 [thread overview]
Message-ID: <20170130145924.GX27312@n2100.armlinux.org.uk> (raw)
In-Reply-To: <20170123165208.4ujwm6rjz2b3dom5@rob-hp-laptop>
On Mon, Jan 23, 2017 at 10:52:08AM -0600, Rob Herring wrote:
> On Fri, Jan 20, 2017 at 11:21:10PM +0100, Andreas F?rber wrote:
> > Sort nodes referenced by label alphabetically.
>
> Seems to be pointless churn.
Depends - if, as the author of a dts file, I order the nodes
alphabetically, and then someone comes along and adds a new node
non-alphabetically, meanwhile someone else also adds a node
elsewhere in the file which conflicts, git will silently merge the
changes without complaint.
Having an alphabetical sorting order means that (a) conflicting
changes are more likely to be highlighted, and (b) non-conflicting
changes are less likely to cause merge issues.
I've noticed exactly this with clearfog when merging my tree with
arm-soc. I have a version of the DSA patch, meanwhile the mvebu
people merged the DSA patch. Somehow, the order of nodes in my
file are alphabetical, the order in their file has the pinctrl and
mdio nodes swapped, which results in totally unnecessary merge
conflicts when I try merging the two trees.
It's more, unnecessary work.
So, I'm going to be submitting a patch to fix the mis-ordered nodes
in the clearfog dts file today to avoid having to resolve this each
time I rebuild my nightly build tree.
--
RMK's Patch system: http://www.armlinux.org.uk/developer/patches/
FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up
according to speedtest.net.
next prev parent reply other threads:[~2017-01-30 15:00 UTC|newest]
Thread overview: 122+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-20 22:21 [PATCH 00/18] ARM64: meson: DT cleanups Andreas Färber
2017-01-20 22:21 ` Andreas Färber
2017-01-20 22:21 ` Andreas Färber
2017-01-20 22:21 ` Andreas Färber
2017-01-20 22:21 ` [PATCH 01/18] Documentation: devicetree: amlogic: Reorder boards Andreas Färber
2017-01-20 22:21 ` Andreas Färber
2017-01-20 22:21 ` Andreas Färber
2017-01-23 16:48 ` Rob Herring
2017-01-23 16:48 ` Rob Herring
2017-01-23 16:48 ` Rob Herring
2017-01-23 16:48 ` Rob Herring
2017-01-23 18:36 ` Andreas Färber
2017-01-23 18:36 ` Andreas Färber
2017-01-23 18:36 ` Andreas Färber
2017-01-20 22:21 ` [PATCH 02/18] ARM64: dts: amlogic: Sort Makefile Andreas Färber
2017-01-20 22:21 ` Andreas Färber
2017-01-20 22:21 ` Andreas Färber
2017-01-20 22:21 ` Andreas Färber
2017-01-20 22:21 ` [PATCH 03/18] ARM64: dts: meson-gxbb-vega-s95: Fix Wifi node name Andreas Färber
2017-01-20 22:21 ` Andreas Färber
2017-01-20 22:21 ` Andreas Färber
2017-01-20 22:21 ` Andreas Färber
2017-01-20 22:21 ` [PATCH 04/18] ARM64: dts: meson-gxbb-p20x: " Andreas Färber
2017-01-20 22:21 ` Andreas Färber
2017-01-20 22:21 ` Andreas Färber
2017-01-20 22:21 ` Andreas Färber
2017-01-23 8:55 ` Neil Armstrong
2017-01-23 8:55 ` Neil Armstrong
2017-01-23 8:55 ` Neil Armstrong
2017-01-23 8:55 ` Neil Armstrong
2017-01-23 16:50 ` Rob Herring
2017-01-23 16:50 ` Rob Herring
2017-01-23 16:50 ` Rob Herring
2017-01-23 16:57 ` Andreas Färber
2017-01-23 16:57 ` Andreas Färber
2017-01-23 16:57 ` Andreas Färber
2017-01-20 22:21 ` [PATCH 05/18] ARM64: dts: meson-gx-p23x-q20x: " Andreas Färber
2017-01-20 22:21 ` Andreas Färber
2017-01-20 22:21 ` Andreas Färber
2017-01-23 8:55 ` Neil Armstrong
2017-01-23 8:55 ` Neil Armstrong
2017-01-23 8:55 ` Neil Armstrong
2017-01-23 8:55 ` Neil Armstrong
2017-01-20 22:21 ` [PATCH 06/18] ARM64: dts: meson-gxm-nexbox-a1: Drop UART comment Andreas Färber
2017-01-20 22:21 ` Andreas Färber
2017-01-20 22:21 ` Andreas Färber
2017-01-23 8:55 ` Neil Armstrong
2017-01-23 8:55 ` Neil Armstrong
2017-01-23 8:55 ` Neil Armstrong
2017-01-20 22:21 ` [PATCH 07/18] ARM64: dts: meson-gxl-s905x: Comment typo fix Andreas Färber
2017-01-20 22:21 ` Andreas Färber
2017-01-20 22:21 ` Andreas Färber
2017-01-23 8:56 ` Neil Armstrong
2017-01-23 8:56 ` Neil Armstrong
2017-01-23 8:56 ` Neil Armstrong
2017-01-23 8:56 ` Neil Armstrong
2017-01-20 22:21 ` [PATCH 08/18] ARM64: dts: meson-gxm: Drop trailing white line Andreas Färber
2017-01-20 22:21 ` Andreas Färber
2017-01-20 22:21 ` Andreas Färber
2017-01-20 22:21 ` Andreas Färber
2017-01-20 22:21 ` [PATCH 09/18] ARM64: dts: meson-gxbb-wetek-hub: Reference CVBS node by label Andreas Färber
2017-01-20 22:21 ` Andreas Färber
2017-01-20 22:21 ` Andreas Färber
2017-01-23 8:56 ` Neil Armstrong
2017-01-20 22:21 ` [PATCH 10/18] ARM64: dts: meson-gxbb: Reorder nodes Andreas Färber
2017-01-20 22:21 ` Andreas Färber
2017-01-20 22:21 ` Andreas Färber
2017-01-23 16:52 ` Rob Herring
2017-01-23 16:52 ` Rob Herring
2017-01-23 16:52 ` Rob Herring
2017-01-23 16:56 ` Andreas Färber
2017-01-23 16:56 ` Andreas Färber
2017-01-23 16:56 ` Andreas Färber
2017-01-23 16:56 ` Andreas Färber
2017-01-30 14:59 ` Russell King - ARM Linux [this message]
2017-01-30 14:59 ` Russell King - ARM Linux
2017-01-30 14:59 ` Russell King - ARM Linux
2017-01-20 22:21 ` [PATCH 11/18] ARM64: dts: meson-gxbb-odroidc2: " Andreas Färber
2017-01-20 22:21 ` Andreas Färber
2017-01-20 22:21 ` Andreas Färber
2017-01-20 22:21 ` [PATCH 12/18] ARM64: dts: meson-gxbb-vega-s95: " Andreas Färber
2017-01-20 22:21 ` Andreas Färber
2017-01-20 22:21 ` Andreas Färber
2017-01-20 22:21 ` Andreas Färber
2017-01-20 22:21 ` [PATCH 13/18] ARM64: dts: meson-gxbb-nexbox-a95x: " Andreas Färber
2017-01-20 22:21 ` Andreas Färber
2017-01-20 22:21 ` Andreas Färber
2017-01-23 8:57 ` Neil Armstrong
2017-01-23 8:57 ` Neil Armstrong
2017-01-23 8:57 ` Neil Armstrong
2017-01-23 8:57 ` Neil Armstrong
2017-01-20 22:21 ` [PATCH 14/18] ARM64: dts: meson-gxbb-p20x: " Andreas Färber
2017-01-20 22:21 ` Andreas Färber
2017-01-20 22:21 ` Andreas Färber
2017-01-20 22:21 ` [PATCH 15/18] ARM64: dts: meson-gxl: " Andreas Färber
2017-01-20 22:21 ` Andreas Färber
2017-01-20 22:21 ` Andreas Färber
2017-01-23 8:57 ` Neil Armstrong
2017-01-23 8:57 ` Neil Armstrong
2017-01-23 8:57 ` Neil Armstrong
2017-01-20 22:21 ` [PATCH 16/18] ARM64: dts: meson-gxl-s905x-nexbox-a95x: " Andreas Färber
2017-01-20 22:21 ` Andreas Färber
2017-01-20 22:21 ` Andreas Färber
2017-01-23 8:58 ` Neil Armstrong
2017-01-23 8:58 ` Neil Armstrong
2017-01-23 8:58 ` Neil Armstrong
2017-01-20 22:21 ` [PATCH 17/18] ARM64: dts: meson-gxm-nexbox-a1: " Andreas Färber
2017-01-20 22:21 ` Andreas Färber
2017-01-20 22:21 ` Andreas Färber
2017-01-23 8:58 ` Neil Armstrong
2017-01-23 8:58 ` Neil Armstrong
2017-01-23 8:58 ` Neil Armstrong
2017-01-20 22:21 ` [PATCH 18/18] ARM64: dts: meson-gx-p23x-q20x: " Andreas Färber
2017-01-20 22:21 ` Andreas Färber
2017-01-20 22:21 ` Andreas Färber
2017-01-20 22:21 ` Andreas Färber
2017-01-23 8:58 ` Neil Armstrong
2017-01-23 8:58 ` Neil Armstrong
2017-01-23 8:58 ` Neil Armstrong
2017-01-23 18:46 ` [PATCH 00/18] ARM64: meson: DT cleanups Kevin Hilman
2017-01-23 18:46 ` Kevin Hilman
2017-01-23 18:46 ` Kevin Hilman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170130145924.GX27312@n2100.armlinux.org.uk \
--to=linux@armlinux.org.uk \
--cc=afaerber@suse.de \
--cc=carlo@caione.org \
--cc=catalin.marinas@arm.com \
--cc=devicetree@vger.kernel.org \
--cc=khilman@baylibre.com \
--cc=linux-amlogic@lists.infradead.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=robh@kernel.org \
--cc=will.deacon@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.