Messages in this thread | | | Date | Tue, 28 Jan 2020 07:39:01 +0000 | From | Lee Jones <> | Subject | Re: linux-next: manual merge of the mfd tree with the regulator-fixes tree |
| |
On Tue, 28 Jan 2020, Stephen Rothwell wrote:
> Hi all, > > Today's linux-next merge of the mfd tree got a conflict in: > > drivers/regulator/bd718x7-regulator.c > > between commit: > > b389ceae4a8f ("regulator: bd718x7: Simplify the code by removing struct bd718xx_pmic_inits") > > from the regulator-fixes tree and commit: > > 1b1c26b24a6e ("mfd: Rohm PMICs: Use platform_device_id to match MFD sub-devices") > > 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.
A pull-request was sent out to avoid this.
If Mark pulls it, this should just go away.
-- Lee Jones [李琼斯] Linaro Services Technical Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog
| |