On Wednesday, August 26, 2015 02:53:39 PM Pi-Cheng Chen wrote: > On Wed, Aug 26, 2015 at 10:16 AM, Viresh Kumar <viresh.kumar@xxxxxxxxxx> wrote: > > On 26-08-15, 09:25, Pi-Cheng Chen wrote: > >> The [3/3] is based on Mediatek SoC maintainer tree[1] and the patch which > >> introduce a new clock type[2] consumed by MT8173 cpufreq driver. So it will > >> cause some conflicts if it goes through your tree. I am not sure how this > >> should be handled, but should it be merged through Mediatek SoC maintainer > >> tree? > > > > Just get that applied to MTK tree, it doesn't have any dependency on > > rest of the patches for build/boot. The only thing is that cpufreq > > wouldn't work and it will work as soon as Rafael's and MTK's trees are > > merged by Linus. > > Thanks for your explanation. > > @Rafael, Would you please apply [1,2] to your tree? Applied, thanks! -- I speak only for myself. Rafael J. Wysocki, Intel Open Source Technology Center. -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html