[lkml]   [2018]   [Mar]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
SubjectRe: linux-next: manual merge of the powerpc tree with the powerpc-fixes tree
Stephen Rothwell <> 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.


 \ /
  Last update: 2018-03-27 06:53    [W:0.053 / U:0.736 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site