Re: [GIT PULL] gpio: updates for v5.11-rc1

[Andy Shevchenko <andy.shevchenko@xxxxxxxxx>]

On Wed, Dec 9, 2020 at 12:33 PM Andy Shevchenko
<andy.shevchenko@xxxxxxxxx> wrote:
>
> On Wed, Dec 9, 2020 at 12:22 PM Linus Walleij <linus.walleij@xxxxxxxxxx> wrote:
> > On Wed, Dec 9, 2020 at 11:13 AM Bartosz Golaszewski <brgl@xxxxxxxx> wrote:
> > > On Wed, Dec 9, 2020 at 11:07 AM Linus Walleij <linus.walleij@xxxxxxxxxx> wrote:
> > > > On Wed, Dec 9, 2020 at 10:52 AM Bartosz Golaszewski <brgl@xxxxxxxx> wrote:
> > > >
> > > > > These are the patches I collected over this release cycle. Nothing all
> > > > > too exciting - mainly just updates to drivers and refactoring of the
> > > > > core code. Please pull.
> > > >
> > > > Nice!
> > > >
> > > > But I get a merge conflict in gpiolib-acpi.c! Since I said Andy should
> > > > be maintaining that file it makes me a bit nervous.
>
> Linus, no problem. This conflict can be easily resolved.
> Do you want me to publish a test branch with an example of resolution?

Here you are:
https://gitlab.com/andy-shev/next/-/tree/test-gpio-brgl-merge

Manually I did the following:
- removed the conflicting hunk entirely
- added 'break;' to the existing function in 'case
ACPI_IO_RESTRICT_OUTPUT:' case


-- 
With Best Regards,
Andy Shevchenko