* Mike Turquette <mturque...@linaro.org> [140114 19:52]: > > > > These 40 patches apply very cleanly on top of clk-next with 2 > > exceptions: > > > > 1) I did not apply "[PATCH 30/42] ARM: dts: AM35xx: use DT clock data" > > because I do not have arch/arm/boot/dts/am3517.dtsi in clk-next (based > > on 3.13-rc1). > > > > 2) Minor merge conflict in arch/arm/boot/dts/omap3.dtsi which I think I > > resolved correctly but would like verification. > > > > I'd prefer to simply merge these patches into clk-next, which is the > > most straightforward route. Any ideas on how to handle the missing > > AM35xx dtsi data? It can always go as a separate fix after this stuff > > gets merged which, ironically, is how that file was created in the first > > place.
You could do something like this to take advantage of fast forward and not have to do a merge back from mainline: $ git checkout -b am3517-clk v3.13-rc8 # or any other -rc with am3517.dtsi $ git merge clk-next-omap # this fast forwards clk-next-omap to the desired -rc $ git am am3517-clk-patch $ git checkout clk-next $ git merge clk-next-omap # this fast forwards clk-next to the desired -rc Regards, Tony -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
