Messages in this thread | | | Date | Wed, 3 Jun 2020 12:02:15 +1000 | From | Stephen Rothwell <> | Subject | Re: linux-next: manual merge of the rcu tree with the powerpc tree |
| |
Hi all,
On Tue, 19 May 2020 17:23:16 +1000 Stephen Rothwell <sfr@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 [unhandled content-type:application/pgp-signature] | |