From: Michal Simek <michal.simek@xilinx•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>, Greg KH <greg@kroah•com>,
Olof Johansson <olof@lixom•net>, Arnd Bergmann <arnd@arndb•de>
Cc: Michal Simek <michal.simek@xilinx•com>,
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>,
Sean Anderson <sean.anderson@seco•com>,
ARM <linux-arm-kernel@lists•infradead.org>
Subject: Re: linux-next: manual merge of the usb tree with the xilinx tree
Date: Fri, 18 Mar 2022 08:59:50 +0100 [thread overview]
Message-ID: <cccec2d0-6718-0bad-728b-ae473bbce953@xilinx.com> (raw)
In-Reply-To: <20220318183915.08544653@canb.auug.org.au>
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
next prev parent reply other threads:[~2022-03-18 8:00 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-10 3:15 linux-next: manual merge of the usb tree with the xilinx tree 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:59 ` Michal Simek [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-02-21 19:21 broonie
2022-02-22 7:37 ` Michal Simek
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=cccec2d0-6718-0bad-728b-ae473bbce953@xilinx.com \
--to=michal.simek@xilinx$(echo .)com \
--cc=arnd@arndb$(echo .)de \
--cc=david@ixit$(echo .)cz \
--cc=greg@kroah$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=monstr@monstr$(echo .)eu \
--cc=olof@lixom$(echo .)net \
--cc=sean.anderson@seco$(echo .)com \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox