On Mon, Sep 17, 2012 at 6:40 PM, Mark Brown <broo...@opensource.wolfsonmicro.com> wrote: > On Mon, Sep 17, 2012 at 06:28:18PM +0800, Haojian Zhuang wrote: > >> Could this patch be merged into MFD tree? Since the fourth patch in this >> patch series is depend on this one. > > Why is there a dependency? > -- This patch is picked from Jett's patch on power device of 88pm860x. His patch addes the support of PREG regulator in 88pm8607 regulator driver. Although this patch was submitted for a long time, it wasn't merged yet.
And I have a patch series on updating 88pm860x driver with IORESOURCE_REG. One patch in that series is used to split regulator subdevs into an array of regulator subdevs. It results in 88pm860x regulator driver updated and merged into MFD for-next branch. Since both Jett's patch and my patch updates code in probe() function of 88pm860x regulator driver, some code between these two patches conflicts. So I make the fourth patch in current series to resolve this conflict on MFD for-next branch. If you agree on merging this patch series into MFD tree without your Ack, it would be simple way. Or I could rebase it and split them into two different patch series for MFD and regulator tree. Which way do you like? Best Regards Haojian -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
