On Fri, Jan 03, 2020 at 12:36:04PM +0100, Ard Biesheuvel wrote: > On Fri, 3 Jan 2020 at 12:27, Hans de Goede <hdegoede@xxxxxxxxxx> wrote: > > > > Hi All, > > > > Since I send this out, efi-next has seen some changes causing the first > > 2 patches to no longer cleanly apply. So it looks like we need to > > merge this one bit at a time with immutable branches. > > > > Ard, the first 2 patches in this series should be merged through your > > efi tree. AFAIK everyone is happy with them in their current state > > so they are ready for merging. Can you create an immutable branch > > with these 2 patches and merge that into your efi-next branch? > > > > Note if you do the immutable branch on 5.5-rc1 + just these 2 patches, > > there will be a conflict when you merge this into efi-next, but it is > > trivial to resolve. > > > > I will need to defer to Ingo here, as he usually applies the EFI > changes piecemeal rather than merging my branches directly. > > I'd be fine with just annotating the conflict in the pull request if > it is trivial, though, but it is really up to Luis and Ingo to align > here. I don't have a tree, and firmware goes Greg's driver core tree so actually its up to Greg and Ingo on how this gets merged. But it seems you just have one issue to fix: [PATCH v10 05/10] test_firmware: add support for firmware_request_platform There is a few set of empty lines added and I had one comment on the release of the firmware. Other than this, I agree this seems ready to be merged. Luis
