* linux-next: manual merge of the usb tree with the xilinx tree
@ 2022-02-21 19:21 broonie
2022-02-22 7:37 ` Michal Simek
0 siblings, 1 reply; 9+ messages in thread
From: broonie @ 2022-02-21 19:21 UTC (permalink / raw)
To: Greg KH
Cc: David Heidelberg, Greg Kroah-Hartman, Linux Kernel Mailing List,
Linux Next Mailing List, Michal Simek, Sean Anderson
Hi all,
Today's linux-next merge of the usb tree got a conflict in:
arch/arm64/boot/dts/xilinx/zynqmp.dtsi
between commit:
eceb6f8677d31 ("arm64: xilinx: dts: drop legacy property #stream-id-cells")
from the xilinx tree and commit:
d8b1c3d0d700f ("arm64: dts: zynqmp: Move USB clocks to dwc3 node")
from the usb tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
diff --cc arch/arm64/boot/dts/xilinx/zynqmp.dtsi
index 056761c974fda,ba68fb8529ee0..0000000000000
--- a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
+++ b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
@@@ -823,6 -824,8 +822,7 @@@
interrupt-parent = <&gic>;
interrupt-names = "dwc_usb3", "otg";
interrupts = <0 65 4>, <0 69 4>;
+ clock-names = "bus_early", "ref";
- #stream-id-cells = <1>;
iommus = <&smmu 0x860>;
snps,quirk-frame-length-adjustment = <0x20>;
/* dma-coherent; */
@@@ -849,6 -851,8 +848,7 @@@
interrupt-parent = <&gic>;
interrupt-names = "dwc_usb3", "otg";
interrupts = <0 70 4>, <0 74 4>;
+ clock-names = "bus_early", "ref";
- #stream-id-cells = <1>;
iommus = <&smmu 0x861>;
snps,quirk-frame-length-adjustment = <0x20>;
/* dma-coherent; */
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: linux-next: manual merge of the usb tree with the xilinx tree
2022-02-21 19:21 linux-next: manual merge of the usb tree with the xilinx tree broonie
@ 2022-02-22 7:37 ` Michal Simek
0 siblings, 0 replies; 9+ messages in thread
From: Michal Simek @ 2022-02-22 7:37 UTC (permalink / raw)
To: broonie, Greg KH
Cc: David Heidelberg, Greg Kroah-Hartman, Linux Kernel Mailing List,
Linux Next Mailing List, Michal Simek, Sean Anderson
Hi Mark,
On 2/21/22 20:21, broonie@kernel.org wrote:
> Hi all,
>
> Today's linux-next merge of the usb tree got a conflict in:
>
> arch/arm64/boot/dts/xilinx/zynqmp.dtsi
>
> between commit:
>
> eceb6f8677d31 ("arm64: xilinx: dts: drop legacy property #stream-id-cells")
>
> from the xilinx tree and commit:
>
> d8b1c3d0d700f ("arm64: dts: zynqmp: Move USB clocks to dwc3 node")
>
> from the usb tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
> diff --cc arch/arm64/boot/dts/xilinx/zynqmp.dtsi
> index 056761c974fda,ba68fb8529ee0..0000000000000
> --- a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
> +++ b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
> @@@ -823,6 -824,8 +822,7 @@@
> interrupt-parent = <&gic>;
> interrupt-names = "dwc_usb3", "otg";
> interrupts = <0 65 4>, <0 69 4>;
> + clock-names = "bus_early", "ref";
> - #stream-id-cells = <1>;
> iommus = <&smmu 0x860>;
> snps,quirk-frame-length-adjustment = <0x20>;
> /* dma-coherent; */
> @@@ -849,6 -851,8 +848,7 @@@
> interrupt-parent = <&gic>;
> interrupt-names = "dwc_usb3", "otg";
> interrupts = <0 70 4>, <0 74 4>;
> + clock-names = "bus_early", "ref";
> - #stream-id-cells = <1>;
> iommus = <&smmu 0x861>;
> snps,quirk-frame-length-adjustment = <0x20>;
> /* dma-coherent; */
Thanks for letting us know.
This conflict was reported some time ago by Stephen already.
https://lore.kernel.org/all/20220210141550.56359523@canb.auug.org.au/
Thanks,
Michal
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: linux-next: manual merge of the usb tree with the xilinx tree
2022-03-18 7:39 ` Stephen Rothwell
@ 2022-03-18 7:59 ` Michal Simek
-1 siblings, 0 replies; 9+ messages in thread
From: Michal Simek @ 2022-03-18 7:59 UTC (permalink / raw)
To: Stephen Rothwell, Greg KH, Olof Johansson, Arnd Bergmann
Cc: Michal Simek, Michal Simek, David Heidelberg,
Linux Kernel Mailing List, Linux Next Mailing List,
Sean Anderson, ARM
On 3/18/22 08:39, Stephen Rothwell wrote:
> Hi all,
>
> On Thu, 10 Feb 2022 13:24:44 +0100 Michal Simek <michal.simek@xilinx.com> wrote:
>>
>> On 2/10/22 09:01, Greg KH wrote:
>>> On Thu, Feb 10, 2022 at 02:15:50PM +1100, Stephen Rothwell wrote:
>>>>
>>>> Today's linux-next merge of the usb tree got a conflict in:
>>>>
>>>> arch/arm64/boot/dts/xilinx/zynqmp.dtsi
>>>>
>>>> between commit:
>>>>
>>>> eceb6f8677d3 ("arm64: xilinx: dts: drop legacy property #stream-id-cells")
>>>>
>>>> from the xilinx tree and commit:
>>>>
>>>> d8b1c3d0d700 ("arm64: dts: zynqmp: Move USB clocks to dwc3 node")
>>>>
>>>> from the usb tree.
>>>>
>>>> I fixed it up (see below) and can carry the fix as necessary. This
>>>> is now fixed as far as linux-next is concerned, but any non trivial
>>>> conflicts should be mentioned to your upstream maintainer when your tree
>>>> is submitted for merging. You may also want to consider cooperating
>>>> with the maintainer of the conflicting tree to minimise any particularly
>>>> complex conflicts.
>>>>
>>>> diff --cc arch/arm64/boot/dts/xilinx/zynqmp.dtsi
>>>> index 056761c974fd,ba68fb8529ee..000000000000
>>>> --- a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
>>>> +++ b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
>>>> @@@ -823,6 -824,8 +822,7 @@@
>>>> interrupt-parent = <&gic>;
>>>> interrupt-names = "dwc_usb3", "otg";
>>>> interrupts = <0 65 4>, <0 69 4>;
>>>> + clock-names = "bus_early", "ref";
>>>> - #stream-id-cells = <1>;
>>>> iommus = <&smmu 0x860>;
>>>> snps,quirk-frame-length-adjustment = <0x20>;
>>>> /* dma-coherent; */
>>>> @@@ -849,6 -851,8 +848,7 @@@
>>>> interrupt-parent = <&gic>;
>>>> interrupt-names = "dwc_usb3", "otg";
>>>> interrupts = <0 70 4>, <0 74 4>;
>>>> + clock-names = "bus_early", "ref";
>>>> - #stream-id-cells = <1>;
>>>> iommus = <&smmu 0x861>;
>>>> snps,quirk-frame-length-adjustment = <0x20>;
>>>> /* dma-coherent; */
>>>> -- >> Cheers,
>>>> Stephen Rothwell
>>>
>>>
>>>
>>> Looks good, thanks!
>>
>> +1 on this.
>
> This is now a conflict between the usb tree and the arm-soc tree.
>
yes. I sent pull request to SOC tree and let Arnd know about this conflict.
Thanks,
Michal
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: linux-next: manual merge of the usb tree with the xilinx tree
@ 2022-03-18 7:59 ` Michal Simek
0 siblings, 0 replies; 9+ messages in thread
From: Michal Simek @ 2022-03-18 7:59 UTC (permalink / raw)
To: Stephen Rothwell, Greg KH, Olof Johansson, Arnd Bergmann
Cc: Michal Simek, Michal Simek, David Heidelberg,
Linux Kernel Mailing List, Linux Next Mailing List,
Sean Anderson, ARM
On 3/18/22 08:39, Stephen Rothwell wrote:
> Hi all,
>
> On Thu, 10 Feb 2022 13:24:44 +0100 Michal Simek <michal.simek@xilinx.com> wrote:
>>
>> On 2/10/22 09:01, Greg KH wrote:
>>> On Thu, Feb 10, 2022 at 02:15:50PM +1100, Stephen Rothwell wrote:
>>>>
>>>> Today's linux-next merge of the usb tree got a conflict in:
>>>>
>>>> arch/arm64/boot/dts/xilinx/zynqmp.dtsi
>>>>
>>>> between commit:
>>>>
>>>> eceb6f8677d3 ("arm64: xilinx: dts: drop legacy property #stream-id-cells")
>>>>
>>>> from the xilinx tree and commit:
>>>>
>>>> d8b1c3d0d700 ("arm64: dts: zynqmp: Move USB clocks to dwc3 node")
>>>>
>>>> from the usb tree.
>>>>
>>>> I fixed it up (see below) and can carry the fix as necessary. This
>>>> is now fixed as far as linux-next is concerned, but any non trivial
>>>> conflicts should be mentioned to your upstream maintainer when your tree
>>>> is submitted for merging. You may also want to consider cooperating
>>>> with the maintainer of the conflicting tree to minimise any particularly
>>>> complex conflicts.
>>>>
>>>> diff --cc arch/arm64/boot/dts/xilinx/zynqmp.dtsi
>>>> index 056761c974fd,ba68fb8529ee..000000000000
>>>> --- a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
>>>> +++ b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
>>>> @@@ -823,6 -824,8 +822,7 @@@
>>>> interrupt-parent = <&gic>;
>>>> interrupt-names = "dwc_usb3", "otg";
>>>> interrupts = <0 65 4>, <0 69 4>;
>>>> + clock-names = "bus_early", "ref";
>>>> - #stream-id-cells = <1>;
>>>> iommus = <&smmu 0x860>;
>>>> snps,quirk-frame-length-adjustment = <0x20>;
>>>> /* dma-coherent; */
>>>> @@@ -849,6 -851,8 +848,7 @@@
>>>> interrupt-parent = <&gic>;
>>>> interrupt-names = "dwc_usb3", "otg";
>>>> interrupts = <0 70 4>, <0 74 4>;
>>>> + clock-names = "bus_early", "ref";
>>>> - #stream-id-cells = <1>;
>>>> iommus = <&smmu 0x861>;
>>>> snps,quirk-frame-length-adjustment = <0x20>;
>>>> /* dma-coherent; */
>>>> -- >> Cheers,
>>>> Stephen Rothwell
>>>
>>>
>>>
>>> Looks good, thanks!
>>
>> +1 on this.
>
> This is now a conflict between the usb tree and the arm-soc tree.
>
yes. I sent pull request to SOC tree and let Arnd know about this conflict.
Thanks,
Michal
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: linux-next: manual merge of the usb tree with the xilinx tree
2022-02-10 12:24 ` Michal Simek
@ 2022-03-18 7:39 ` Stephen Rothwell
0 siblings, 0 replies; 9+ messages in thread
From: Stephen Rothwell @ 2022-03-18 7:39 UTC (permalink / raw)
To: Greg KH, Olof Johansson, Arnd Bergmann
Cc: Michal Simek, Michal Simek, David Heidelberg,
Linux Kernel Mailing List, Linux Next Mailing List,
Sean Anderson, ARM
[-- Attachment #1: Type: text/plain, Size: 2212 bytes --]
Hi all,
On Thu, 10 Feb 2022 13:24:44 +0100 Michal Simek <michal.simek@xilinx.com> wrote:
>
> On 2/10/22 09:01, Greg KH wrote:
> > On Thu, Feb 10, 2022 at 02:15:50PM +1100, Stephen Rothwell wrote:
> >>
> >> Today's linux-next merge of the usb tree got a conflict in:
> >>
> >> arch/arm64/boot/dts/xilinx/zynqmp.dtsi
> >>
> >> between commit:
> >>
> >> eceb6f8677d3 ("arm64: xilinx: dts: drop legacy property #stream-id-cells")
> >>
> >> from the xilinx tree and commit:
> >>
> >> d8b1c3d0d700 ("arm64: dts: zynqmp: Move USB clocks to dwc3 node")
> >>
> >> from the usb tree.
> >>
> >> I fixed it up (see below) and can carry the fix as necessary. This
> >> is now fixed as far as linux-next is concerned, but any non trivial
> >> conflicts should be mentioned to your upstream maintainer when your tree
> >> is submitted for merging. You may also want to consider cooperating
> >> with the maintainer of the conflicting tree to minimise any particularly
> >> complex conflicts.
> >>
> >> diff --cc arch/arm64/boot/dts/xilinx/zynqmp.dtsi
> >> index 056761c974fd,ba68fb8529ee..000000000000
> >> --- a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
> >> +++ b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
> >> @@@ -823,6 -824,8 +822,7 @@@
> >> interrupt-parent = <&gic>;
> >> interrupt-names = "dwc_usb3", "otg";
> >> interrupts = <0 65 4>, <0 69 4>;
> >> + clock-names = "bus_early", "ref";
> >> - #stream-id-cells = <1>;
> >> iommus = <&smmu 0x860>;
> >> snps,quirk-frame-length-adjustment = <0x20>;
> >> /* dma-coherent; */
> >> @@@ -849,6 -851,8 +848,7 @@@
> >> interrupt-parent = <&gic>;
> >> interrupt-names = "dwc_usb3", "otg";
> >> interrupts = <0 70 4>, <0 74 4>;
> >> + clock-names = "bus_early", "ref";
> >> - #stream-id-cells = <1>;
> >> iommus = <&smmu 0x861>;
> >> snps,quirk-frame-length-adjustment = <0x20>;
> >> /* dma-coherent; */
> >> -- >> Cheers,
> >> Stephen Rothwell
> >
> >
> >
> > Looks good, thanks!
>
> +1 on this.
This is now a conflict between the usb tree and the arm-soc tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: linux-next: manual merge of the usb tree with the xilinx tree
@ 2022-03-18 7:39 ` Stephen Rothwell
0 siblings, 0 replies; 9+ messages in thread
From: Stephen Rothwell @ 2022-03-18 7:39 UTC (permalink / raw)
To: Greg KH, Olof Johansson, Arnd Bergmann
Cc: Michal Simek, Michal Simek, David Heidelberg,
Linux Kernel Mailing List, Linux Next Mailing List,
Sean Anderson, ARM
[-- Attachment #1.1: Type: text/plain, Size: 2212 bytes --]
Hi all,
On Thu, 10 Feb 2022 13:24:44 +0100 Michal Simek <michal.simek@xilinx.com> wrote:
>
> On 2/10/22 09:01, Greg KH wrote:
> > On Thu, Feb 10, 2022 at 02:15:50PM +1100, Stephen Rothwell wrote:
> >>
> >> Today's linux-next merge of the usb tree got a conflict in:
> >>
> >> arch/arm64/boot/dts/xilinx/zynqmp.dtsi
> >>
> >> between commit:
> >>
> >> eceb6f8677d3 ("arm64: xilinx: dts: drop legacy property #stream-id-cells")
> >>
> >> from the xilinx tree and commit:
> >>
> >> d8b1c3d0d700 ("arm64: dts: zynqmp: Move USB clocks to dwc3 node")
> >>
> >> from the usb tree.
> >>
> >> I fixed it up (see below) and can carry the fix as necessary. This
> >> is now fixed as far as linux-next is concerned, but any non trivial
> >> conflicts should be mentioned to your upstream maintainer when your tree
> >> is submitted for merging. You may also want to consider cooperating
> >> with the maintainer of the conflicting tree to minimise any particularly
> >> complex conflicts.
> >>
> >> diff --cc arch/arm64/boot/dts/xilinx/zynqmp.dtsi
> >> index 056761c974fd,ba68fb8529ee..000000000000
> >> --- a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
> >> +++ b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
> >> @@@ -823,6 -824,8 +822,7 @@@
> >> interrupt-parent = <&gic>;
> >> interrupt-names = "dwc_usb3", "otg";
> >> interrupts = <0 65 4>, <0 69 4>;
> >> + clock-names = "bus_early", "ref";
> >> - #stream-id-cells = <1>;
> >> iommus = <&smmu 0x860>;
> >> snps,quirk-frame-length-adjustment = <0x20>;
> >> /* dma-coherent; */
> >> @@@ -849,6 -851,8 +848,7 @@@
> >> interrupt-parent = <&gic>;
> >> interrupt-names = "dwc_usb3", "otg";
> >> interrupts = <0 70 4>, <0 74 4>;
> >> + clock-names = "bus_early", "ref";
> >> - #stream-id-cells = <1>;
> >> iommus = <&smmu 0x861>;
> >> snps,quirk-frame-length-adjustment = <0x20>;
> >> /* dma-coherent; */
> >> -- >> Cheers,
> >> Stephen Rothwell
> >
> >
> >
> > Looks good, thanks!
>
> +1 on this.
This is now a conflict between the usb tree and the arm-soc tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
[-- Attachment #2: Type: text/plain, Size: 176 bytes --]
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: linux-next: manual merge of the usb tree with the xilinx tree
2022-02-10 8:01 ` Greg KH
@ 2022-02-10 12:24 ` Michal Simek
2022-03-18 7:39 ` Stephen Rothwell
0 siblings, 1 reply; 9+ messages in thread
From: Michal Simek @ 2022-02-10 12:24 UTC (permalink / raw)
To: Greg KH, Stephen Rothwell
Cc: Michal Simek, David Heidelberg, Linux Kernel Mailing List,
Linux Next Mailing List, Michal Simek, Sean Anderson
On 2/10/22 09:01, Greg KH wrote:
> On Thu, Feb 10, 2022 at 02:15:50PM +1100, Stephen Rothwell wrote:
>> Hi all,
>>
>> Today's linux-next merge of the usb tree got a conflict in:
>>
>> arch/arm64/boot/dts/xilinx/zynqmp.dtsi
>>
>> between commit:
>>
>> eceb6f8677d3 ("arm64: xilinx: dts: drop legacy property #stream-id-cells")
>>
>> from the xilinx tree and commit:
>>
>> d8b1c3d0d700 ("arm64: dts: zynqmp: Move USB clocks to dwc3 node")
>>
>> from the usb tree.
>>
>> I fixed it up (see below) and can carry the fix as necessary. This
>> is now fixed as far as linux-next is concerned, but any non trivial
>> conflicts should be mentioned to your upstream maintainer when your tree
>> is submitted for merging. You may also want to consider cooperating
>> with the maintainer of the conflicting tree to minimise any particularly
>> complex conflicts.
>>
>> diff --cc arch/arm64/boot/dts/xilinx/zynqmp.dtsi
>> index 056761c974fd,ba68fb8529ee..000000000000
>> --- a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
>> +++ b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
>> @@@ -823,6 -824,8 +822,7 @@@
>> interrupt-parent = <&gic>;
>> interrupt-names = "dwc_usb3", "otg";
>> interrupts = <0 65 4>, <0 69 4>;
>> + clock-names = "bus_early", "ref";
>> - #stream-id-cells = <1>;
>> iommus = <&smmu 0x860>;
>> snps,quirk-frame-length-adjustment = <0x20>;
>> /* dma-coherent; */
>> @@@ -849,6 -851,8 +848,7 @@@
>> interrupt-parent = <&gic>;
>> interrupt-names = "dwc_usb3", "otg";
>> interrupts = <0 70 4>, <0 74 4>;
>> + clock-names = "bus_early", "ref";
>> - #stream-id-cells = <1>;
>> iommus = <&smmu 0x861>;
>> snps,quirk-frame-length-adjustment = <0x20>;
>> /* dma-coherent; */
>> --
>> Cheers,
>> Stephen Rothwell
>
>
>
> Looks good, thanks!
+1 on this.
Thanks,
Michal
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: linux-next: manual merge of the usb tree with the xilinx tree
2022-02-10 3:15 Stephen Rothwell
@ 2022-02-10 8:01 ` Greg KH
2022-02-10 12:24 ` Michal Simek
0 siblings, 1 reply; 9+ messages in thread
From: Greg KH @ 2022-02-10 8:01 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Michal Simek, David Heidelberg, Linux Kernel Mailing List,
Linux Next Mailing List, Michal Simek, Sean Anderson
On Thu, Feb 10, 2022 at 02:15:50PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the usb tree got a conflict in:
>
> arch/arm64/boot/dts/xilinx/zynqmp.dtsi
>
> between commit:
>
> eceb6f8677d3 ("arm64: xilinx: dts: drop legacy property #stream-id-cells")
>
> from the xilinx tree and commit:
>
> d8b1c3d0d700 ("arm64: dts: zynqmp: Move USB clocks to dwc3 node")
>
> from the usb tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
> diff --cc arch/arm64/boot/dts/xilinx/zynqmp.dtsi
> index 056761c974fd,ba68fb8529ee..000000000000
> --- a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
> +++ b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
> @@@ -823,6 -824,8 +822,7 @@@
> interrupt-parent = <&gic>;
> interrupt-names = "dwc_usb3", "otg";
> interrupts = <0 65 4>, <0 69 4>;
> + clock-names = "bus_early", "ref";
> - #stream-id-cells = <1>;
> iommus = <&smmu 0x860>;
> snps,quirk-frame-length-adjustment = <0x20>;
> /* dma-coherent; */
> @@@ -849,6 -851,8 +848,7 @@@
> interrupt-parent = <&gic>;
> interrupt-names = "dwc_usb3", "otg";
> interrupts = <0 70 4>, <0 74 4>;
> + clock-names = "bus_early", "ref";
> - #stream-id-cells = <1>;
> iommus = <&smmu 0x861>;
> snps,quirk-frame-length-adjustment = <0x20>;
> /* dma-coherent; */
> --
> Cheers,
> Stephen Rothwell
Looks good, thanks!
greg k-h
^ permalink raw reply [flat|nested] 9+ messages in thread
* linux-next: manual merge of the usb tree with the xilinx tree
@ 2022-02-10 3:15 Stephen Rothwell
2022-02-10 8:01 ` Greg KH
0 siblings, 1 reply; 9+ messages in thread
From: Stephen Rothwell @ 2022-02-10 3:15 UTC (permalink / raw)
To: Greg KH, Michal Simek
Cc: David Heidelberg, Greg Kroah-Hartman, Linux Kernel Mailing List,
Linux Next Mailing List, Michal Simek, Sean Anderson
[-- Attachment #1: Type: text/plain, Size: 1604 bytes --]
Hi all,
Today's linux-next merge of the usb tree got a conflict in:
arch/arm64/boot/dts/xilinx/zynqmp.dtsi
between commit:
eceb6f8677d3 ("arm64: xilinx: dts: drop legacy property #stream-id-cells")
from the xilinx tree and commit:
d8b1c3d0d700 ("arm64: dts: zynqmp: Move USB clocks to dwc3 node")
from the usb tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
diff --cc arch/arm64/boot/dts/xilinx/zynqmp.dtsi
index 056761c974fd,ba68fb8529ee..000000000000
--- a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
+++ b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
@@@ -823,6 -824,8 +822,7 @@@
interrupt-parent = <&gic>;
interrupt-names = "dwc_usb3", "otg";
interrupts = <0 65 4>, <0 69 4>;
+ clock-names = "bus_early", "ref";
- #stream-id-cells = <1>;
iommus = <&smmu 0x860>;
snps,quirk-frame-length-adjustment = <0x20>;
/* dma-coherent; */
@@@ -849,6 -851,8 +848,7 @@@
interrupt-parent = <&gic>;
interrupt-names = "dwc_usb3", "otg";
interrupts = <0 70 4>, <0 74 4>;
+ clock-names = "bus_early", "ref";
- #stream-id-cells = <1>;
iommus = <&smmu 0x861>;
snps,quirk-frame-length-adjustment = <0x20>;
/* dma-coherent; */
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2022-03-18 8:01 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-02-21 19:21 linux-next: manual merge of the usb tree with the xilinx tree broonie
2022-02-22 7:37 ` Michal Simek
-- strict thread matches above, loose matches on Subject: below --
2022-02-10 3:15 Stephen Rothwell
2022-02-10 8:01 ` Greg KH
2022-02-10 12:24 ` Michal Simek
2022-03-18 7:39 ` Stephen Rothwell
2022-03-18 7:39 ` Stephen Rothwell
2022-03-18 7:59 ` Michal Simek
2022-03-18 7:59 ` Michal Simek
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.