From: Michael Ellerman <mpe@ellerman•id.au>
To: Stephen Rothwell <sfr@canb•auug.org.au>,
Paul Mackerras <paulus@ozlabs•org>,
Benjamin Herrenschmidt <benh@kernel•crashing.org>,
PowerPC <linuxppc-dev@lists•ozlabs.org>
Cc: Alistair Popple <alistair@popple•id.au>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org
Subject: Re: linux-next: manual merge of the kvm-ppc tree with the powerpc tree
Date: Thu, 09 Feb 2017 22:38:06 +1100 [thread overview]
Message-ID: <87shnn8uht.fsf@concordia.ellerman.id.au> (raw)
In-Reply-To: <20170209143701.4e37c1be@canb.auug.org.au>
Stephen Rothwell <sfr@canb•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
next prev parent reply other threads:[~2017-02-09 11:38 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-09 3:37 linux-next: manual merge of the kvm-ppc tree with the powerpc tree Stephen Rothwell
2017-02-09 11:38 ` Michael Ellerman [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-07-12 3:57 Stephen Rothwell
2012-07-12 5:56 ` Alexander Graf
2012-07-12 6:23 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87shnn8uht.fsf@concordia.ellerman.id.au \
--to=mpe@ellerman$(echo .)id.au \
--cc=alistair@popple$(echo .)id.au \
--cc=benh@kernel$(echo .)crashing.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linuxppc-dev@lists$(echo .)ozlabs.org \
--cc=paulus@ozlabs$(echo .)org \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox