Hi Alex, On 19 October 2016 at 01:11, Alexander Graf <ag...@suse.de> wrote: > > > On 18/10/2016 22:37, Simon Glass wrote: >> Hi Alex, >> >> On 18 October 2016 at 01:12, Alexander Graf <ag...@suse.de> wrote: >>> On 10/18/2016 04:29 AM, Simon Glass wrote: >>>> >>>> This is required for x86 and is also correct for ARM (since it is empty). >>>> >>>> Signed-off-by: Simon Glass <s...@chromium.org> >>>> Reviewed-by: Bin Meng <bmeng...@gmail.com> >>> >>> >>> (Replying here in lack for a cover letter) >>> >>> Could you please rebase your patches on top of >>> >>> https://github.com/agraf/u-boot.git efi-next >>> >>> so that all the patches that I already queued are not repeated in the patch >>> set and we don't get any conflicts? >> >> I can do that - but is this targeting -next? I was expecting these >> patches to land in master. > > Sorry, they are on their way to master. It's just old habit wrt my > naming scheme: > > -next: current development branch, basically staging for master
I'd suggest calling that 'master'. > -release-number: future patches that I already applied proactively for > the next release, or backports :) > > As it stands, I've only taken the base patches, not all of them. Would > you expect all of the x86 efi enablement to land in 2016.11? No, let's target the release after that. Regards, Simon _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot