From: Luis Chamberlain <mcgrof@kernel.org>
To: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Hans de Goede <hdegoede@redhat.com>,
Ingo Molnar <mingo@redhat.com>,
Darren Hart <dvhart@infradead.org>,
Andy Shevchenko <andy@infradead.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
"Rafael J . Wysocki" <rafael@kernel.org>,
Thomas Gleixner <tglx@linutronix.de>,
Borislav Petkov <bp@alien8.de>, "H . Peter Anvin" <hpa@zytor.com>,
Jonathan Corbet <corbet@lwn.net>,
Dmitry Torokhov <dmitry.torokhov@gmail.com>,
Peter Jones <pjones@redhat.com>, Dave Olsthoorn <dave@bewaar.me>,
the arch/x86 maintainers <x86@kernel.org>,
platform-driver-x86@vger.kernel.org,
linux-efi <linux-efi@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Doc Mailing List <linux-doc@vger.kernel.org>,
linux-input@vger.kernel.org
Subject: Re: [PATCH v10 00/10] efi/firmware/platform-x86: Add EFI embedded fw support
Date: Mon, 6 Jan 2020 21:35:05 +0000 [thread overview]
Message-ID: <20200106213505.GW11244@42.do-not-panic.com> (raw)
In-Reply-To: <CAKv+Gu_X+UM95MJJMjT69upL9zN3H9BnUkv8s9TjcpevANbYEw@mail.gmail.com>
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@redhat.com> 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
prev parent reply other threads:[~2020-01-06 21:35 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-10 11:51 [PATCH v10 00/10] efi/firmware/platform-x86: Add EFI embedded fw support Hans de Goede
2019-12-10 11:51 ` [PATCH v10 01/10] efi: Export boot-services code and data as debugfs-blobs Hans de Goede
2019-12-10 11:51 ` [PATCH v10 02/10] efi: Add embedded peripheral firmware support Hans de Goede
2019-12-10 11:51 ` [PATCH v10 03/10] firmware: Rename FW_OPT_NOFALLBACK to FW_OPT_NOFALLBACK_SYSFS Hans de Goede
2019-12-10 11:51 ` [PATCH v10 04/10] firmware: Add new platform fallback mechanism and firmware_request_platform() Hans de Goede
2019-12-10 11:51 ` [PATCH v10 05/10] test_firmware: add support for firmware_request_platform Hans de Goede
2020-01-06 21:33 ` Luis Chamberlain
2020-01-10 19:48 ` Hans de Goede
2019-12-10 11:51 ` [PATCH v10 06/10] selftests: firmware: Add firmware_request_platform tests Hans de Goede
2019-12-10 11:51 ` [PATCH v10 07/10] Input: silead - Switch to firmware_request_platform for retreiving the fw Hans de Goede
2019-12-10 11:51 ` [PATCH v10 08/10] Input: icn8505 " Hans de Goede
2019-12-10 11:51 ` [PATCH v10 09/10] platform/x86: touchscreen_dmi: Add EFI embedded firmware info support Hans de Goede
2019-12-10 11:51 ` [PATCH v10 10/10] platform/x86: touchscreen_dmi: Add info for the Chuwi Vi8 Plus tablet Hans de Goede
2020-01-03 11:27 ` [PATCH v10 00/10] efi/firmware/platform-x86: Add EFI embedded fw support Hans de Goede
2020-01-03 11:36 ` Ard Biesheuvel
2020-01-06 21:35 ` Luis Chamberlain [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200106213505.GW11244@42.do-not-panic.com \
--to=mcgrof@kernel.org \
--cc=andy@infradead.org \
--cc=ard.biesheuvel@linaro.org \
--cc=bp@alien8.de \
--cc=corbet@lwn.net \
--cc=dave@bewaar.me \
--cc=dmitry.torokhov@gmail.com \
--cc=dvhart@infradead.org \
--cc=gregkh@linuxfoundation.org \
--cc=hdegoede@redhat.com \
--cc=hpa@zytor.com \
--cc=linux-doc@vger.kernel.org \
--cc=linux-efi@vger.kernel.org \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=pjones@redhat.com \
--cc=platform-driver-x86@vger.kernel.org \
--cc=rafael@kernel.org \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).