From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Marc Zyngier <maz@kernel•org>
Cc: broonie@kernel•org, Linus Walleij <linus.walleij@linaro•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: Re: linux-next: manual merge of the pinctrl tree with the irqchip tree
Date: Mon, 28 Feb 2022 18:04:19 +1100 [thread overview]
Message-ID: <20220228180419.3e0a9f91@canb.auug.org.au> (raw)
In-Reply-To: <20220221223216.3616980-1-broonie@kernel.org>
[-- 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 --]
next prev parent reply other threads:[~2022-02-28 7:04 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-21 22:32 linux-next: manual merge of the pinctrl tree with the irqchip tree broonie
2022-02-28 7:04 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-08-17 10:04 Stephen Rothwell
2021-08-17 20:14 ` Linus Walleij
2021-08-18 19:59 ` Marc Zyngier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220228180419.3e0a9f91@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=broonie@kernel$(echo .)org \
--cc=linus.walleij@linaro$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=maz@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox