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! Yours, Linus Walleij
Re: [GIT PULL] gpio: updates for v5.11-rc1
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
- Subject: Re: [GIT PULL] gpio: updates for v5.11-rc1
- From: Linus Walleij <linus.walleij@xxxxxxxxxx>
- Date: Wed, 9 Dec 2020 15:39:14 +0100
- In-reply-to: <CAHp75Vebqe2ndfAx5b_awLnjM7UCh2bmcdJBEakVZL3hSQhRQA@mail.gmail.com>
- References: <20201209095248.22408-1-brgl@bgdev.pl> <CACRpkdZgK3dmjM32BYAWFvHOhBUsQbNbCSNMaebvRr+Jnes=Ww@mail.gmail.com> <CAMRc=Mdq7LBTAbUguuLH=f5_vfo5pc95BCveqSvApBTC26aNQQ@mail.gmail.com> <CACRpkdYM2knogZLRp+AAdE5ssvhULDZ6xr8yGrO8rvSMrZuScw@mail.gmail.com> <CAHp75VefreUB1KvdPGYUqmd7jq+hEWuPoq7nRG4RxLP6YpPRLA@mail.gmail.com> <CAHp75Vebqe2ndfAx5b_awLnjM7UCh2bmcdJBEakVZL3hSQhRQA@mail.gmail.com>
- Follow-Ups:
- Re: [GIT PULL] gpio: updates for v5.11-rc1
- From: Andy Shevchenko
- Re: [GIT PULL] gpio: updates for v5.11-rc1
- References:
- [GIT PULL] gpio: updates for v5.11-rc1
- From: Bartosz Golaszewski
- Re: [GIT PULL] gpio: updates for v5.11-rc1
- From: Linus Walleij
- Re: [GIT PULL] gpio: updates for v5.11-rc1
- From: Bartosz Golaszewski
- Re: [GIT PULL] gpio: updates for v5.11-rc1
- From: Linus Walleij
- Re: [GIT PULL] gpio: updates for v5.11-rc1
- From: Andy Shevchenko
- Re: [GIT PULL] gpio: updates for v5.11-rc1
- From: Andy Shevchenko
- [GIT PULL] gpio: updates for v5.11-rc1
- Prev by Date: [PATCH -next 3/3] arm64: dts: sparx5: Add SGPIO irq support
- Next by Date: linusw/devel build: 7 builds: 0 failed, 7 passed, 11 warnings (v5.10-rc4-85-g40b37008eb5a)
- Previous by thread: Re: [GIT PULL] gpio: updates for v5.11-rc1
- Next by thread: Re: [GIT PULL] gpio: updates for v5.11-rc1
- Index(es):
 |