LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* linux-next: manual merge of the pinctrl tree with the irqchip tree
@ 2021-08-17 10:04 Stephen Rothwell
  2021-08-17 20:14 ` Linus Walleij
  0 siblings, 1 reply; 5+ messages in thread
From: Stephen Rothwell @ 2021-08-17 10:04 UTC (permalink / raw)
  To: Linus Walleij, Marc Zyngier
  Cc: Jianqun Xu, Linux Kernel Mailing List, Linux Next Mailing List

[-- 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 --]

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: linux-next: manual merge of the pinctrl tree with the irqchip tree
  2021-08-17 10:04 linux-next: manual merge of the pinctrl tree with the irqchip tree Stephen Rothwell
@ 2021-08-17 20:14 ` Linus Walleij
  2021-08-18 19:59   ` Marc Zyngier
  0 siblings, 1 reply; 5+ messages in thread
From: Linus Walleij @ 2021-08-17 20:14 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Marc Zyngier, Jianqun Xu, Linux Kernel Mailing List,
	Linux Next Mailing List

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

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: linux-next: manual merge of the pinctrl tree with the irqchip tree
  2021-08-17 20:14 ` Linus Walleij
@ 2021-08-18 19:59   ` Marc Zyngier
  0 siblings, 0 replies; 5+ messages in thread
From: Marc Zyngier @ 2021-08-18 19:59 UTC (permalink / raw)
  To: Linus Walleij
  Cc: Stephen Rothwell, Jianqun Xu, Linux Kernel Mailing List,
	Linux Next Mailing List

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.

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: linux-next: manual merge of the pinctrl tree with the irqchip tree
  2022-02-21 22:32 broonie
@ 2022-02-28  7:04 ` Stephen Rothwell
  0 siblings, 0 replies; 5+ messages in thread
From: Stephen Rothwell @ 2022-02-28  7:04 UTC (permalink / raw)
  To: Marc Zyngier
  Cc: broonie, Linus Walleij, Linux Kernel Mailing List,
	Linux Next Mailing List

[-- 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 --]

^ permalink raw reply	[flat|nested] 5+ messages in thread

* linux-next: manual merge of the pinctrl tree with the irqchip tree
@ 2022-02-21 22:32 broonie
  2022-02-28  7:04 ` Stephen Rothwell
  0 siblings, 1 reply; 5+ messages in thread
From: broonie @ 2022-02-21 22:32 UTC (permalink / raw)
  To: Linus Walleij
  Cc: Linux Kernel Mailing List, Linux Next Mailing List, Marc Zyngier

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;

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2022-02-28  7:04 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-17 10:04 linux-next: manual merge of the pinctrl tree with the irqchip tree Stephen Rothwell
2021-08-17 20:14 ` Linus Walleij
2021-08-18 19:59   ` Marc Zyngier
2022-02-21 22:32 broonie
2022-02-28  7:04 ` Stephen Rothwell

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).