linux-kernel - Re: linux-next: manual merge of the slave-dma tree with Linus' 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: <20190611100815.GX9160@vkoul-mobl.Dlink>
Date:   Tue, 11 Jun 2019 15:38:15 +0530
From:   Vinod Koul <vkoul@...nel.org>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Thomas Gleixner <tglx@...utronix.de>,
        Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
        Simon Horman <horms+renesas@...ge.net.au>
Subject: Re: linux-next: manual merge of the slave-dma tree with Linus' tree

On 11-06-19, 16:32, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the slave-dma tree got a conflict in:
> 
>   include/linux/sudmac.h
> 
> between commit:
> 
>   49833cbeafa4 ("treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 311")
> 
> from Linus' tree and commit:
> 
>   9a0f780958bb ("dmaengine: sudmac: remove unused driver")
> 
> from the slave-dma tree.
> 
> I fixed it up (I removed the file) and can carry the fix as
> necessary. This is now fixed as far as linux-next is concerned, but any

Thanks Stephen,

I will keep this in mind before I send this to Linus

> 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