RE: linux-next: manual merge of the samsung tree with the pinctrl tree

Stephen Rothwell wrote: > > Hi Kukjin, > Hi, > Today's linux-next merge of the samsung tree got a conflict in > arch/arm/boot/dts/exynos4210.dtsi between commit a7a8241540c3 ("ARM: dts: > exynos4210-pinctrl: Add nodes for pin banks") from the pinctrl tree and > commit 8d4155dbb184 ("ARM: EXYNOS:

linux-next: manual merge of the samsung tree with the pinctrl tree

Hi Kukjin, Today's linux-next merge of the samsung tree got a conflict in arch/arm/boot/dts/exynos4210.dtsi between commit a7a8241540c3 ("ARM: dts: exynos4210-pinctrl: Add nodes for pin banks") from the pinctrl tree and commit 8d4155dbb184 ("ARM: EXYNOS: Add devicetree node for TMU driver for exyn