Re: linux-next: manual merge of the arc-current tree with Linus' tree

[Vineet Gupta]

On 08/14/2018 03:11 PM, Stephen Rothwell wrote:
> Hi Vineet,
>
> Today's linux-next merge of the arc-current tree got a conflict in:
>
>   arch/arc/include/asm/atomic.h
>
> between commit:
>
>   ab0b910490fe ("atomics/arc: Define atomic64_fetch_add_unless()")
>
> from Linus' tree and commit:
>
>   39456148db74 ("ARC: atomic64: fix atomic64_add_unless function")
>
> from the arc-current tree.
>
> I fixed it up (I just used the version from Linus' tree for now) 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.

Thx for the report Stephen. I've dropped my patch for now, let the dust settle and
then we can add it.

Thx,
-Vineet