linux-kernel - Re: linux-next: manual merge of the kvm-ppc tree with the powerpc 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]

Message-ID: <87shnn8uht.fsf@concordia.ellerman.id.au>
Date:   Thu, 09 Feb 2017 22:38:06 +1100
From:   Michael Ellerman <mpe@...erman.id.au>
To:     Stephen Rothwell <sfr@...b.auug.org.au>,
        Paul Mackerras <paulus@...abs.org>,
        Benjamin Herrenschmidt <benh@...nel.crashing.org>,
        PowerPC <linuxppc-dev@...ts.ozlabs.org>
Cc:     linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
        Alistair Popple <alistair@...ple.id.au>
Subject: Re: linux-next: manual merge of the kvm-ppc tree with the powerpc tree

Stephen Rothwell <sfr@...b.auug.org.au> writes:

> Hi Paul,
>
> Today's linux-next merge of the kvm-ppc tree got conflicts in:
>
>   arch/powerpc/include/asm/opal.h
>   arch/powerpc/platforms/powernv/opal-wrappers.S
>
> between commit:
>
>   1d0761d2557d ("powerpc/powernv: Initialise nest mmu")
>
> from the powerpc tree and commit:
>
>   ab9bad0ead9a ("powerpc/powernv: Remove separate entry for OPAL real mode calls")
>
> from the kvm-ppc tree.

Thanks.

This will go away when I merge the ppc-kvm topic branch.

cheers