Messages in this thread | | | Date | Thu, 8 Mar 2018 08:12:15 +0000 | From | Lee Jones <> | Subject | Re: linux-next: manual merge of the mfd tree with Linus' tree |
| |
On Thu, 08 Mar 2018, Stephen Rothwell wrote:
> Hi Lee, > > Today's linux-next merge of the mfd tree got a conflict in: > > drivers/mfd/syscon.c > > between commit: > > 3bafc09e7797 ("mfd: syscon: Add hardware spinlock support") > > from Linus' tree and commit: > > 34c90dcce6b1 ("mfd: syscon: Set regmap name to DT node name") > > 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.
Now fixed in my tree. You may withdraw your patch.
Thanks Stephen.
-- Lee Jones Linaro Services Technical Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog
| |