From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Paul Mackerras <paulus@ozlabs•org>,
Michael Ellerman <mpe@ellerman•id.au>,
Benjamin Herrenschmidt <benh@kernel•crashing.org>,
linuxppc-dev@lists•ozlabs.org
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Mahesh Salgaonkar <mahesh@linux•vnet.ibm.com>,
Daniel Axtens <dja@axtens•net>
Subject: linux-next: manual merge of the kvm-ppc-paulus tree with the powerpc tree
Date: Mon, 27 Jun 2016 14:23:52 +1000 [thread overview]
Message-ID: <20160627142352.2c1ae65b@canb.auug.org.au> (raw)
Hi Paul,
Today's linux-next merge of the kvm-ppc-paulus tree got a conflict in:
arch/powerpc/kernel/traps.c
between commit:
42f5b4cacd78 ("powerpc: Introduce asm-prototypes.h")
from the powerpc tree and commit:
fd7bacbca47a ("KVM: PPC: Book3S HV: Fix TB corruption in guest exit path on HMI interrupt")
from the kvm-ppc-paulus 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.
--
Cheers,
Stephen Rothwell
diff --cc arch/powerpc/kernel/traps.c
index f7e2f2e318bd,9ec95daccad9..000000000000
--- a/arch/powerpc/kernel/traps.c
+++ b/arch/powerpc/kernel/traps.c
@@@ -60,7 -60,7 +60,8 @@@
#include <asm/switch_to.h>
#include <asm/tm.h>
#include <asm/debug.h>
+#include <asm/asm-prototypes.h>
+ #include <asm/hmi.h>
#include <sysdev/fsl_pci.h>
#if defined(CONFIG_DEBUGGER) || defined(CONFIG_KEXEC)
next reply other threads:[~2016-06-27 4:23 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-27 4:23 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2016-11-24 2:48 linux-next: manual merge of the kvm-ppc-paulus tree with the powerpc tree Stephen Rothwell
2016-11-24 2:53 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=20160627142352.2c1ae65b@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=benh@kernel$(echo .)crashing.org \
--cc=dja@axtens$(echo .)net \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linuxppc-dev@lists$(echo .)ozlabs.org \
--cc=mahesh@linux$(echo .)vnet.ibm.com \
--cc=mpe@ellerman$(echo .)id.au \
--cc=paulus@ozlabs$(echo .)org \
/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