Hi aa,
On Wed, 25 Nov 2020 17:38:24 +1100 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the seccomp tree got a conflict in:
>
> arch/csky/include/asm/Kbuild
>
> between commit:
>
> fed76f8679a6 ("csky: Add QUEUED_SPINLOCKS supported")
>
> from the csky tree and commit:
>
> 6
Hi all,
Today's linux-next merge of the seccomp tree got a conflict in:
arch/csky/include/asm/Kbuild
between commit:
fed76f8679a6 ("csky: Add QUEUED_SPINLOCKS supported")
from the csky tree and commit:
6e9ae6f98809 ("csky: Enable seccomp architecture tracking")
from the seccomp tree.
2 matches
Mail list logo