Skip to contentSkip to conversation

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

DISCUSSION Stephen Rothwell 3 participants 3 messages Aug 17, 2021 – Aug 18, 2021 Linux-next tree

lore
Share & tools
lore
#0 lore raw

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.

Signature · 2 lines
Cheers,
Stephen Rothwell
#1 lore raw
Quoted 8 lines · Stephen Rothwell

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()")

Quoted 8 lines

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

#2 lore raw
Quoted 17 lines · Linus Walleij
Quoted 14 lines · Stephen Rothwell

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.

Quoted 8 lines
Quoted 2 lines

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.
Signature · 1 line
Without deviation from the norm, progress is not possible.