Linux-Next Archive on lore.kernel.org
 help / color / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Marc Zyngier <marc.zyngier@arm.com>,
	Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
	ARM <linux-arm-kernel@lists.infradead.org>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Ludovic Barre <ludovic.barre@st.com>,
	Amelie Delaunay <amelie.delaunay@st.com>,
	Alexandre Torgue <alexandre.torgue@st.com>
Subject: linux-next: manual merge of the irqchip tree with the arm-soc tree
Date: Tue, 29 May 2018 15:52:57 +1000
Message-ID: <20180529155257.5ae48830@canb.auug.org.au> (raw)


[-- Attachment #1: Type: text/plain, Size: 1743 bytes --]

Hi all,

Today's linux-next merge of the irqchip tree got a conflict in:

  arch/arm/boot/dts/stm32mp157c.dtsi

between commit:

  3c00436fdb20 ("ARM: dts: stm32: add USBPHYC support to stm32mp157c")

from the arm-soc tree and commit:

  5f0e9d2557d7 ("ARM: dts: stm32: Add exti support for stm32mp157c")

from the irqchip 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.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/arm/boot/dts/stm32mp157c.dtsi
index b66f673b5038,4fa0df853c8a..000000000000
--- a/arch/arm/boot/dts/stm32mp157c.dtsi
+++ b/arch/arm/boot/dts/stm32mp157c.dtsi
@@@ -777,26 -183,13 +777,33 @@@
  			status = "disabled";
  		};
  
 +		usbphyc: usbphyc@5a006000 {
 +			#address-cells = <1>;
 +			#size-cells = <0>;
 +			compatible = "st,stm32mp1-usbphyc";
 +			reg = <0x5a006000 0x1000>;
 +			clocks = <&rcc USBPHY_K>;
 +			resets = <&rcc USBPHY_R>;
 +			status = "disabled";
 +
 +			usbphyc_port0: usb-phy@0 {
 +				#phy-cells = <0>;
 +				reg = <0>;
 +			};
 +
 +			usbphyc_port1: usb-phy@1 {
 +				#phy-cells = <1>;
 +				reg = <1>;
 +			};
 +		};
 +
+ 		exti: interrupt-controller@5000d000 {
+ 			compatible = "st,stm32mp1-exti", "syscon";
+ 			interrupt-controller;
+ 			#interrupt-cells = <2>;
+ 			reg = <0x5000d000 0x400>;
+ 		};
+ 
  		usart1: serial@5c000000 {
  			compatible = "st,stm32h7-uart";
  			reg = <0x5c000000 0x400>;

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

             reply index

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-05-29  5:52 Stephen Rothwell [this message]
2018-05-29  7:41 ` Alexandre Torgue
2018-05-29  7:47   ` Marc Zyngier
2018-05-29  8:16     ` Alexandre Torgue
2018-05-29  8:39       ` Marc Zyngier
2018-05-29  8:55         ` Alexandre Torgue
2018-05-29 12:20           ` Ludovic BARRE
2018-05-30  5:10             ` Olof Johansson
  -- strict thread matches above, loose matches on Subject: below --
2021-04-23  3:22 Stephen Rothwell
2021-04-09  5:52 Stephen Rothwell
2014-07-29  5:53 Stephen Rothwell

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=20180529155257.5ae48830@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=alexandre.torgue@st.com \
    --cc=amelie.delaunay@st.com \
    --cc=arnd@arndb.de \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=ludovic.barre@st.com \
    --cc=marc.zyngier@arm.com \
    --cc=olof@lixom.net \
    /path/to/YOUR_REPLY

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

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Linux-Next Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-next/0 linux-next/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-next linux-next/ https://lore.kernel.org/linux-next \
		linux-next@vger.kernel.org
	public-inbox-index linux-next

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-next


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git