lkml.org 
[lkml]   [2018]   [Mar]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: 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

\
 
 \ /
  Last update: 2018-03-08 09:12    [W:0.027 / U:2.252 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site