On Wed, Dec 9, 2020 at 4:39 PM Linus Walleij <linus.walleij@xxxxxxxxxx> wrote: > > On Wed, Dec 9, 2020 at 11:39 AM Andy Shevchenko > <andy.shevchenko@xxxxxxxxx> wrote: > > > Manually I did the following: > > - removed the conflicting hunk entirely > > - added 'break;' to the existing function in 'case > > ACPI_IO_RESTRICT_OUTPUT:' case > > OK I did the same and merged in Bartosz branch exactly like that, > let's hope it works! I just have checked your devel branch and it looks okay to me, thanks! -- With Best Regards, Andy Shevchenko