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: broonie@kernel.org,
 greg@kroah.com,
 david@ixit.cz,
 gregkh@linuxfoundation.org,
 linux-kernel@vger.kernel.org,
 linux-next@vger.kernel.org,
 sean.anderson@seco.com
Message-ID: <14cb5cd9-c1c5-bdc7-f0e3-e2b224bc26ff@xilinx.com>
Date:   Tue, 22 Feb 2022 08:37:06 +0100
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101
 Thunderbird/91.6.1
Subject: Re: linux-next: manual merge of the usb tree with the xilinx tree
Content-Language: en-US
To:     <broonie@kernel.org>, Greg KH <greg@kroah.com>
CC:     David Heidelberg <david@ixit.cz>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        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: <20220221192143.1661784-1-broonie@kernel.org>
From:   Michal Simek <michal.simek@xilinx.com>
In-Reply-To: <20220221192143.1661784-1-broonie@kernel.org>
Content-Type: text/plain; charset="UTF-8"; format=flowed
Content-Transfer-Encoding: 7bit
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Feb 2022 07:37:11.1810
 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: 3f1df173-4450-429b-38ea-08d9f5d6233c
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: SN1NAM02FT0053.eop-nam02.prod.protection.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Anonymous
X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR02MB3238
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

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