On Wed, Apr 8, 2020 at 1:24 AM Hans de Goede <hdegoede@xxxxxxxxxx> wrote: > > Hi all, > > I just realized that I should have added a cover letter to this > patch to discuss how to merge it. > > Rafael has already queued up the > "[PATCH v3 2/2] platform/x86: intel_int0002_vgpio: Use acpi_register_wakeup_handler()" > in his tree. Looking at both patches the parts of the file the > touch are different enough that that should not be a problem though. > > So I guess this can go through platform/x86 as usual, or > (assuming everyone is ok with the change itself) alternatively > Rafael can take it to make sure there will be no conflicts? You will need different patches for v5.7 and the rest. In v5.7 new CPU macros are in use. -- With Best Regards, Andy Shevchenko