Hi all,
On Tue, 19 May 2020 17:23:16 +1000 Stephen Rothwell <s...@canb.auug.org.au>
wrote:
>
> Hi all,
>
> Today's linux-next merge of the rcu tree got a conflict in:
>
> arch/powerpc/kernel/traps.c
>
> between commit:
>
> 116ac378bb3f ("powerpc/64s: machine check interrupt update NMI accounting")
>
> from the powerpc tree and commit:
>
> 187416eeb388 ("hardirq/nmi: Allow nested nmi_enter()")
>
> from the rcu tree.
This is now a conflict between commit
69ea03b56ed2 ("hardirq/nmi: Allow nested nmi_enter()")
From Linus tree and the above powerpc tree commit.
--
Cheers,
Stephen Rothwell
pgpqOJyreOK_g.pgp
Description: OpenPGP digital signature
