* linux-next: manual merge of the xen-tip tree with the arm64 tree
@ 2016-04-26 5:00 Stephen Rothwell
2016-04-26 9:25 ` Will Deacon
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2016-04-26 5:00 UTC (permalink / raw)
To: Jeremy Fitzhardinge, Konrad Rzeszutek Wilk, Stefano Stabellini,
Xen Devel, Catalin Marinas
Cc: linux-next, linux-kernel, David Daney, Will Deacon, Shannon Zhao
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();
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the xen-tip tree with the arm64 tree
2016-04-26 5:00 linux-next: manual merge of the xen-tip tree with the arm64 tree Stephen Rothwell
@ 2016-04-26 9:25 ` Will Deacon
2016-04-26 9:34 ` Stefano Stabellini
0 siblings, 1 reply; 3+ messages in thread
From: Will Deacon @ 2016-04-26 9:25 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Jeremy Fitzhardinge, Konrad Rzeszutek Wilk, Stefano Stabellini,
Xen Devel, Catalin Marinas, linux-next, linux-kernel,
David Daney, Shannon Zhao
On Tue, Apr 26, 2016 at 03:00:41PM +1000, Stephen Rothwell wrote:
> 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.
Thanks Stephen, looks good to me.
Will
> 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();
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the xen-tip tree with the arm64 tree
2016-04-26 9:25 ` Will Deacon
@ 2016-04-26 9:34 ` Stefano Stabellini
0 siblings, 0 replies; 3+ messages in thread
From: Stefano Stabellini @ 2016-04-26 9:34 UTC (permalink / raw)
To: Will Deacon
Cc: Stephen Rothwell, Jeremy Fitzhardinge, Konrad Rzeszutek Wilk,
Stefano Stabellini, Xen Devel, Catalin Marinas, linux-next,
linux-kernel, David Daney, Shannon Zhao
On Tue, 26 Apr 2016, Will Deacon wrote:
> On Tue, Apr 26, 2016 at 03:00:41PM +1000, Stephen Rothwell wrote:
> > 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.
>
> Thanks Stephen, looks good to me.
It looks good to me too.
> > 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();
> >
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-04-26 9:34 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-04-26 5:00 linux-next: manual merge of the xen-tip tree with the arm64 tree Stephen Rothwell
2016-04-26 9:25 ` Will Deacon
2016-04-26 9:34 ` Stefano Stabellini
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).