On 18 July 2014 21:31, Matt Fleming <m...@console-pimps.org> wrote: > On Fri, 18 Jul, at 08:42:27PM, Ard Biesheuvel wrote: >> >> Hey Matt, >> >> I was wondering if you're on track to queue up your -next branch for 3.17? >> >> If so, could you please include $subject? And if you don't mind, could >> you squash the following fixup into "efi: efistub: Convert into static >> library" as well? > > Umm, well crap, how did I manage to drop this patch? > > I've picked this up now (with all the Acks), thanks. Please could you go > through the EFI 'next' branch and just make sure there's nothing missing > for v3.17? >
Thanks, looks lovely. The only thing I notice now is that the commit message from the patch below is missing the second line, which used to read "#including .c files to building the " or something to that effect. Obviously, the leading hash sign resulted in this line having been dropped, so this is something that has been in the patches all along. IMO there is really no point in bothering fixing this, but perhaps your inner grammar nazi disagrees. Cheers, Ard. > I was really hoping to get my queue sent to tip today, but I can always > send a second pull if it turns out I did miss something. > >> diff --git a/arch/arm64/kernel/Makefile b/arch/arm64/kernel/Makefile >> index cdaedad3afe5..afaeb734295a 100644 >> --- a/arch/arm64/kernel/Makefile >> +++ b/arch/arm64/kernel/Makefile >> @@ -4,8 +4,7 @@ >> >> CPPFLAGS_vmlinux.lds := -DTEXT_OFFSET=$(TEXT_OFFSET) >> AFLAGS_head.o := -DTEXT_OFFSET=$(TEXT_OFFSET) >> -CFLAGS_efi-stub.o := -DTEXT_OFFSET=$(TEXT_OFFSET) \ >> - -I$(src)/../../../scripts/dtc/libfdt >> +CFLAGS_efi-stub.o := -DTEXT_OFFSET=$(TEXT_OFFSET) >> >> CFLAGS_REMOVE_ftrace.o = -pg >> CFLAGS_REMOVE_insn.o = -pg > > Sure, I've fixed this up. > > -- > Matt Fleming, Intel Open Source Technology Center -- To unsubscribe from this list: send the line "unsubscribe linux-efi" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
