On Sun, Jan 5, 2014 at 3:49 PM, Stephen Rothwell <[email protected]> wrote: > Hi Shawn, > > Today's linux-next merge of the imx-mxs tree got a conflict in > arch/arm/boot/dts/imx6q-sabrelite.dts between commit 8f568b496dd9 ("ARM: > imx: Explicitly pass the active level of the PHY reset") from the arm-soc > tree and commit e5a5af250568 ("ARM: dts: imx: sabrelite: add Dual > Lite/Solo support") from the imx-mxs tree. > > I fixed it up (just used the latter) and can carry the fix as necessary > (no action is required).
Thanks Stephen. The offending patch from the arm-soc side has been dropped, but I didn't push out the new for-next yet. It should be gone tomorrow. Same for some of the other imx conflicts. -Olof -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
