linux-kernel - Re: linux-next: manual merge of the powerpc tree with the powerpc-fixes tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:   Tue, 27 Mar 2018 15:52:41 +1100
From:   Michael Ellerman <mpe@...erman.id.au>
To:     Stephen Rothwell <sfr@...b.auug.org.au>,
        Benjamin Herrenschmidt <benh@...nel.crashing.org>,
        PowerPC <linuxppc-dev@...ts.ozlabs.org>
Cc:     Linux-Next Mailing List <linux-next@...r.kernel.org>,
        "Linux Kernel Mailing List" <linux-kernel@...r.kernel.org>,
        "Aneesh Kumar K.V" <aneesh.kumar@...ux.vnet.ibm.com>,
        Paul Mackerras <paulus@...abs.org>
Subject: Re: linux-next: manual merge of the powerpc tree with the powerpc-fixes tree

Stephen Rothwell <sfr@...b.auug.org.au> 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