From: Lee Jones <lee.jones@linaro.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Marc Zyngier <maz@kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Mark-PK Tsai <mark-pk.tsai@mediatek.com>,
Michael Walle <michael@walle.cc>
Subject: Re: linux-next: manual merge of the irqchip tree with the mfd tree
Date: Mon, 12 Oct 2020 07:59:17 +0100 [thread overview]
Message-ID: <20201012065917.GK1763265@dell> (raw)
In-Reply-To: <20201012161757.4cdf20c2@canb.auug.org.au>
On Mon, 12 Oct 2020, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the irqchip tree got a conflict in:
>
> drivers/irqchip/Makefile
>
> between commit:
>
> 03ac990e0ac0 ("irqchip: Add sl28cpld interrupt controller support")
>
> from the mfd tree and commit:
>
> ad4c938c92af ("irqchip/irq-mst: Add MStar interrupt controller support")
>
> from the irqchip 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.
It looks as though the 'ib-mfd-gpio-hwmon-irqchip-pwm-watchdog-5.10'
pull-request I sent on Thursday 17th September [0] should be applied
to the IRQChip tree.
[0] https://patchwork.kernel.org/patch/11783523/
--
Lee Jones [李琼斯]
Senior Technical Lead - Developer Services
Linaro.org │ Open source software for Arm SoCs
Follow Linaro: Facebook | Twitter | Blog
prev parent reply other threads:[~2020-10-12 6:59 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-12 5:17 linux-next: manual merge of the irqchip tree with the mfd tree Stephen Rothwell
2020-10-12 6:59 ` Lee Jones [this message]
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=20201012065917.GK1763265@dell \
--to=lee.jones@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mark-pk.tsai@mediatek.com \
--cc=maz@kernel.org \
--cc=michael@walle.cc \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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