public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed

From: Michal Simek <michal.simek@xilinx•com>
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>
Subject: Re: linux-next: manual merge of the usb tree with the xilinx tree
Date: Tue, 22 Feb 2022 08:37:06 +0100	[thread overview]
Message-ID: <14cb5cd9-c1c5-bdc7-f0e3-e2b224bc26ff@xilinx.com> (raw)
In-Reply-To: <20220221192143.1661784-1-broonie@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

next prev parent reply	other threads:[~2022-02-22  7:46 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
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 [this message]
  -- 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:59       ` 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=14cb5cd9-c1c5-bdc7-f0e3-e2b224bc26ff@xilinx.com \
    --to=michal.simek@xilinx$(echo .)com \
    --cc=broonie@kernel$(echo .)org \
    --cc=david@ixit$(echo .)cz \
    --cc=greg@kroah$(echo .)com \
    --cc=gregkh@linuxfoundation$(echo .)org \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=sean.anderson@seco$(echo .)com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox