From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: Bjorn Andersson <bjorn.andersson@linaro.org>
Cc: Serge Semin <fancer.lancer@gmail.com>,
Krzysztof Kozlowski <krzk@kernel.org>,
Rob Herring <robh+dt@kernel.org>,
Serge Semin <Sergey.Semin@baikalelectronics.ru>,
John Stultz <john.stultz@linaro.org>,
Felipe Balbi <balbi@kernel.org>,
Florian Fainelli <f.fainelli@gmail.com>,
Andy Gross <agross@kernel.org>,
"open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS"
<devicetree@vger.kernel.org>,
linux-arm-msm <linux-arm-msm@vger.kernel.org>,
Linux USB List <linux-usb@vger.kernel.org>,
lkml <linux-kernel@vger.kernel.org>,
linux-arm-kernel <linux-arm-kernel@lists.infradead.org>,
Amit Pundir <amit.pundir@linaro.org>
Subject: Re: [PATCH 29/29] arm64: dts: qcom: Harmonize DWC USB3 DT nodes name
Date: Sat, 24 Jul 2021 09:50:10 +0200 [thread overview]
Message-ID: <YPvGMtuP/ZpwTKN2@kroah.com> (raw)
In-Reply-To: <YPsejtV31WrYJX7e@yoga>
On Fri, Jul 23, 2021 at 02:54:54PM -0500, Bjorn Andersson wrote:
> On Fri 23 Jul 10:54 CDT 2021, Greg Kroah-Hartman wrote:
>
> > On Fri, Jul 23, 2021 at 09:34:20AM -0500, Bjorn Andersson wrote:
> > > On Fri 23 Jul 03:18 CDT 2021, Greg Kroah-Hartman wrote:
> > >
> > > > On Wed, Jul 21, 2021 at 03:09:37PM -0500, Bjorn Andersson wrote:
> > > > > Which tree did you revert this in? 5.13.stable?)
> > > >
> > > > My usb-linus branch which will go to Linus later today. Then we can
> > > > backport the revert to older kernels as needed.
> > > >
> > >
> > > I'm not worried about the backports, I'm worried about conflicts you're
> > > causing because you're taking a non-usb patch through the usb tree.
> > >
> > > I was about to push a revert (to this and the other Qualcomm platforms),
> > > but as you're taking some set of reverts through the usb tree we're just
> > > in for a bunch of merge conflicts.
> >
> > It shouldn't be a merge conflict as you can apply the same revert to
> > your tree now and keep on merging. When you pick up 5.14-rc3 from Linus
> > it should merge "correctly", right?
> >
>
> I typically don't merge back the -rcs into my -next branch, is that
> common practice?
I do it when Linus takes patches from my -linus branch in order to
ensure they end up in my -next branch for testing and merge issues.
> But I still don't understand why you insist on driving this through your
> tree. I've asked you several times to show me on the patch so I at least
> can Ack it. I made a mistake, but why do you insist on keeping me - the
> maintainer - out of the loop?
I had already done the revert, I wasn't trying to keep anyone out of the
loop here, sorry if it came across that way. I just wanted to ensure
this got resolved quickly so I could move on to other issues.
This is now 1f958f3dff42 ("Revert "arm64: dts: qcom: Harmonize DWC USB3
DT nodes name"") in Linus's tree if you wish to cherry-pick it into your
tree to resolve merge issues, sorry for the confusion.
thanks,
greg k-h
WARNING: multiple messages have this Message-ID (diff)
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: Bjorn Andersson <bjorn.andersson@linaro.org>
Cc: Serge Semin <fancer.lancer@gmail.com>,
Krzysztof Kozlowski <krzk@kernel.org>,
Rob Herring <robh+dt@kernel.org>,
Serge Semin <Sergey.Semin@baikalelectronics.ru>,
John Stultz <john.stultz@linaro.org>,
Felipe Balbi <balbi@kernel.org>,
Florian Fainelli <f.fainelli@gmail.com>,
Andy Gross <agross@kernel.org>,
"open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS"
<devicetree@vger.kernel.org>,
linux-arm-msm <linux-arm-msm@vger.kernel.org>,
Linux USB List <linux-usb@vger.kernel.org>,
lkml <linux-kernel@vger.kernel.org>,
linux-arm-kernel <linux-arm-kernel@lists.infradead.org>,
Amit Pundir <amit.pundir@linaro.org>
Subject: Re: [PATCH 29/29] arm64: dts: qcom: Harmonize DWC USB3 DT nodes name
Date: Sat, 24 Jul 2021 09:50:10 +0200 [thread overview]
Message-ID: <YPvGMtuP/ZpwTKN2@kroah.com> (raw)
In-Reply-To: <YPsejtV31WrYJX7e@yoga>
On Fri, Jul 23, 2021 at 02:54:54PM -0500, Bjorn Andersson wrote:
> On Fri 23 Jul 10:54 CDT 2021, Greg Kroah-Hartman wrote:
>
> > On Fri, Jul 23, 2021 at 09:34:20AM -0500, Bjorn Andersson wrote:
> > > On Fri 23 Jul 03:18 CDT 2021, Greg Kroah-Hartman wrote:
> > >
> > > > On Wed, Jul 21, 2021 at 03:09:37PM -0500, Bjorn Andersson wrote:
> > > > > Which tree did you revert this in? 5.13.stable?)
> > > >
> > > > My usb-linus branch which will go to Linus later today. Then we can
> > > > backport the revert to older kernels as needed.
> > > >
> > >
> > > I'm not worried about the backports, I'm worried about conflicts you're
> > > causing because you're taking a non-usb patch through the usb tree.
> > >
> > > I was about to push a revert (to this and the other Qualcomm platforms),
> > > but as you're taking some set of reverts through the usb tree we're just
> > > in for a bunch of merge conflicts.
> >
> > It shouldn't be a merge conflict as you can apply the same revert to
> > your tree now and keep on merging. When you pick up 5.14-rc3 from Linus
> > it should merge "correctly", right?
> >
>
> I typically don't merge back the -rcs into my -next branch, is that
> common practice?
I do it when Linus takes patches from my -linus branch in order to
ensure they end up in my -next branch for testing and merge issues.
> But I still don't understand why you insist on driving this through your
> tree. I've asked you several times to show me on the patch so I at least
> can Ack it. I made a mistake, but why do you insist on keeping me - the
> maintainer - out of the loop?
I had already done the revert, I wasn't trying to keep anyone out of the
loop here, sorry if it came across that way. I just wanted to ensure
this got resolved quickly so I could move on to other issues.
This is now 1f958f3dff42 ("Revert "arm64: dts: qcom: Harmonize DWC USB3
DT nodes name"") in Linus's tree if you wish to cherry-pick it into your
tree to resolve merge issues, sorry for the confusion.
thanks,
greg k-h
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2021-07-24 7:50 UTC|newest]
Thread overview: 234+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-20 11:59 [PATCH 00/29] dt-bindings: usb: Harmonize xHCI/EHCI/OHCI/DWC3 nodes name Serge Semin
2020-10-20 11:59 ` Serge Semin
2020-10-20 11:59 ` Serge Semin
2020-10-20 11:59 ` Serge Semin
2020-10-20 11:59 ` [PATCH 01/29] usb: dwc3: Discard synopsys,dwc3 compatibility string Serge Semin
2020-10-20 11:59 ` Serge Semin
2020-10-20 12:15 ` Andy Shevchenko
2020-10-20 12:15 ` [PATCH 01/29] usb: dwc3: Discard synopsys, dwc3 " Andy Shevchenko
2020-10-20 12:28 ` [PATCH 01/29] usb: dwc3: Discard synopsys,dwc3 " Krzysztof Kozlowski
2020-10-20 12:28 ` Krzysztof Kozlowski
2020-10-20 12:33 ` Serge Semin
2020-10-20 12:33 ` Serge Semin
2020-10-20 12:27 ` Felipe Balbi
2020-10-20 12:27 ` Felipe Balbi
2020-10-20 11:59 ` [PATCH 02/29] arm: dts: keystone: Correct DWC USB3 compatible string Serge Semin
2020-10-20 11:59 ` Serge Semin
2020-10-20 12:30 ` Krzysztof Kozlowski
2020-10-20 12:30 ` Krzysztof Kozlowski
2020-10-20 11:59 ` [PATCH 03/29] arm: dts: am437x: " Serge Semin
2020-10-20 11:59 ` Serge Semin
2020-10-20 12:31 ` Krzysztof Kozlowski
2020-10-20 12:31 ` Krzysztof Kozlowski
2020-11-10 13:17 ` Tony Lindgren
2020-11-10 13:17 ` Tony Lindgren
2020-10-20 11:59 ` [PATCH 04/29] arm: dts: exynos: " Serge Semin
2020-10-20 11:59 ` Serge Semin
2020-10-26 18:55 ` Krzysztof Kozlowski
2020-10-26 18:55 ` Krzysztof Kozlowski
2020-10-20 11:59 ` [PATCH 05/29] arm64: dts: amlogic: meson-g12: Set FL-adj property value Serge Semin
2020-10-20 11:59 ` Serge Semin
2020-10-20 11:59 ` Serge Semin
2020-10-20 12:34 ` Krzysztof Kozlowski
2020-10-20 12:34 ` Krzysztof Kozlowski
2020-10-20 12:34 ` Krzysztof Kozlowski
2020-10-20 12:44 ` Serge Semin
2020-10-20 12:44 ` Serge Semin
2020-10-20 12:44 ` Serge Semin
2020-10-20 12:46 ` Krzysztof Kozlowski
2020-10-20 12:46 ` Krzysztof Kozlowski
2020-10-20 12:46 ` Krzysztof Kozlowski
2020-10-20 13:06 ` Neil Armstrong
2020-10-20 13:06 ` Neil Armstrong
2020-10-20 13:06 ` Neil Armstrong
2020-10-20 19:38 ` Martin Blumenstingl
2020-10-20 19:38 ` Martin Blumenstingl
2020-10-20 19:38 ` Martin Blumenstingl
2020-10-20 11:59 ` [PATCH 06/29] arc: dts: Harmonize EHCI/OHCI DT nodes name Serge Semin
2020-10-20 11:59 ` Serge Semin
2020-10-20 11:59 ` Serge Semin
2020-10-20 12:35 ` Krzysztof Kozlowski
2020-10-20 12:35 ` Krzysztof Kozlowski
2020-10-20 12:35 ` Krzysztof Kozlowski
2020-10-20 11:59 ` [PATCH 07/29] arm: dts: bcm53x: " Serge Semin
2020-10-20 11:59 ` Serge Semin
2020-10-20 12:34 ` Krzysztof Kozlowski
2020-10-20 12:34 ` Krzysztof Kozlowski
2020-10-22 20:43 ` Florian Fainelli
2020-10-22 20:43 ` Florian Fainelli
2020-10-20 11:59 ` [PATCH 08/29] arm: dts: stm32: " Serge Semin
2020-10-20 11:59 ` Serge Semin
2020-10-20 12:36 ` Krzysztof Kozlowski
2020-10-20 12:36 ` Krzysztof Kozlowski
2020-11-09 10:43 ` Alexandre Torgue
2020-11-09 10:43 ` Alexandre Torgue
2020-10-20 11:59 ` [PATCH 09/29] arm: dts: hisi-x5hd2: " Serge Semin
2020-10-20 11:59 ` Serge Semin
2020-10-20 12:36 ` Krzysztof Kozlowski
2020-10-20 12:36 ` Krzysztof Kozlowski
2020-10-20 11:59 ` [PATCH 10/29] arm: dts: lpc18xx: " Serge Semin
2020-10-20 11:59 ` Serge Semin
2020-10-20 12:37 ` Krzysztof Kozlowski
2020-10-20 12:37 ` Krzysztof Kozlowski
2020-10-21 19:02 ` Vladimir Zapolskiy
2020-10-21 19:02 ` Vladimir Zapolskiy
2020-10-20 11:59 ` [PATCH 11/29] arm64: dts: hisi: " Serge Semin
2020-10-20 11:59 ` Serge Semin
2020-10-20 12:37 ` Krzysztof Kozlowski
2020-10-20 12:37 ` Krzysztof Kozlowski
2020-10-20 11:59 ` [PATCH 12/29] mips: dts: jz47x: " Serge Semin
2020-10-20 11:59 ` Serge Semin
2020-10-20 12:40 ` Krzysztof Kozlowski
2020-10-20 12:40 ` Krzysztof Kozlowski
2020-10-20 11:59 ` [PATCH 13/29] mips: dts: sead3: " Serge Semin
2020-10-20 11:59 ` Serge Semin
2020-10-20 12:37 ` Krzysztof Kozlowski
2020-10-20 12:37 ` Krzysztof Kozlowski
2020-10-20 11:59 ` [PATCH 14/29] mips: dts: ralink: mt7628a: " Serge Semin
2020-10-20 11:59 ` Serge Semin
2020-10-20 11:59 ` Serge Semin
2020-10-20 12:38 ` Krzysztof Kozlowski
2020-10-20 12:38 ` Krzysztof Kozlowski
2020-10-20 12:38 ` Krzysztof Kozlowski
2020-10-20 11:59 ` [PATCH 15/29] powerpc: dts: akebono: " Serge Semin
2020-10-20 11:59 ` Serge Semin
2020-10-20 11:59 ` Serge Semin
2020-10-20 12:38 ` Krzysztof Kozlowski
2020-10-20 12:38 ` Krzysztof Kozlowski
2020-10-20 12:38 ` Krzysztof Kozlowski
2020-10-20 11:59 ` [PATCH 16/29] arm: dts: bcm5301x: Harmonize xHCI " Serge Semin
2020-10-20 11:59 ` Serge Semin
2020-10-20 12:38 ` Krzysztof Kozlowski
2020-10-20 12:38 ` Krzysztof Kozlowski
2020-10-22 20:44 ` Florian Fainelli
2020-10-22 20:44 ` Florian Fainelli
2020-10-20 11:59 ` [PATCH 17/29] arm64: dts: marvell: cp11x: " Serge Semin
2020-10-20 11:59 ` Serge Semin
2020-10-20 12:40 ` Krzysztof Kozlowski
2020-10-20 12:40 ` Krzysztof Kozlowski
2020-10-20 11:59 ` [PATCH 18/29] arm: dts: marvell: armada-375: Harmonize DWC USB3 " Serge Semin
2020-10-20 11:59 ` Serge Semin
2020-10-20 12:43 ` Krzysztof Kozlowski
2020-10-20 12:43 ` Krzysztof Kozlowski
2020-10-20 11:59 ` [PATCH 19/29] arm: dts: exynos: " Serge Semin
2020-10-20 11:59 ` Serge Semin
2020-10-26 18:56 ` Krzysztof Kozlowski
2020-10-26 18:56 ` Krzysztof Kozlowski
2020-10-20 11:59 ` [PATCH 20/29] arm: dts: keystone: " Serge Semin
2020-10-20 11:59 ` Serge Semin
2020-10-20 12:41 ` Krzysztof Kozlowski
2020-10-20 12:41 ` Krzysztof Kozlowski
2020-10-20 11:59 ` [PATCH 21/29] arm: dts: ls1021a: " Serge Semin
2020-10-20 11:59 ` Serge Semin
2020-10-20 12:46 ` Krzysztof Kozlowski
2020-10-20 12:46 ` Krzysztof Kozlowski
2020-11-01 7:37 ` Shawn Guo
2020-11-01 7:37 ` Shawn Guo
2020-10-20 11:59 ` [PATCH 22/29] arm: dts: omap5: " Serge Semin
2020-10-20 11:59 ` Serge Semin
2020-10-20 12:41 ` Krzysztof Kozlowski
2020-10-20 12:41 ` Krzysztof Kozlowski
2020-11-10 13:18 ` Tony Lindgren
2020-11-10 13:18 ` Tony Lindgren
2020-10-20 11:59 ` [PATCH 23/29] arm: dts: stih407-family: " Serge Semin
2020-10-20 11:59 ` Serge Semin
2020-10-20 12:41 ` Krzysztof Kozlowski
2020-10-20 12:41 ` Krzysztof Kozlowski
2020-10-20 11:59 ` [PATCH 24/29] arm64: dts: allwinner: h6: " Serge Semin
2020-10-20 11:59 ` Serge Semin
2020-10-20 12:42 ` Krzysztof Kozlowski
2020-10-20 12:42 ` Krzysztof Kozlowski
2020-10-22 16:13 ` Maxime Ripard
2020-10-22 16:13 ` Maxime Ripard
2020-10-20 11:59 ` [PATCH 25/29] arm64: dts: apm: " Serge Semin
2020-10-20 11:59 ` Serge Semin
2020-10-20 12:42 ` Krzysztof Kozlowski
2020-10-20 12:42 ` Krzysztof Kozlowski
2020-10-20 11:59 ` [PATCH 26/29] arm64: dts: exynos: " Serge Semin
2020-10-20 11:59 ` Serge Semin
2020-10-20 12:43 ` Krzysztof Kozlowski
2020-10-20 12:43 ` Krzysztof Kozlowski
2020-10-22 11:25 ` Serge Semin
2020-10-22 11:25 ` Serge Semin
2020-10-26 18:57 ` Krzysztof Kozlowski
2020-10-26 18:57 ` Krzysztof Kozlowski
2020-10-20 11:59 ` [PATCH 27/29] arm64: dts: layerscape: " Serge Semin
2020-10-20 11:59 ` Serge Semin
2020-10-20 12:47 ` Krzysztof Kozlowski
2020-10-20 12:47 ` Krzysztof Kozlowski
2020-11-01 7:37 ` Shawn Guo
2020-11-01 7:37 ` Shawn Guo
2020-10-20 11:59 ` [PATCH 28/29] arm64: dts: hi3660: " Serge Semin
2020-10-20 11:59 ` Serge Semin
2020-10-20 12:44 ` Krzysztof Kozlowski
2020-10-20 12:44 ` Krzysztof Kozlowski
2020-10-20 11:59 ` [PATCH 29/29] arm64: dts: qcom: " Serge Semin
2020-10-20 11:59 ` Serge Semin
2020-10-20 12:44 ` Krzysztof Kozlowski
2020-10-20 12:44 ` Krzysztof Kozlowski
2020-11-02 7:34 ` Jun Li
2020-11-02 7:34 ` Jun Li
2020-11-03 23:23 ` Bjorn Andersson
2020-11-03 23:23 ` Bjorn Andersson
2020-11-10 12:12 ` Serge Semin
2020-11-10 12:12 ` Serge Semin
2021-07-14 0:07 ` John Stultz
2021-07-14 0:07 ` John Stultz
2021-07-14 2:27 ` Bjorn Andersson
2021-07-14 2:27 ` Bjorn Andersson
2021-07-21 7:39 ` Greg Kroah-Hartman
2021-07-21 7:39 ` Greg Kroah-Hartman
2021-07-14 12:48 ` Serge Semin
2021-07-14 12:48 ` Serge Semin
2021-07-14 14:59 ` Bjorn Andersson
2021-07-14 14:59 ` Bjorn Andersson
2021-07-21 7:38 ` Greg Kroah-Hartman
2021-07-21 7:38 ` Greg Kroah-Hartman
2021-07-21 10:02 ` Serge Semin
2021-07-21 10:02 ` Serge Semin
2021-07-21 10:29 ` Greg Kroah-Hartman
2021-07-21 10:29 ` Greg Kroah-Hartman
2021-07-21 10:45 ` Krzysztof Kozlowski
2021-07-21 10:45 ` Krzysztof Kozlowski
2021-07-21 11:02 ` Greg Kroah-Hartman
2021-07-21 11:02 ` Greg Kroah-Hartman
2021-07-21 11:10 ` Krzysztof Kozlowski
2021-07-21 11:10 ` Krzysztof Kozlowski
2021-07-21 11:25 ` Serge Semin
2021-07-21 11:25 ` Serge Semin
2021-07-21 18:08 ` John Stultz
2021-07-21 18:08 ` John Stultz
2021-07-22 18:12 ` Serge Semin
2021-07-22 18:12 ` Serge Semin
2021-07-22 19:17 ` Bjorn Andersson
2021-07-22 19:17 ` Bjorn Andersson
2021-07-22 20:09 ` John Stultz
2021-07-22 20:09 ` John Stultz
2021-07-22 22:09 ` Serge Semin
2021-07-22 22:09 ` Serge Semin
2021-08-14 1:06 ` John Stultz
2021-08-14 1:06 ` John Stultz
2021-08-15 19:46 ` Serge Semin
2021-08-15 19:46 ` Serge Semin
2021-08-18 3:44 ` Bjorn Andersson
2021-08-18 3:44 ` Bjorn Andersson
2021-08-19 11:03 ` Serge Semin
2021-08-19 11:03 ` Serge Semin
2021-07-22 21:54 ` Serge Semin
2021-07-22 21:54 ` Serge Semin
2021-07-23 8:17 ` Greg Kroah-Hartman
2021-07-23 8:17 ` Greg Kroah-Hartman
2021-07-21 20:09 ` Bjorn Andersson
2021-07-21 20:09 ` Bjorn Andersson
2021-07-23 8:18 ` Greg Kroah-Hartman
2021-07-23 8:18 ` Greg Kroah-Hartman
2021-07-23 14:34 ` Bjorn Andersson
2021-07-23 14:34 ` Bjorn Andersson
2021-07-23 15:54 ` Greg Kroah-Hartman
2021-07-23 15:54 ` Greg Kroah-Hartman
2021-07-23 19:54 ` Bjorn Andersson
2021-07-23 19:54 ` Bjorn Andersson
2021-07-24 7:50 ` Greg Kroah-Hartman [this message]
2021-07-24 7:50 ` Greg Kroah-Hartman
2021-07-21 7:37 ` Greg Kroah-Hartman
2021-07-21 7:37 ` Greg Kroah-Hartman
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=YPvGMtuP/ZpwTKN2@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=Sergey.Semin@baikalelectronics.ru \
--cc=agross@kernel.org \
--cc=amit.pundir@linaro.org \
--cc=balbi@kernel.org \
--cc=bjorn.andersson@linaro.org \
--cc=devicetree@vger.kernel.org \
--cc=f.fainelli@gmail.com \
--cc=fancer.lancer@gmail.com \
--cc=john.stultz@linaro.org \
--cc=krzk@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=robh+dt@kernel.org \
/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.