linux-kernel - Re: [PATCH v2 00/10] arm64: UEFI support

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Tue, 29 Apr 2014 12:43:56 +0100
From:	Matt Fleming <matt@...sole-pimps.org>
To:	Catalin Marinas <catalin.marinas@....com>
Cc:	Leif Lindholm <leif.lindholm@...aro.org>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
	"linux-efi@...r.kernel.org" <linux-efi@...r.kernel.org>,
	"linux-arm-kernel@...ts.infradead.org" 
	<linux-arm-kernel@...ts.infradead.org>,
	"msalter@...hat.com" <msalter@...hat.com>,
	"grant.likely@...aro.org" <grant.likely@...aro.org>,
	"roy.franz@...aro.org" <roy.franz@...aro.org>,
	"ard.biesheuvel@...aro.org" <ard.biesheuvel@...aro.org>,
	Mark Rutland <Mark.Rutland@....com>,
	"linux-doc@...r.kernel.org" <linux-doc@...r.kernel.org>,
	"H. Peter Anvin" <hpa@...or.com>,
	Stephen Rothwell <sfr@...b.auug.org.au>,
	Linus Torvalds <torvalds@...ux-foundation.org>
Subject: Re: [PATCH v2 00/10] arm64: UEFI support

(Pulling in Peter and Stephen)

On Tue, 29 Apr, at 11:28:17AM, Catalin Marinas wrote:
> 
> The patches look fine to me, they've been through several rounds of
> review already. How do we propose these get merged as the series
> contains both generic and arm64 patches? And there are dependencies
> already in linux-next.
> 
> Are the EFI patches in -next pulled from some non-rebaseable branch?

Peter suggsted a plan when he took the generic EFI stuff that's in tip
(and hence currently in linux-next),

  It doesn't hurt to inform Stephen, although I think it will simply fall
  out automatically since he uses git to merge and git will recognize the
  graph.

  During the merge window, it means they should not push their patches
  until Linus has accepted the precondition patches from the tip tree.
  Since Ingo and I try to push most of the tip tree as early as possible
  in the merge window, this is usually not a problem.

So we currently have the prerequisites in tip/x86/efi, and assuming that
this 10-patch series gets merged into a single branch somewhere, things
should work automatically for linux-next.

It may be prudent to negotiate a plan now for when the merge window
opens because, as Peter mentions above, the stuff in tip/x86/efi needs
to be merged by Linus first to avoid build breakage with the arm64
stuff.

-- 
Matt Fleming, Intel Open Source Technology Center
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/