From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jeremy Fitzhardinge <jeremy@goop.org>,
Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>,
Stefano Stabellini <stefano.stabellini@eu.citrix.com>,
Xen Devel <Xen-devel@lists.xensource.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Boris Ostrovsky <boris.ostrovsky@oracle.com>,
David Vrabel <david.vrabel@citrix.com>,
"Jason A. Donenfeld" <Jason@zx2c4.com>
Subject: linux-next: manual merge of the xen-tip tree with Linus' tree
Date: Fri, 14 Aug 2015 13:56:53 +1000 [thread overview]
Message-ID: <20150814135653.4a897b2d@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the xen-tip tree got a conflict in:
arch/x86/xen/Makefile
between commit:
fc5fee86bdd3 ("x86/xen: build "Xen PV" APIC driver for domU as well")
from Linus' tree and commit:
6e3012fba294 ("xen/PMU: Initialization code for Xen PMU")
from the xen-tip tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/x86/xen/Makefile
index 4b6e29ac0968,071fab5c720e..000000000000
--- a/arch/x86/xen/Makefile
+++ b/arch/x86/xen/Makefile
@@@ -13,7 -13,7 +13,7 @@@ CFLAGS_mmu.o := $(nostackp
obj-y := enlighten.o setup.o multicalls.o mmu.o irq.o \
time.o xen-asm.o xen-asm_$(BITS).o \
grant-table.o suspend.o platform-pci-unplug.o \
- p2m.o apic.o
- p2m.o pmu.o
++ p2m.o apic.o pmu.o
obj-$(CONFIG_EVENT_TRACING) += trace.o
next reply other threads:[~2015-08-14 3:56 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-14 3:56 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-10-07 2:12 linux-next: manual merge of the xen-tip tree with Linus' tree Stephen Rothwell
2018-02-16 1:04 Stephen Rothwell
2018-02-16 1:55 ` Stefano Stabellini
2021-11-02 3:25 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=20150814135653.4a897b2d@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=Jason@zx2c4.com \
--cc=Xen-devel@lists.xensource.com \
--cc=boris.ostrovsky@oracle.com \
--cc=david.vrabel@citrix.com \
--cc=jeremy@goop.org \
--cc=konrad.wilk@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=stefano.stabellini@eu.citrix.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).