Re: linux-next: manual merge of the arm-soc tree with the spi-mb tree

From: Richard Genoud
Date: Fri Apr 26 2013 - 03:22:04 EST

2013/4/26 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>:
> Hi all,
> Today's linux-next merge of the arm-soc tree got a conflict in
> arch/arm/boot/dts/at91sam9x5.dtsi between commits d50f88a0c304 ("ARM:
> dts: add spi nodes for atmel SoC") and a68b728f7a21 ("ARM: dts: add
> pinctrl property for spi node for atmel SoC") from the spi-mb tree and
> commits e9a72ee81d58 ("ARM: at91: dt: at91sam9x5: add i2c pinctrl"),
> 463c9c7bf1f3 ("ARM: at91: dt: at91sam9x5: add i2c-gpio pinctrl") and
> b909c6c94462 ("ARM: at91/at91sam9x5: add RTC node") from the arm-soc tree.
> I fixed it up (hopefully - see below) and can carry the fix as necessary
> (no action is required).


It's all ok for me !


To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at
Please read the FAQ at