Stephen Rothwell [off-list ref] writes:

Hi all,

Today's linux-next merge of the powerpc tree got a conflict in:

  arch/powerpc/include/asm/cputable.h
  arch/powerpc/kernel/dt_cpu_ftrs.c

between commit:

  a5d4b5891c2f ("powerpc/mm: Fixup tlbie vs store ordering issue on POWER9")

from the powerpc-fixes tree and commits:

  9bbf0b576d32 ("powerpc: Free up CPU feature bits on 64-bit machines")
  b5af4f279323 ("powerpc: Add CPU feature bits for TM bug workarounds on POWER9 v2.2")

from the powerpc tree.

Thanks, yeah that was a bit of disaster.

I'll merge fixes into next before sending to Linus.

cheers