All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andy Gross <agross@kernel.org>, Olof Johansson <olof@lixom.net>,
	Arnd Bergmann <arnd@arndb.de>
Cc: ARM <linux-arm-kernel@lists.infradead.org>,
	"Bjorn Andersson" <andersson@kernel.org>,
	"Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>,
	"Linux Next Mailing List" <linux-next@vger.kernel.org>,
	"Luca Weiss" <luca@z3ntu.xyz>,
	"Matti Lehtimäki" <matti.lehtimaki@gmail.com>
Subject: linux-next: manual merge of the qcom tree with the arm-soc tree
Date: Mon, 4 Dec 2023 10:08:48 +1100	[thread overview]
Message-ID: <20231204100848.141cfd29@canb.auug.org.au> (raw)

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

Hi all,

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

  arch/arm/boot/dts/qcom/qcom-msm8974.dtsi

between commit:

  4960e06d386e ("ARM: dts: qcom: msm8974: sort nodes by reg")

from the arm-soc tree and commit:

  95053f6bc8ff ("ARM: dts: qcom: msm8974: Add watchdog node")

from the qcom 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/qcom/qcom-msm8974.dtsi
index 76006c3c4af2,f7d7e5d70f30..000000000000
--- a/arch/arm/boot/dts/qcom/qcom-msm8974.dtsi
+++ b/arch/arm/boot/dts/qcom/qcom-msm8974.dtsi
@@@ -346,12 -346,14 +346,20 @@@
  			reg = <0xf9011000 0x1000>;
  		};
  
 +		saw_l2: power-controller@f9012000 {
 +			compatible = "qcom,saw2";
 +			reg = <0xf9012000 0x1000>;
 +			regulator;
 +		};
 +
+ 		watchdog@f9017000 {
+ 			compatible = "qcom,apss-wdt-msm8974", "qcom,kpss-wdt";
+ 			reg = <0xf9017000 0x1000>;
+ 			interrupts = <GIC_SPI 3 IRQ_TYPE_EDGE_RISING>,
+ 				     <GIC_SPI 4 IRQ_TYPE_EDGE_RISING>;
+ 			clocks = <&sleep_clk>;
+ 		};
+ 
  		timer@f9020000 {
  			#address-cells = <1>;
  			#size-cells = <1>;

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

WARNING: multiple messages have this Message-ID (diff)
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andy Gross <agross@kernel.org>, Olof Johansson <olof@lixom.net>,
	Arnd Bergmann <arnd@arndb.de>
Cc: ARM <linux-arm-kernel@lists.infradead.org>,
	"Bjorn Andersson" <andersson@kernel.org>,
	"Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>,
	"Linux Next Mailing List" <linux-next@vger.kernel.org>,
	"Luca Weiss" <luca@z3ntu.xyz>,
	"Matti Lehtimäki" <matti.lehtimaki@gmail.com>
Subject: linux-next: manual merge of the qcom tree with the arm-soc tree
Date: Mon, 4 Dec 2023 10:08:48 +1100	[thread overview]
Message-ID: <20231204100848.141cfd29@canb.auug.org.au> (raw)


[-- Attachment #1.1: Type: text/plain, Size: 1483 bytes --]

Hi all,

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

  arch/arm/boot/dts/qcom/qcom-msm8974.dtsi

between commit:

  4960e06d386e ("ARM: dts: qcom: msm8974: sort nodes by reg")

from the arm-soc tree and commit:

  95053f6bc8ff ("ARM: dts: qcom: msm8974: Add watchdog node")

from the qcom 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/qcom/qcom-msm8974.dtsi
index 76006c3c4af2,f7d7e5d70f30..000000000000
--- a/arch/arm/boot/dts/qcom/qcom-msm8974.dtsi
+++ b/arch/arm/boot/dts/qcom/qcom-msm8974.dtsi
@@@ -346,12 -346,14 +346,20 @@@
  			reg = <0xf9011000 0x1000>;
  		};
  
 +		saw_l2: power-controller@f9012000 {
 +			compatible = "qcom,saw2";
 +			reg = <0xf9012000 0x1000>;
 +			regulator;
 +		};
 +
+ 		watchdog@f9017000 {
+ 			compatible = "qcom,apss-wdt-msm8974", "qcom,kpss-wdt";
+ 			reg = <0xf9017000 0x1000>;
+ 			interrupts = <GIC_SPI 3 IRQ_TYPE_EDGE_RISING>,
+ 				     <GIC_SPI 4 IRQ_TYPE_EDGE_RISING>;
+ 			clocks = <&sleep_clk>;
+ 		};
+ 
  		timer@f9020000 {
  			#address-cells = <1>;
  			#size-cells = <1>;

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

[-- Attachment #2: Type: text/plain, Size: 176 bytes --]

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

             reply	other threads:[~2023-12-03 23:16 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-12-03 23:08 Stephen Rothwell [this message]
2023-12-03 23:08 ` linux-next: manual merge of the qcom tree with the arm-soc tree Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2023-12-03 23:03 Stephen Rothwell
2023-12-03 23:03 ` Stephen Rothwell
2019-11-04 22:39 Stephen Rothwell
2019-11-04 22:39 ` Stephen Rothwell
2015-10-11 23:19 Stephen Rothwell
2015-10-11 23:19 ` Stephen Rothwell
2015-10-11 23:19 ` Stephen Rothwell
2015-10-12 16:29 ` Andy Gross
2015-10-12 16:29   ` Andy Gross

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=20231204100848.141cfd29@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=agross@kernel.org \
    --cc=andersson@kernel.org \
    --cc=arnd@arndb.de \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=luca@z3ntu.xyz \
    --cc=matti.lehtimaki@gmail.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
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.