Hi, On 5/16/24 11:50 AM, Hans de Goede wrote: > Hi, > > On 5/16/24 10:37 AM, Rafael J. Wysocki wrote: >> On Thu, May 16, 2024 at 10:35 AM Hans de Goede <hdegoede@xxxxxxxxxx> wrote: >>> >>> Hi, >>> >>> On 5/15/24 9:39 PM, Rafael J. Wysocki wrote: >>>> Hi Everyone, >>>> >>>> This is an update of >>>> >>>> https://lore.kernel.org/linux-acpi/5787281.DvuYhMxLoT@kreacher/ >>>> >>>> which was a follow up for the discussion in: >>>> >>>> https://lore.kernel.org/linux-acpi/CAJZ5v0hiXdv08PRcop7oSYqgr_g5rwzRTj7HgdNCCGjXeV44zA@xxxxxxxxxxxxxx/T/#t >>>> >>>> Patch [1/2] has been updated to avoid possible issues related to >>>> systems with defective platform firmware and patch [2/2] is a resend >>>> with a couple of tags added. >>> >>> Thanks, the series looks good to me: >>> >>> Reviewed-by: Hans de Goede <hdegoede@xxxxxxxxxx> >>> >>> for the series. >>> >>> I assume you are going to send this in as a fix for 6.10 ? >> >> Yes, I am. >> >>> In that case feel free to merge both patches through the >>> linux-pm tree. >> >> Thank you! > > Hmm, I just realized that this: > > https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git/commit/?h=for-next&id=c663b26972eae7d2a614f584c92a266fe9a2d44c > > Is part of the main pdx86 pull-request for 6.10 which I'm going to > send to Linus in the next 10 minutes or so. So that is going to > conflict with your 2/2. > > Options: > > a) You only send 1/2 upstream as a fix and I'll then send a rebased > 2/2 upstream as part of the first pdx86 pull-request. That should be "as part of the first pdx86 fixes pull-request" (for 6.10). > b) You merge the git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git > platform-drivers-x86-v6.10-1 tag (which is the tag for the pull-request > I'm about to send to Linus) and rebase on top of that before sending > a pull-request for both to Linus. > > Either way works for me. Regards, Hans
