All of lore.kernel.org
 help / color / mirror / Atom feed
From: Shawn Guo <shawnguo@kernel.org>
To: Anson Huang <anson.huang@nxp.com>
Cc: "mark.rutland@arm.com" <mark.rutland@arm.com>,
	"devicetree@vger.kernel.org" <devicetree@vger.kernel.org>,
	Abel Vesa <abel.vesa@nxp.com>,
	Daniel Baluta <daniel.baluta@nxp.com>,
	"s.hauer@pengutronix.de" <s.hauer@pengutronix.de>,
	"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
	"robh+dt@kernel.org" <robh+dt@kernel.org>,
	dl-linux-imx <linux-imx@nxp.com>,
	"kernel@pengutronix.de" <kernel@pengutronix.de>,
	Leonard Crestez <leonard.crestez@nxp.com>,
	"festevam@gmail.com" <festevam@gmail.com>,
	"linux-arm-kernel@lists.infradead.org"
	<linux-arm-kernel@lists.infradead.org>
Subject: Re: [PATCH V2 1/2] arm64: dts: imx8qxp-mek: Sort labels alphabetically
Date: Mon, 16 Mar 2020 14:44:57 +0800	[thread overview]
Message-ID: <20200316064456.GJ17221@dragon> (raw)
In-Reply-To: <DB3PR0402MB3916C7F4D25024A30FF4EABDF5F90@DB3PR0402MB3916.eurprd04.prod.outlook.com>

On Mon, Mar 16, 2020 at 06:31:21AM +0000, Anson Huang wrote:
> 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@nxp.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?

You need to resend later.

Shawn

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

WARNING: multiple messages have this Message-ID (diff)
From: Shawn Guo <shawnguo@kernel.org>
To: Anson Huang <anson.huang@nxp.com>
Cc: "robh+dt@kernel.org" <robh+dt@kernel.org>,
	"mark.rutland@arm.com" <mark.rutland@arm.com>,
	"s.hauer@pengutronix.de" <s.hauer@pengutronix.de>,
	"kernel@pengutronix.de" <kernel@pengutronix.de>,
	"festevam@gmail.com" <festevam@gmail.com>,
	Abel Vesa <abel.vesa@nxp.com>,
	Leonard Crestez <leonard.crestez@nxp.com>,
	Daniel Baluta <daniel.baluta@nxp.com>,
	"devicetree@vger.kernel.org" <devicetree@vger.kernel.org>,
	"linux-arm-kernel@lists.infradead.org" 
	<linux-arm-kernel@lists.infradead.org>,
	"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
	dl-linux-imx <linux-imx@nxp.com>
Subject: Re: [PATCH V2 1/2] arm64: dts: imx8qxp-mek: Sort labels alphabetically
Date: Mon, 16 Mar 2020 14:44:57 +0800	[thread overview]
Message-ID: <20200316064456.GJ17221@dragon> (raw)
In-Reply-To: <DB3PR0402MB3916C7F4D25024A30FF4EABDF5F90@DB3PR0402MB3916.eurprd04.prod.outlook.com>

On Mon, Mar 16, 2020 at 06:31:21AM +0000, Anson Huang wrote:
> 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@nxp.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?

You need to resend later.

Shawn

  reply	other threads:[~2020-03-16  6:45 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-16  1:26 [PATCH V2 1/2] arm64: dts: imx8qxp-mek: Sort labels alphabetically Anson Huang
2020-03-16  1:26 ` Anson Huang
2020-03-16  1:26 ` [PATCH V2 2/2] arm64: dts: imx8qxp-mek: Add PMIC thermal zone support Anson Huang
2020-03-16  1:26   ` Anson Huang
2020-03-16  1:35 ` [PATCH V2 1/2] arm64: dts: imx8qxp-mek: Sort labels alphabetically Shawn Guo
2020-03-16  1:35   ` Shawn Guo
2020-03-16  6:00 ` Shawn Guo
2020-03-16  6:00   ` Shawn Guo
2020-03-16  6:31   ` Anson Huang
2020-03-16  6:31     ` Anson Huang
2020-03-16  6:44     ` Shawn Guo [this message]
2020-03-16  6:44       ` Shawn Guo
2020-03-16 10:04       ` Aisheng Dong
2020-03-16 10:04         ` Aisheng Dong

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=20200316064456.GJ17221@dragon \
    --to=shawnguo@kernel.org \
    --cc=abel.vesa@nxp.com \
    --cc=anson.huang@nxp.com \
    --cc=daniel.baluta@nxp.com \
    --cc=devicetree@vger.kernel.org \
    --cc=festevam@gmail.com \
    --cc=kernel@pengutronix.de \
    --cc=leonard.crestez@nxp.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-imx@nxp.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mark.rutland@arm.com \
    --cc=robh+dt@kernel.org \
    --cc=s.hauer@pengutronix.de \
    /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.