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>,
Catalin Marinas <catalin.marinas@arm•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
David Daney <david.daney@cavium•com>,
Will Deacon <will.deacon@arm•com>,
Shannon Zhao <shannon.zhao@linaro•org>
Subject: linux-next: manual merge of the xen-tip tree with the arm64 tree
Date: Tue, 26 Apr 2016 15:00:41 +1000 [thread overview]
Message-ID: <20160426150041.4d86d498@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the xen-tip tree got a conflict in:
arch/arm64/kernel/setup.c
between commit:
3194ac6e66cc ("arm64: Move unflatten_device_tree() call earlier.")
from the arm64 tree and commit:
3915fea959b6 ("ARM: XEN: Move xen_early_init() before efi_init()")
from the xen-tip 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/arm64/kernel/setup.c
index 65f515949baa,7cf992fe6684..000000000000
--- a/arch/arm64/kernel/setup.c
+++ b/arch/arm64/kernel/setup.c
@@@ -277,13 -336,13 +278,11 @@@ void __init setup_arch(char **cmdline_p
early_ioremap_reset();
- if (acpi_disabled) {
- unflatten_device_tree();
+ if (acpi_disabled)
psci_dt_init();
- } else {
+ else
psci_acpi_init();
- }
- xen_early_init();
-
cpu_read_bootcpu_ops();
smp_init_cpus();
smp_build_mpidr_hash();
next reply other threads:[~2016-04-26 5:00 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-26 5:00 Stephen Rothwell [this message]
2016-04-26 9:25 ` linux-next: manual merge of the xen-tip tree with the arm64 tree Will Deacon
2016-04-26 9:34 ` Stefano Stabellini
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=20160426150041.4d86d498@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=Xen-devel@lists$(echo .)xensource.com \
--cc=catalin.marinas@arm$(echo .)com \
--cc=david.daney@cavium$(echo .)com \
--cc=jeremy@goop$(echo .)org \
--cc=konrad.wilk@oracle$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=shannon.zhao@linaro$(echo .)org \
--cc=stefano.stabellini@eu$(echo .)citrix.com \
--cc=will.deacon@arm$(echo .)com \
/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