Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Received-SPF: Pass (protection.outlook.com: domain of xilinx.com designates
 149.199.62.198 as permitted sender) receiver=protection.outlook.com;
 client-ip=149.199.62.198; helo=xsj-pvapexch01.xlnx.xilinx.com;
Envelope-to: greg@kroah.com,
 sfr@canb.auug.org.au,
 monstr@monstr.eu,
 david@ixit.cz,
 linux-kernel@vger.kernel.org,
 linux-next@vger.kernel.org,
 sean.anderson@seco.com
Message-ID: <d7f84e0a-7c3a-116a-0911-2ed5a0bab2d9@xilinx.com>
Date:   Thu, 10 Feb 2022 13:24:44 +0100
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101
 Thunderbird/91.5.1
Subject: Re: linux-next: manual merge of the usb tree with the xilinx tree
Content-Language: en-US
To:     Greg KH <greg@kroah.com>, Stephen Rothwell <sfr@canb.auug.org.au>
CC:     Michal Simek <monstr@monstr.eu>, David Heidelberg <david@ixit.cz>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Michal Simek <michal.simek@xilinx.com>,
        Sean Anderson <sean.anderson@seco.com>
References: <20220210141550.56359523@canb.auug.org.au>
 <YgTGdwkTkDgx+pan@kroah.com>
From:   Michal Simek <michal.simek@xilinx.com>
In-Reply-To: <YgTGdwkTkDgx+pan@kroah.com>
Content-Type: text/plain; charset="UTF-8"; format=flowed
Content-Transfer-Encoding: 7bit
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Feb 2022 12:24:47.8653
 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: 45986a11-cf96-4159-47f2-08d9ec905410
X-MS-Exchange-CrossTenant-Id: 657af505-d5df-48d0-8300-c31994686c5c
X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=657af505-d5df-48d0-8300-c31994686c5c;Ip=[149.199.62.198];Helo=[xsj-pvapexch01.xlnx.xilinx.com]
X-MS-Exchange-CrossTenant-AuthSource: SN1NAM02FT0058.eop-nam02.prod.protection.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Anonymous
X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR02MB6823
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,NICE_REPLY_A,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,
        SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


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