Messages in this thread | | | Date | Thu, 20 Apr 2017 11:23:35 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the crypto tree with the arm-soc tree |
| |
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";
| |