Hi all,
Today's linux-next merge of the arc-current tree got a conflict in:
arch/arc/mm/fault.c
between commit:
d8d7d842e828 ("arch/arc/mm/fault.c: remove caller signal_pending_branch
predictions")
from Linus' tree and commit:
ce3e02e8be58 ("ARC: mm: do_page_fault fixes #1: relinquish
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:
>
>
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")
fr
3 matches
Mail list logo