linux-kernel - RE: [PATCH V2 1/2] arm64: dts: imx8qxp-mek: Sort labels alphabetically

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Mon, 16 Mar 2020 06:31:21 +0000
From:   Anson Huang <anson.huang@....com>
To:     Shawn Guo <shawnguo@...nel.org>
CC:     "robh+dt@...nel.org" <robh+dt@...nel.org>,
        "mark.rutland@....com" <mark.rutland@....com>,
        "s.hauer@...gutronix.de" <s.hauer@...gutronix.de>,
        "kernel@...gutronix.de" <kernel@...gutronix.de>,
        "festevam@...il.com" <festevam@...il.com>,
        Abel Vesa <abel.vesa@....com>,
        Leonard Crestez <leonard.crestez@....com>,
        Daniel Baluta <daniel.baluta@....com>,
        "devicetree@...r.kernel.org" <devicetree@...r.kernel.org>,
        "linux-arm-kernel@...ts.infradead.org" 
        <linux-arm-kernel@...ts.infradead.org>,
        "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
        dl-linux-imx <linux-imx@....com>
Subject: RE: [PATCH V2 1/2] arm64: dts: imx8qxp-mek: Sort labels
 alphabetically

Hi, Shawn

> Subject: Re: [PATCH V2 1/2] arm64: dts: imx8qxp-mek: Sort labels
> alphabetically
> 
> On Mon, Mar 16, 2020 at 09:26:32AM +0800, Anson Huang wrote:
> > Sort the labels alphabetically for consistency.
> >
> > Signed-off-by: Anson Huang <Anson.Huang@....com>
> > ---
> > Changes since V1:
> > 	- Rebase to latest branch, no code change.
> > ---
> >  arch/arm64/boot/dts/freescale/imx8qxp-mek.dts | 50
> > ++++++++++++++++-----------
> >  1 file changed, 30 insertions(+), 20 deletions(-)
> >
> > diff --git a/arch/arm64/boot/dts/freescale/imx8qxp-mek.dts
> > b/arch/arm64/boot/dts/freescale/imx8qxp-mek.dts
> > index d3d26cc..b1befdb 100644
> > --- a/arch/arm64/boot/dts/freescale/imx8qxp-mek.dts
> > +++ b/arch/arm64/boot/dts/freescale/imx8qxp-mek.dts
> > @@ -30,18 +30,7 @@
> >  	};
> >  };
> >
> > -&adma_lpuart0 {
> > -	pinctrl-names = "default";
> > -	pinctrl-0 = <&pinctrl_lpuart0>;
> > -	status = "okay";
> > -};
> > -
> > -&fec1 {
> > -	pinctrl-names = "default";
> > -	pinctrl-0 = <&pinctrl_fec1>;
> > -	phy-mode = "rgmii-id";
> > -	phy-handle = <&ethphy0>;
> > -	fsl,magic-packet;
> > +&adma_dsp {
> >  	status = "okay";
> >
> >  	mdio {
> 
> Here is a rebase issue, i.e. adma_dsp shouldn't get a mdio child node.
> It came from the conflict with one commit on my fixes branch.  I decided to
> drop the series for the coming merge window.  Let's start over again after
> 5.7-rc1 becomes available.

OK, I am also confused by this conflict, I normally do the patch based on your
for-next branch, and I did NOT meet the conflict at all, then I redo it based on
your dt branch I met the conflict and fix it...

So, do I need to resend the patch series later when 5.7-rc1 available?

Anson