From: Vinod Koul <vkoul@kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Minghao Chi <chi.minghao@zte.com.cn>
Subject: Re: linux-next: manual merge of the dmaengine tree with the dmaengine-fixes tree
Date: Tue, 12 Apr 2022 16:46:07 +0530 [thread overview]
Message-ID: <YlVfd2oCSkYfwg/S@matsya> (raw)
In-Reply-To: <20220412124219.3738092c@canb.auug.org.au>
On 12-04-22, 12:42, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the dmaengine tree got a conflict in:
>
> drivers/dma/mediatek/mtk-hsdma.c
>
> between commit:
>
> 5cfde5b82f05 ("dmaengine: mediatek: mtk-hsdma: Use platform_get_irq() to get the interrupt")
>
> from the dmaengine-fixes tree and commit:
>
> bb40bb695ec8 ("dmaengine: mediatek: mtk-hsdma: Use platform_get_irq() to get the interrupt")
>
> from the dmaengine tree.
Thanks, this should not be in fixes, I have fixed that up.
>
> I fixed it up (I arbitrarily used the former) 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
--
~Vinod
next prev parent reply other threads:[~2022-04-12 12:14 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-12 2:42 linux-next: manual merge of the dmaengine tree with the dmaengine-fixes tree Stephen Rothwell
2022-04-12 11:16 ` Vinod Koul [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-12-14 17:24 broonie
2021-12-28 9:09 ` Geert Uytterhoeven
2021-12-28 14:54 ` Jiang, Dave
2022-01-04 21:41 ` Dave Jiang
2022-01-04 23:04 ` Stephen Rothwell
2022-01-05 7:19 ` Vinod Koul
2022-01-06 23:18 ` Dave Jiang
2021-07-15 1:40 Stephen Rothwell
2020-11-19 3:29 Stephen Rothwell
2020-12-14 19:58 ` Stephen Rothwell
2020-12-15 4:33 ` Vinod Koul
2020-07-06 3:56 Stephen Rothwell
2020-07-06 4:23 ` Dave Jiang
2020-07-06 4:41 ` Vinod Koul
2020-07-06 6:03 ` Stephen Rothwell
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=YlVfd2oCSkYfwg/S@matsya \
--to=vkoul@kernel.org \
--cc=chi.minghao@zte.com.cn \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=prabhakar.mahadev-lad.rj@bp.renesas.com \
--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;
as well as URLs for NNTP newsgroup(s).