Messages in this thread | | | Subject | Re: linux-next: manual merge of the mfd tree with Linus' tree | From | Jarkko Nikula <> | Date | Fri, 8 Feb 2019 10:33:01 +0200 |
| |
On 2/8/19 4:37 AM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the mfd tree got a conflict in: > > drivers/mfd/Kconfig > > between commit: > > 9baddb61dfec ("mfd: Fix unmet dependency warning for MFD_TPS68470") > > from Linus' tree and commit: > > 09fdc9857712 ("mfd: Kconfig: Fix I2C_DESIGNWARE_PLATFORM dependencies") > > from the mfd tree. > > I fixed it up (see below) and can carry the fix as necessary. This > is now fixed as far as linux-next is concerned, but any non trivial > conflicts should be mentioned to your upstream maintainer when your tree > is submitted for merging. You may also want to consider cooperating > with the maintainer of the conflicting tree to minimise any particularly > complex conflicts. > Thanks, that's is the right fix for the conflict.
-- Jarkko
| |