Re: [Xen-devel] linux-next: manual merge of the xen-tip tree with the arm64 tree

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 unflat

Re: [Xen-devel] linux-next: manual merge of the xen-tip tree with the arm64 tree

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 a

[Xen-devel] linux-next: manual merge of the xen-tip tree with the arm64 tree

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 t