Re: [PATCH] Xen: EFI: Parse DT parameters for Xen specific UEFI

From	Stefano Stabellini <sstabellini@kernel.org>
Newsgroups	linux.kernel
Subject	Re: [PATCH] Xen: EFI: Parse DT parameters for Xen specific UEFI
Date	2016-05-12 13:00 +0200
Message-ID	<rxWvw-3Ty-7@gated-at.bofh.it> (permalink)
References	(1 earlier) <rxBr5-8cB-15@gated-at.bofh.it> <rxCwP-Kt-41@gated-at.bofh.it> <rxLJM-1vQ-7@gated-at.bofh.it> <rxOxY-4mk-9@gated-at.bofh.it> <rxVJ8-3u6-5@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

On Thu, 12 May 2016, Matt Fleming wrote:
> On Thu, 12 May, at 10:22:07AM, Shannon Zhao wrote:
> > 
> > As said above, I will rebase this patch on top of the EFI next branch.
> 
> OK thanks.
> 
> Note that it is not possible to escape merge conflicts, since there
> are changes in the xen tip tree that are not in the EFI next branch
> and vice versa.
> 
> For example these commits from xen/linux-next look relevant,
> 
>   8e147fcc3ffa ("FDT: Add a helper to get the subnode by given name")
>   37060935dc04 ("ARM64: XEN: Add a function to initialize Xen specific UEFI runtime services")
>   acb2c923a860 ("XEN: EFI: Move x86 specific codes to architecture directory")
>   055be2d42408 ("ARM: Xen: Document UEFI support on Xen ARM virtual platforms")
>   3915fea959b6 ("ARM: XEN: Move xen_early_init() before efi_init()")

From a diffstat perspective, the changes introduced by these commits
affect drivers/of/fdt.c, arch/arm/xen, arch/x86/xen, drivers/xen and
little else. I don't think they should cause merge troubles.


> Linus, Stefano, tip-folks: I'm soliciting opinions on the correct way
> to handle this inter-tree dependency where we've got changes to EFI
> code in two separate trees and Shannon wants to write patches on top
> of both.
> 
> I'm guessing the best solution is to merge xen/linux-next and efi/next
> into a topic branch either in the EFI tree or Xen tree, but I want to
> be cautious of the branch history that will create.

I am OK with that. You and I will have to be careful with the pull
requests.


> (In hindsight all of these change should have probably gone via the
> EFI tree.)

That is still possible if deemed best.

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

[PATCH] Xen: EFI: Parse DT parameters for Xen specific UEFI Shannon Zhao <zhaoshenglong@huawei.com> - 2016-05-06 10:40 +0200
  Re: [PATCH] Xen: EFI: Parse DT parameters for Xen specific UEFI Mathieu Poirier <mathieu.poirier@linaro.org> - 2016-05-06 18:00 +0200
    Re: [PATCH] Xen: EFI: Parse DT parameters for Xen specific UEFI Matt Fleming <matt@codeblueprint.co.uk> - 2016-05-11 14:30 +0200
  Re: [PATCH] Xen: EFI: Parse DT parameters for Xen specific UEFI Matt Fleming <matt@codeblueprint.co.uk> - 2016-05-11 14:30 +0200
    Re: [PATCH] Xen: EFI: Parse DT parameters for Xen specific UEFI Shannon Zhao <shannon.zhao@linaro.org> - 2016-05-11 15:40 +0200
      Re: [PATCH] Xen: EFI: Parse DT parameters for Xen specific UEFI Matt Fleming <matt@codeblueprint.co.uk> - 2016-05-12 01:30 +0200
        Re: [PATCH] Xen: EFI: Parse DT parameters for Xen specific UEFI Shannon Zhao <zhaoshenglong@huawei.com> - 2016-05-12 04:30 +0200
          Re: [PATCH] Xen: EFI: Parse DT parameters for Xen specific UEFI Matt Fleming <matt@codeblueprint.co.uk> - 2016-05-12 12:10 +0200
            Re: [PATCH] Xen: EFI: Parse DT parameters for Xen specific UEFI Stefano Stabellini <sstabellini@kernel.org> - 2016-05-12 13:00 +0200

csiph-web