Re: [PATCH v1 3/4] mfd: intel_quark_i2c_gpio: Convert GPIO to use software nodes

[Andy Shevchenko]

On Wed, Aug 18, 2021 at 9:34 AM Lee Jones <lee.jones@xxxxxxxxxx> wrote:
>
> On Tue, 17 Aug 2021, Andy Shevchenko wrote:
>
> > On Tue, Aug 17, 2021 at 10:26 AM Lee Jones <lee.jones@xxxxxxxxxx> wrote:
> > > On Mon, 16 Aug 2021, Andy Shevchenko wrote:
> > > > On Mon, Aug 16, 2021 at 5:19 PM Lee Jones <lee.jones@xxxxxxxxxx> wrote:
> > > > > On Mon, 16 Aug 2021, Andy Shevchenko wrote:
> >
> > ...
> >
> > > > > > > > Would it be okay for you to pull the immutable tag?
> > > > > > >
> > > > > > > What immutable tag?
> > > > > >
> > > > > > It's here:
> > > > > > https://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git/tag/?h=intel-gpio-v5.15-1
> > > > >
> > > > > My Ack can't be merged like that.
> > > >
> > > > Which one? There are two on different patches.
> > >
> > > The one that I specifically said was "for my own reference".
> > >
> > > > Do you have any documentation on the rules you imply by MFD?
> > >
> > > No, the documentation is provided with the tag.
> >
> > I see.
> >
> > So, what is the recommended solution?
>
> I planned to take the patch.
>
> I'm also happy to take the set, if they are interdependent.
>
> What is the reason the MFD patch doesn't apply to my tree?

What I did right now:

$ git checkout -b test-mfd-merge mfd/for-mfd-next
Updating files: 100% (8674/8674), done.
Branch 'test-mfd-merge' set up to track remote branch 'for-mfd-next' from 'mfd'.
Switched to a new branch 'test-mfd-merge'

$ b4 am 20210726125436.58685-2-andriy.shevchenko@xxxxxxxxxxxxxxx
Looking up https://lore.kernel.org/r/20210726125436.58685-2-andriy.shevchenko%40linux.intel.com
Grabbing thread from lore.kernel.org/linux-gpio
Analyzing 28 messages in the thread
---
Writing ./20210726_andriy_shevchenko_gpio_dwapb_unify_acpi_enumeration_checks_in_get_irq_and_configure_irqs.mbx
  [PATCH v1 1/4] gpio: dwapb: Unify ACPI enumeration checks in
get_irq() and configure_irqs()
    + Acked-by: Lee Jones <lee.jones@xxxxxxxxxx> (✓ DKIM/linaro.org)
    + Acked-by: Serge Semin <fancer.lancer@xxxxxxxxx> (✓ DKIM/gmail.com)
    + Tested-by: Serge Semin <fancer.lancer@xxxxxxxxx> (✓ DKIM/gmail.com)
  [PATCH v1 2/4] gpio: dwapb: Read GPIO base from gpio-base property
  [PATCH v1 3/4] mfd: intel_quark_i2c_gpio: Convert GPIO to use software nodes
    + Reviewed-by: Linus Walleij <linus.walleij@xxxxxxxxxx> (✓ DKIM/linaro.org)
  [PATCH v1 4/4] gpio: dwapb: Get rid of legacy platform data
    + Acked-by: Serge Semin <fancer.lancer@xxxxxxxxx> (✓ DKIM/gmail.com)
    + Tested-by: Serge Semin <fancer.lancer@xxxxxxxxx> (✓ DKIM/gmail.com)
---
Total patches: 4
---
 Link: https://lore.kernel.org/r/20210726125436.58685-1-andriy.shevchenko@xxxxxxxxxxxxxxx
 Base: not found (applies clean to current tree)
       git am ./20210726_andriy_shevchenko_gpio_dwapb_unify_acpi_enumeration_checks_in_get_irq_and_configure_irqs.mbx

$ git am ./20210726_andriy_shevchenko_gpio_dwapb_unify_acpi_enumeration_checks_in_get_irq_and_configure_irqs.mbx
Applying: gpio: dwapb: Unify ACPI enumeration checks in get_irq() and
configure_irqs()
Applying: gpio: dwapb: Read GPIO base from gpio-base property
Applying: mfd: intel_quark_i2c_gpio: Convert GPIO to use software nodes
Applying: gpio: dwapb: Get rid of legacy platform data

### here we need to rebase and add your tag

No conflicts, no nothing with your current _published_ for-mfd-next.
Do you have local changes that have not been yet visible?

Alternatively you may pull the tag I have.

-- 
With Best Regards,
Andy Shevchenko