linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* linux-next: manual merge of the crypto tree with the arm-soc tree
@ 2017-04-20  1:23 Stephen Rothwell
  0 siblings, 0 replies; 5+ messages in thread
From: Stephen Rothwell @ 2017-04-20  1:23 UTC (permalink / raw)
  To: Herbert Xu, Olof Johansson, Arnd Bergmann, ARM
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List,
	Amelie Delaunay, Alexandre TORGUE, Fabien DESSENNE

Hi all,

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

  arch/arm/boot/dts/stm32746g-eval.dts

between commit:

  4cc627472cd6 ("ARM: dts: stm32: enable RTC on stm32746g-eval")

from the arm-soc tree and commit:

  2e3db2931875 ("ARM: dts: stm32: enable CRC on stm32746g-eval board")

from the crypto 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/stm32746g-eval.dts
index b5207588bdcb,0dc18a0f0940..000000000000
--- a/arch/arm/boot/dts/stm32746g-eval.dts
+++ b/arch/arm/boot/dts/stm32746g-eval.dts
@@@ -89,10 -89,10 +89,14 @@@
  	clock-frequency = <25000000>;
  };
  
+ &crc {
+ 	status = "okay";
+ };
+ 
 +&rtc {
 +	status = "okay";
 +};
 +
  &usart1 {
  	pinctrl-0 = <&usart1_pins_a>;
  	pinctrl-names = "default";

^ permalink raw reply	[flat|nested] 5+ messages in thread
* linux-next: manual merge of the crypto tree with the arm-soc tree
@ 2019-09-15 20:55 Mark Brown
  0 siblings, 0 replies; 5+ messages in thread
From: Mark Brown @ 2019-09-15 20:55 UTC (permalink / raw)
  To: Guido Günther, Angus Ainslie, Shawn Guo, Li Yang,
	Horia Geantă,
	Andrey Smirnov, arm, soc, Herbert Xu, Linux Crypto List
  Cc: linux-arm-kernel@lists.infradead.org Linux Next Mailing List,
	Linux Kernel Mailing List

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

Hi all,

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

  arch/arm64/boot/dts/freescale/imx8mq.dtsi

between commit:

  a99b26b14bea506 ("arm64: dts: imx8mq: Add MIPI D-PHY")

from the arm-soc tree and commit:

  007b3cf0af8cb7d ("arm64: dts: imx8mq: Add CAAM node")

from the crypto 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 (generally DTS updates go through arm-soc).

diff --cc arch/arm64/boot/dts/freescale/imx8mq.dtsi
index 046a0c8c8dd56,752d5a61878cb..0000000000000
--- a/arch/arm64/boot/dts/freescale/imx8mq.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8mq.dtsi
@@@ -743,19 -728,36 +743,49 @@@
  				status = "disabled";
  			};
  
 +			dphy: dphy@30a00300 {
 +				compatible = "fsl,imx8mq-mipi-dphy";
 +				reg = <0x30a00300 0x100>;
 +				clocks = <&clk IMX8MQ_CLK_DSI_PHY_REF>;
 +				clock-names = "phy_ref";
 +				assigned-clocks = <&clk IMX8MQ_CLK_DSI_PHY_REF>;
 +				assigned-clock-parents = <&clk IMX8MQ_VIDEO_PLL1_OUT>;
 +				assigned-clock-rates = <24000000>;
 +				#phy-cells = <0>;
 +				power-domains = <&pgc_mipi>;
 +				status = "disabled";
 +			};
 +
+ 			crypto: crypto@30900000 {
+ 				compatible = "fsl,sec-v4.0";
+ 				#address-cells = <1>;
+ 				#size-cells = <1>;
+ 				reg = <0x30900000 0x40000>;
+ 				ranges = <0 0x30900000 0x40000>;
+ 				interrupts = <GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>;
+ 				clocks = <&clk IMX8MQ_CLK_AHB>,
+ 					 <&clk IMX8MQ_CLK_IPG_ROOT>;
+ 				clock-names = "aclk", "ipg";
+ 
+ 				sec_jr0: jr@1000 {
+ 					compatible = "fsl,sec-v4.0-job-ring";
+ 					reg = <0x1000 0x1000>;
+ 					interrupts = <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>;
+ 				};
+ 
+ 				sec_jr1: jr@2000 {
+ 					compatible = "fsl,sec-v4.0-job-ring";
+ 					reg = <0x2000 0x1000>;
+ 					interrupts = <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>;
+ 				};
+ 
+ 				sec_jr2: jr@3000 {
+ 					compatible = "fsl,sec-v4.0-job-ring";
+ 					reg = <0x3000 0x1000>;
+ 					interrupts = <GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH>;
+ 				};
+ 			};
+ 
  			i2c1: i2c@30a20000 {
  				compatible = "fsl,imx8mq-i2c", "fsl,imx21-i2c";
  				reg = <0x30a20000 0x10000>;

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

^ permalink raw reply	[flat|nested] 5+ messages in thread
* linux-next: manual merge of the crypto tree with the arm-soc tree
@ 2014-02-26  4:01 Stephen Rothwell
  2014-02-26 19:15 ` Kumar Gala
  0 siblings, 1 reply; 5+ messages in thread
From: Stephen Rothwell @ 2014-02-26  4:01 UTC (permalink / raw)
  To: Herbert Xu, Olof Johansson, Arnd Bergmann, linux-arm-kernel
  Cc: linux-next, linux-kernel, Kumar Gala

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

Hi Herbert,

Today's linux-next merge of the crypto tree got a conflict in
drivers/char/hw_random/Kconfig between commit 2257ffbca73c ("hwrng: msm:
switch Kconfig to ARCH_QCOM depends") from the arm-soc tree and commit
f9bee046c915 ("hwrng: msm: switch Kconfig to ARCH_QCOM depends") from the
crypto tree.

Two version of the same patch ... I just kept the arm-soc version.

-- 
Cheers,
Stephen Rothwell <sfr@canb.auug.org.au>

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2019-09-15 20:55 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-04-20  1:23 linux-next: manual merge of the crypto tree with the arm-soc tree Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2019-09-15 20:55 Mark Brown
2014-02-26  4:01 Stephen Rothwell
2014-02-26 19:15 ` Kumar Gala
2014-02-26 21:58   ` Herbert Xu

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).