linux-kernel - Re: linux-next: manual merge of the usb tree with the xilinx tree

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:   Thu, 10 Feb 2022 13:24:44 +0100
From:   Michal Simek <michal.simek@...inx.com>
To:     Greg KH <greg@...ah.com>, Stephen Rothwell <sfr@...b.auug.org.au>
CC:     Michal Simek <monstr@...str.eu>, David Heidelberg <david@...t.cz>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Michal Simek <michal.simek@...inx.com>,
        Sean Anderson <sean.anderson@...o.com>
Subject: Re: linux-next: manual merge of the usb tree with the xilinx tree



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