Re: 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:
>
> drivers/vfio/vfio_iommu_spapr_tce.c
>
> between commit:
>
> 1463edca6734 ("vfio/spapr: Use IOMMU pageshift rather than pagesize")
>
> from the powerpc-fixes tree and commit:
>
> 00a5c58d9499 ("KVM: PPC: Make iommu_table::it_userspace big endian")
>
> from the powerpc tree.
Thanks.
That has turned into a real mess, with conflicting code in next, fixes
and topic/ppc-kvm.
I'll fix it all up before the merge window.
cheers
Re: 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/ftrace.h
>
> between commit:
>
> edf6a2dfe388 ("powerpc/trace/syscalls: Update syscall name matching logic
> to account for ppc_ prefix")
>
> from the powerpc-fixes tree and commit:
>
> c3e59d778403 ("powerpc64/ftrace: Rearrange #ifdef sections in ftrace.h")
>
> from the powerpc tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
> Michael, I think the version in your merge branch is not quite right ...
Yep.
Don't do merges after midnight kids.
I've pushed a fixed version, which I think matches yours.
I'll resolve it in my next when I merge my fixes & next later in the
cycle.
cheers
Re: 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.
cheers
Re: 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/kernel/setup-common.c
>
> between commit:
>
> 349524bc0da6 ("powerpc: Don't preempt_disable() in show_cpuinfo()")
>
> from the powerpc-fixes tree and commit:
>
> f5f563012a70 ("powerpc: Make newline in cpuinfo unconditional")
>
> from the powerpc tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
Nah that guy is a jerk.
Thanks for the report.
cheers
Re: 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/asm-prototypes.h
>
> between commit:
>
> 9e5f68842276 ("powerpc: Fix missing CRCs, add more asm-prototypes.h
> declarations")
>
> from the powerpc-fixes tree and commit:
>
> 82de5797a260 ("powerpc: Remove extraneous header from asm-prototypes.h")
>
> from the powerpc tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
Thanks. I'm planning to merge fixes into next RSN ... as soon as people
stop finding bugs.
cheers
