linux-kernel - Re: linux-next: manual merge of the dmaengine tree with the dmaengine-fixes tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <YlVfd2oCSkYfwg/S@matsya>
Date:   Tue, 12 Apr 2022 16:46:07 +0530
From:   Vinod Koul <vkoul@...nel.org>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Lad Prabhakar <prabhakar.mahadev-lad.rj@...renesas.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Minghao Chi <chi.minghao@....com.cn>
Subject: Re: linux-next: manual merge of the dmaengine tree with the
 dmaengine-fixes tree

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