linux-next: manual merge of the pinctrl tree with the irqchip tree

linux-next: manual merge of the pinctrl tree with the irqchip tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 810 bytes --]

Hi all,

Today's linux-next merge of the pinctrl tree got a conflict in:

  drivers/pinctrl/pinctrl-rockchip.c

between commit:

  a9cb09b7be84 ("pinctrl: Bulk conversion to generic_handle_domain_irq()")

from the irqchip tree and commit:

  9ce9a02039de ("pinctrl/rockchip: drop the gpio related codes")

from the pinctrl tree.

I fixed it up (the latter removed the code changed by the former, so I
did that) and can carry the fix as necessary. This is now fixed as far
as linux-next is concerned, but any non trivial conflicts should be
mentioned to your upstream maintainer when your tree is submitted for
merging.  You may also want to consider cooperating with the maintainer
of the conflicting tree to minimise any particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the pinctrl tree with the irqchip tree

[Linus Walleij]

On Tue, Aug 17, 2021 at 12:04 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Today's linux-next merge of the pinctrl tree got a conflict in:
>
>   drivers/pinctrl/pinctrl-rockchip.c
>
> between commit:
>
>   a9cb09b7be84 ("pinctrl: Bulk conversion to generic_handle_domain_irq()")
>
> from the irqchip tree and commit:
>
>   9ce9a02039de ("pinctrl/rockchip: drop the gpio related codes")
>
> from the pinctrl tree.
>
> I fixed it up (the latter removed the code changed by the former, so I
> did that) and can carry the fix as necessary.

I have created an immutable branch for these changes:
https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git/log/?h=ib-rockchip

If it helps irqchip they can pull this in (and fix things on top if
need be).

Yours,
Linus Walleij

Re: linux-next: manual merge of the pinctrl tree with the irqchip tree

[Marc Zyngier]

On Tue, 17 Aug 2021 21:14:35 +0100,
Linus Walleij <linus.walleij@linaro.org> wrote:
> 
> On Tue, Aug 17, 2021 at 12:04 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
> > Today's linux-next merge of the pinctrl tree got a conflict in:
> >
> >   drivers/pinctrl/pinctrl-rockchip.c
> >
> > between commit:
> >
> >   a9cb09b7be84 ("pinctrl: Bulk conversion to generic_handle_domain_irq()")
> >
> > from the irqchip tree and commit:
> >
> >   9ce9a02039de ("pinctrl/rockchip: drop the gpio related codes")
> >
> > from the pinctrl tree.
> >
> > I fixed it up (the latter removed the code changed by the former, so I
> > did that) and can carry the fix as necessary.
> 
> I have created an immutable branch for these changes:
> https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git/log/?h=ib-rockchip
> 
> If it helps irqchip they can pull this in (and fix things on top if
> need be).

Cheers Linus, I've pulled this branch in and resolved the conflict
locally.

Thanks,

	M.

-- 
Without deviation from the norm, progress is not possible.

Re: linux-next: manual merge of the pinctrl tree with the irqchip tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1509 bytes --]

Hi all,

On Mon, 21 Feb 2022 22:32:16 +0000 broonie@kernel.org wrote:
>
> Today's linux-next merge of the pinctrl tree got a conflict in:
> 
>   drivers/pinctrl/pinctrl-starfive.c
> 
> between commit:
> 
>   0d872ed9e2148 ("pinctrl: starfive: Move PM device over to irq domain")
> 
> from the irqchip tree and commit:
> 
>   64fd52a4d3ce6 ("pinctrl: starfive: Use a static name for the GPIO irq_chip")
> 
> from the pinctrl tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
> 
> diff --cc drivers/pinctrl/pinctrl-starfive.c
> index 5be9866c2b3c0,0e4ff4c709f87..0000000000000
> --- a/drivers/pinctrl/pinctrl-starfive.c
> +++ b/drivers/pinctrl/pinctrl-starfive.c
> @@@ -1307,8 -1308,8 +1308,6 @@@ static int starfive_probe(struct platfo
>   	sfp->gc.base = -1;
>   	sfp->gc.ngpio = NR_GPIOS;
>   
> - 	starfive_irq_chip.name = sfp->gc.label;
>  -	starfive_irq_chip.parent_device = dev;
> --
>   	sfp->gc.irq.chip = &starfive_irq_chip;
>   	sfp->gc.irq.parent_handler = starfive_gpio_irq_handler;
>   	sfp->gc.irq.num_parents = 1;

This is now a conflict between the irqchip tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the pinctrl tree with the irqchip tree

[broonie]

Hi all,

Today's linux-next merge of the pinctrl tree got a conflict in:

  drivers/pinctrl/pinctrl-starfive.c

between commit:

  0d872ed9e2148 ("pinctrl: starfive: Move PM device over to irq domain")

from the irqchip tree and commit:

  64fd52a4d3ce6 ("pinctrl: starfive: Use a static name for the GPIO irq_chip")

from the pinctrl tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --cc drivers/pinctrl/pinctrl-starfive.c
index 5be9866c2b3c0,0e4ff4c709f87..0000000000000
--- a/drivers/pinctrl/pinctrl-starfive.c
+++ b/drivers/pinctrl/pinctrl-starfive.c
@@@ -1307,8 -1308,8 +1308,6 @@@ static int starfive_probe(struct platfo
  	sfp->gc.base = -1;
  	sfp->gc.ngpio = NR_GPIOS;
  
- 	starfive_irq_chip.name = sfp->gc.label;
 -	starfive_irq_chip.parent_device = dev;
--
  	sfp->gc.irq.chip = &starfive_irq_chip;
  	sfp->gc.irq.parent_handler = starfive_gpio_irq_handler;
  	sfp->gc.irq.num_parents = 1;